Author: samindaw
Date: Sat Jan 5 22:25:38 2013
New Revision: 1429406
URL: http://svn.apache.org/viewvc?rev=1429406&view=rev
Log:
update the run workflow sample + update default registry settings to use the
rest client
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/registry.properties
airavata/trunk/samples/airavata-client/create-application/src/main/resources/registry.properties
airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/RunWorkflow.java
airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/registry.properties
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1429406&r1=1429405&r2=1429406&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
Sat Jan 5 22:25:38 2013
@@ -447,7 +447,7 @@ public class AiravataClient extends Obse
e1.printStackTrace();
}
final Monitor monitor = new Monitor(monitorConfiguration);
- monitor.setPrint(true);
+ monitor.setPrint(false);
monitor.getEventData().registerEventListener(listener);
listener.setExperimentMonitor(monitor);
return monitor;
Modified:
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties?rev=1429406&r1=1429405&r2=1429406&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
(original)
+++
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
Sat Jan 5 22:25:38 2013
@@ -27,8 +27,8 @@
###---------------------------REGISTRY API
IMPLEMENTATION---------------------------###
-class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
+#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
###---------------------REGISTRY API IMPLEMENTATION - CUSTOM
SETTINGS----------------------###
Modified:
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/registry.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/registry.properties?rev=1429406&r1=1429405&r2=1429406&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/registry.properties
(original)
+++
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/registry.properties
Sat Jan 5 22:25:38 2013
@@ -29,8 +29,8 @@
###---------------------------REGISTRY API
IMPLEMENTATION---------------------------###
-class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
+#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
###---------------------REGISTRY API IMPLEMENTATION - CUSTOM
SETTINGS----------------------###
Modified:
airavata/trunk/samples/airavata-client/create-application/src/main/resources/registry.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/create-application/src/main/resources/registry.properties?rev=1429406&r1=1429405&r2=1429406&view=diff
==============================================================================
---
airavata/trunk/samples/airavata-client/create-application/src/main/resources/registry.properties
(original)
+++
airavata/trunk/samples/airavata-client/create-application/src/main/resources/registry.properties
Sat Jan 5 22:25:38 2013
@@ -29,8 +29,8 @@
###---------------------------REGISTRY API
IMPLEMENTATION---------------------------###
-class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
+#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
###---------------------REGISTRY API IMPLEMENTATION - CUSTOM
SETTINGS----------------------###
Modified:
airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/RunWorkflow.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/RunWorkflow.java?rev=1429406&r1=1429405&r2=1429406&view=diff
==============================================================================
---
airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/RunWorkflow.java
(original)
+++
airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/RunWorkflow.java
Sat Jan 5 22:25:38 2013
@@ -31,6 +31,8 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.workflow.NodeExecutionData;
import org.apache.airavata.rest.client.PasswordCallbackImpl;
import org.apache.airavata.workflow.model.wf.WorkflowInput;
+import org.apache.airavata.registry.api.workflow.InputData;
+import org.apache.airavata.registry.api.workflow.OutputData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,6 +98,7 @@ public class RunWorkflow {
=
airavataAPI.getExecutionManager().runExperiment(workflowName, workflowInputs,
"admin", "",
workflowName);
System.out.println("Workflow Experiment ID Returned : " + result);
+
airavataAPI.getExecutionManager().waitForExperimentTermination(result);
ExperimentData experimentData =
airavataAPI.getProvenanceManager().getExperimentData(result);
List<WorkflowExecutionDataImpl> workflowInstanceData
= experimentData.getWorkflowExecutionDataList();
@@ -103,8 +106,21 @@ public class RunWorkflow {
for(WorkflowExecutionDataImpl data:workflowInstanceData){
List<NodeExecutionData> nodeDataList = data.getNodeDataList();
for(NodeExecutionData nodeData:nodeDataList){
- System.out.println("Input : " +
nodeData.getInputData().get(0));
- System.out.println("Output :" +
nodeData.getOutputData().get(0));
+ System.out.println(nodeData.getId());
+ List<InputData> inputs=nodeData.getInputData();
+ if(inputs.size()>0){
+ System.out.println("\tInput ");
+ for(InputData input:inputs){
+ System.out.println("\t\t" +
input.getName()+"\t: "+input.getValue());
+ }
+ }
+ List<OutputData> outputs=nodeData.getOutputData();
+ if(outputs.size()>0){
+ System.out.println("\tOutput ");
+ for(OutputData output:outputs){
+ System.out.println("\t\t" +
output.getName()+"\t: "+output.getValue());
+ }
+ }
}
}
}
@@ -136,3 +152,4 @@ public class RunWorkflow {
return buffer.toString();
}
}
+
Modified:
airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/registry.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/registry.properties?rev=1429406&r1=1429405&r2=1429406&view=diff
==============================================================================
---
airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/registry.properties
(original)
+++
airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/registry.properties
Sat Jan 5 22:25:38 2013
@@ -29,8 +29,8 @@
###---------------------------REGISTRY API
IMPLEMENTATION---------------------------###
-class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
+#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
###---------------------REGISTRY API IMPLEMENTATION - CUSTOM
SETTINGS----------------------###
