You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/02/28 16:17:28 UTC
[1/2] git commit: Adding orchestrator test methods - AIRAVATA-1028
Repository: airavata
Updated Branches:
refs/heads/master 0aecca776 -> cd8d8910f
Adding orchestrator test methods - AIRAVATA-1028
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bead7c81
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bead7c81
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bead7c81
Branch: refs/heads/master
Commit: bead7c81cad189f9128bf6e3678c41603914746c
Parents: a33b8c6
Author: lahiru <la...@apache.org>
Authored: Fri Feb 28 10:16:00 2014 -0500
Committer: lahiru <la...@apache.org>
Committed: Fri Feb 28 10:16:00 2014 -0500
----------------------------------------------------------------------
.../server/OrchestratorServerHandler.java | 3 ---
.../client/OrchestratorClientFactoryTest.java | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/bead7c81/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 1ef609a..7cb9183 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -40,15 +40,12 @@ import org.apache.airavata.orchestrator.cpi.OrchestratorService;
import org.apache.airavata.orchestrator.cpi.impl.SimpleOrchestratorImpl;
import org.apache.airavata.orchestrator.cpi.orchestrator_cpi_serviceConstants;
import org.apache.airavata.persistance.registry.jpa.impl.RegistryFactory;
-import org.apache.airavata.persistance.registry.jpa.impl.RegistryImpl;
-import org.apache.airavata.persistance.registry.jpa.model.TaskDetail;
import org.apache.airavata.registry.cpi.DataType;
import org.apache.airavata.registry.cpi.Registry;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.validation.constraints.Null;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URL;
http://git-wip-us.apache.org/repos/asf/airavata/blob/bead7c81/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java b/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
index c838398..c1f515e 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
@@ -22,10 +22,18 @@
package org.apache.airavata.orchestrator.client;
import org.apache.airavata.orchestrator.cpi.OrchestratorService;
+import org.junit.Before;
import org.junit.Test;
public class OrchestratorClientFactoryTest {
+ @Before
+ public void setUp(){
+ // fill the descripter saving code using AiravataRegistry2
+ //
+
+ // fill the code to store ExperimentData
+ }
@Test
public void testCreateOrchestratorClient() throws Exception {
@@ -36,4 +44,12 @@ public class OrchestratorClientFactoryTest {
System.out.println("Orchestrator CPI version is " + orchestratorClient.getOrchestratorCPIVersion());
}
+
+ private void storeDescriptors(){
+
+ }
+
+ private void storeExperimentDetail(){
+
+ }
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cd8d8910
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cd8d8910
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cd8d8910
Branch: refs/heads/master
Commit: cd8d8910f1db80dcf913f02468c0723f693e84ae
Parents: bead7c8 0aecca7
Author: lahiru <la...@apache.org>
Authored: Fri Feb 28 10:16:11 2014 -0500
Committer: lahiru <la...@apache.org>
Committed: Fri Feb 28 10:16:11 2014 -0500
----------------------------------------------------------------------
.../airavata/client/samples/CreateLaunchExperiment.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------