Index: trunk/src/tmcsim/cadsimulator/CADServer.java
===================================================================
--- trunk/src/tmcsim/cadsimulator/CADServer.java	(revision 360)
+++ trunk/src/tmcsim/cadsimulator/CADServer.java	(revision 382)
@@ -68,5 +68,5 @@
 {
 
-    private static final String CONFIG_FILE_NAME = "cad_simulator_config.properties";
+    private static String CONFIG_FILE_NAME = "cad_simulator_config.properties";
     /**
      * Error logger.
@@ -425,4 +425,8 @@
             System.setProperty("CONFIG_DIR", "config");
         }
+        if (System.getProperty("PROP_FILE") != null)
+        {
+            CONFIG_FILE_NAME = System.getProperty("PROP_FILE");
+        }
         try
         {