Merge pull request #1524 from virtualcell/remove-uses-of-system-getproperty

Make All Server Modules use Property Loader

Author: Ezequiel-Valencia

vcell-api/src/main/java/org/vcell/rest/server/OptimizationRunServerResource.java

@@ -180,7 +180,7 @@ private OptSocketStreams createOptSocketStreams() throws IOException, Interrupte
 		String swarmSubmitTaskName = PropertyLoader.getProperty(PropertyLoader.vcellsubmit_service_host, null);
 		if (swarmSubmitTaskName == null){
 			// if not provided, then calculate the DNS name of the docker swarm service for vcell-submit
-			swarmSubmitTaskName = "tasks."+"vcell"+System.getProperty("vcell.server.id").toLowerCase()+"_submit";
+			swarmSubmitTaskName = "tasks."+"vcell"+PropertyLoader.getRequiredProperty(PropertyLoader.vcellServerIDProperty).toLowerCase()+"_submit";
 		}
 		ProcessBuilder pb =new ProcessBuilder("nslookup",swarmSubmitTaskName);
 		pb.redirectErrorStream(true);

vcell-server/src/main/java/cbit/vcell/message/server/batch/sim/HtcSimulationWorker.java

@@ -255,7 +255,7 @@ public String toString() {
 
 }
 private static String MONITOR_JOBS_FILE_NAME = "monitorJobsList";
-private static File monitorJobsFile = new File(System.getProperty(PropertyLoader.primarySimDataDirInternalProperty), MONITOR_JOBS_FILE_NAME+"_"+System.getProperty(PropertyLoader.vcellServerIDProperty)+".txt");
+private static File monitorJobsFile = new File(PropertyLoader.getRequiredProperty(PropertyLoader.primarySimDataDirInternalProperty), MONITOR_JOBS_FILE_NAME+"_"+PropertyLoader.getRequiredProperty(PropertyLoader.vcellServerIDProperty)+".txt");
 private static Hashtable<String,MonitorJobInfo> getMonitorJobs(){
 	Hashtable<String,MonitorJobInfo> result = new Hashtable<>();
 	ArrayList<String> theseJobsAreDone = new ArrayList<>();