diff --git a/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java b/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java index f55d820e4853d852b5b929f89459c49266126b62..00c5c352620b173b677ada25ceb7e5d7b5d6593b 100644 --- a/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java +++ b/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java @@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory; import cz.it4i.fiji.haas.JobManager.JobManager4Job; import cz.it4i.fiji.haas.JobManager.JobSynchronizableFile; +import cz.it4i.fiji.haas_java_client.DummyProgressNotifier; import cz.it4i.fiji.haas_java_client.HaaSClient; import cz.it4i.fiji.haas_java_client.HaaSClient.UploadingFile; import cz.it4i.fiji.haas_java_client.HaaSFileTransfer; diff --git a/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/DummyProgressNotifier.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/DummyProgressNotifier.java similarity index 82% rename from haas-imagej-client/src/main/java/cz/it4i/fiji/haas/DummyProgressNotifier.java rename to haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/DummyProgressNotifier.java index 1ada1204121246f799d052655de7061f50da5a47..927d4c048226546d76acd64d99fb3953b886ce70 100644 --- a/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/DummyProgressNotifier.java +++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/DummyProgressNotifier.java @@ -1,6 +1,4 @@ -package cz.it4i.fiji.haas; - -import cz.it4i.fiji.haas_java_client.ProgressNotifier; +package cz.it4i.fiji.haas_java_client; public class DummyProgressNotifier implements ProgressNotifier { diff --git a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSClient.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSClient.java index dac7e14f777a0eaf8532726a8acd5326a2fe2275..0f3763a970c728c2bdd31edadf66008d5c6d98cf 100644 --- a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSClient.java +++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSClient.java @@ -246,6 +246,8 @@ public class HaaSClient { public HaaSFileTransfer startFileTransfer(long jobId, ProgressNotifier notifier) { try { + //TODO it may be usefull reuse fileTransfer for concurrent transfers + //- count using is needed FileTransferMethodExt ft = getFileTransfer().getFileTransferMethod(jobId, getSessionID()); return new HaaSFileTransferImp(ft, getSessionID(), jobId, getFileTransfer(), getScpClient(ft), notifier); } catch (RemoteException | ServiceException | UnsupportedEncodingException | JSchException e) { diff --git a/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClient2.java b/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClient2.java new file mode 100644 index 0000000000000000000000000000000000000000..8667667a4074772fd2eacdf8e942b138cb3677e3 --- /dev/null +++ b/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClient2.java @@ -0,0 +1,29 @@ +package cz.it4i.fiji.haas_java_client; + +import java.io.IOException; +import java.util.Arrays; + +import javax.xml.rpc.ServiceException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class TestHaaSJavaClient2 { + + private static Logger log = LoggerFactory.getLogger(cz.it4i.fiji.haas_java_client.TestHaaSJavaClient2.class); + + public static void main(String[] args) throws ServiceException, IOException { + HaaSClient client = new HaaSClient(TestingConstants.getSettings(1l, 600, 7l, "OPEN-12-20")); + HaaSFileTransfer tr1 = client.startFileTransfer(250, new DummyProgressNotifier()); + HaaSFileTransfer tr2 = client.startFileTransfer(250, new DummyProgressNotifier()); + + log.info("config.yaml - size:" + tr1.obtainSize(Arrays.asList("config.yaml"))); + log.info("config.yaml - size:" + tr2.obtainSize(Arrays.asList("config.yaml"))); + + tr1.close(); + + tr2.close(); + } + + +} diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/TaskComputationAdapter.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/TaskComputationAdapter.java index de1e146f96eb4078267d4ed8860a28e746d48f1b..d7127acdb322381a970b08b9fe0c5ac9d0d3a0e2 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/TaskComputationAdapter.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/TaskComputationAdapter.java @@ -19,6 +19,7 @@ import cz.it4i.fiji.haas_spim_benchmark.core.TaskComputation; import cz.it4i.fiji.haas_spim_benchmark.core.TaskComputation.Log; import javafx.beans.value.ObservableValue; import javafx.beans.value.ObservableValueBase; +//TASK: fix occasional auth fails with ssh //TASK: improve performance public class TaskComputationAdapter implements Closeable {