Merge branch 'migration-dd-18-42' into 'master'

Migration dd 18 42

See merge request fiji/haas-java-client!37

haas-imagej-client/src/main/resources/config.yaml

@@ -202,14 +202,14 @@ common: {
   #          sysconfcpus
   # ============================================================================
   # current working Fiji
-  fiji-app: "/scratch/work/project/open-12-20/haas/spim/Fiji.app/ImageJ-linux64 -Xss4m",
+  fiji-app: "/opt/Fiji.app/ImageJ-linux64 -Xss4m",
   # bean shell scripts and Snakefile
-  bsh_directory: "/scratch/work/project/open-12-20/haas/spim/snakemake-workflows/spim_registration/timelapse/",
+  bsh_directory: "/opt/snakemake-workflows/spim_registration/timelapse/",
   # Directory that contains the cuda libraries
   directory_cuda: "/sw/users/schmied/cuda/",
   # xvfb 
   fiji-prefix: "",
-  sysconfcpus: "/scratch/work/project/open-12-20/haas/spim/bin/sysconfcpus -n",
+  sysconfcpus: "sysconfcpus -n",
   memory-prefix: "-Xmx"
   }
   

haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/GetJobInfo.java

+
 package cz.it4i.fiji.haas_java_client;
 
 import org.slf4j.Logger;
@@ -15,7 +16,8 @@ public class GetJobInfo {
 	public static Logger log = LoggerFactory.getLogger(cz.it4i.fiji.haas_java_client.GetJobInfo.class);
 
 	public static void main(String[] args) {
-		HaaSClientSettings settings = SettingsProvider.getSettings("OPEN-12-20", TestingConstants.CONFIGURATION_FILE_NAME);
+		HaaSClientSettings settings = SettingsProvider.getSettings("DD-18-42",
+			TestingConstants.CONFIGURATION_FILE_NAME);
 		HaaSClient client = new HaaSClient(settings);
 		JobInfo ji = client.obtainJobInfo(334);
 		System.out.println("created: " + ji.getCreationTime());

haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestCommunicationWithNodes.java

+
 package cz.it4i.fiji.haas_java_client;
 
 import java.io.IOException;
@@ -11,8 +12,8 @@ public class TestCommunicationWithNodes {
 
 	public static Logger log = LoggerFactory.getLogger(cz.it4i.fiji.haas_java_client.TestCommunicationWithNodes.class);
 
-	private static String[] predefined  = new String[2];
-	
+	private static String[] predefined = new String[2];
+
 	@SuppressWarnings("resource")
 	public static void main(String[] args) throws IOException, InterruptedException {
 		predefined[0] = "POST /modules/'command:net.imagej.ops.math.PrimitiveMath$IntegerAdd'?process=false HTTP/1.1\r\n" +
@@ -28,9 +29,9 @@ public class TestCommunicationWithNodes {
 				"User-Agent: curl/7.47.0\r\n" + //
 				"Accept: */*\r\n" + //
 				"\r\n";
-		
-		HaaSClientSettings settings = SettingsProvider.getSettings("OPEN-12-20",
-				TestingConstants.CONFIGURATION_FILE_NAME);
+
+		HaaSClientSettings settings = SettingsProvider.getSettings("DD-18-42",
+			TestingConstants.CONFIGURATION_FILE_NAME);
 		HaaSClient client = new HaaSClient(settings);
 		long id = startBDS(client);
 		String sessionID = client.getSessionID();

haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestConcurentAccessToHaaSFileTransfer.java

+
 package cz.it4i.fiji.haas_java_client;
 
 import java.io.IOException;
@@ -12,14 +13,18 @@ public class TestConcurentAccessToHaaSFileTransfer {
 
 	@SuppressWarnings("resource")
 	public static void main(String[] args) throws IOException {
-		HaaSClient client = new HaaSClient(SettingsProvider.getSettings("OPEN-12-20",TestingConstants.CONFIGURATION_FILE_NAME));
-		HaaSFileTransfer tr1 = client.startFileTransfer(250, HaaSClient.DUMMY_TRANSFER_FILE_PROGRESS);
-		HaaSFileTransfer tr2 = client.startFileTransfer(249, HaaSClient.DUMMY_TRANSFER_FILE_PROGRESS);
-		log.info("config.yaml - size:" + tr1.obtainSize(Arrays.asList("config.yaml")));
+		HaaSClient client = new HaaSClient(SettingsProvider.getSettings("DD-18-42",
+			TestingConstants.CONFIGURATION_FILE_NAME));
+		HaaSFileTransfer tr1 = client.startFileTransfer(250,
+			HaaSClient.DUMMY_TRANSFER_FILE_PROGRESS);
+		HaaSFileTransfer tr2 = client.startFileTransfer(249,
+			HaaSClient.DUMMY_TRANSFER_FILE_PROGRESS);
+		log.info("config.yaml - size:" + tr1.obtainSize(Arrays.asList(
+			"config.yaml")));
 		tr1.close();
-		log.info("config.yaml - size:" + tr2.obtainSize(Arrays.asList("config.yaml")));
+		log.info("config.yaml - size:" + tr2.obtainSize(Arrays.asList(
+			"config.yaml")));
 		tr2.close();
 	}
 
-	
 }