Author: amilaj
Date: Sun Jan 6 13:09:51 2013
New Revision: 1429513
URL: http://svn.apache.org/viewvc?rev=1429513&view=rev
Log:
Cleaning up samples. Removing un-necessary files from client distribution.
Modified:
airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
airavata/trunk/samples/airavata-client/create-application/build.xml
airavata/trunk/samples/airavata-client/workflow-run/build.xml
airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/RunWorkflow.java
Modified:
airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml?rev=1429513&r1=1429512&r2=1429513&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
(original)
+++
airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
Sun Jan 6 13:09:51 2013
@@ -107,6 +107,12 @@
<fileSet>
<directory>../../../samples/airavata-client</directory>
<outputDirectory>samples</outputDirectory>
+ <excludes>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/pom.xml</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+
</fileSet>
</fileSets>
Modified: airavata/trunk/samples/airavata-client/create-application/build.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/create-application/build.xml?rev=1429513&r1=1429512&r2=1429513&view=diff
==============================================================================
--- airavata/trunk/samples/airavata-client/create-application/build.xml
(original)
+++ airavata/trunk/samples/airavata-client/create-application/build.xml Sun Jan
6 13:09:51 2013
@@ -43,7 +43,7 @@
</path>
</target>
<target name="compile" depends="init" description="Compile all Java">
- <javac srcdir="src" destdir="${class.dir}">
+ <javac srcdir="src" destdir="${class.dir}" debug="on">
<classpath refid="javac.classpath"/>
</javac>
</target>
Modified: airavata/trunk/samples/airavata-client/workflow-run/build.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/workflow-run/build.xml?rev=1429513&r1=1429512&r2=1429513&view=diff
==============================================================================
--- airavata/trunk/samples/airavata-client/workflow-run/build.xml (original)
+++ airavata/trunk/samples/airavata-client/workflow-run/build.xml Sun Jan 6
13:09:51 2013
@@ -43,7 +43,7 @@
</path>
</target>
<target name="compile" depends="init" description="Compile all Java">
- <javac srcdir="src" destdir="${class.dir}">
+ <javac srcdir="src" destdir="${class.dir}" debug="on">
<classpath refid="javac.classpath"/>
</javac>
</target>
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=1429513&r1=1429512&r2=1429513&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
Sun Jan 6 13:09:51 2013
@@ -23,6 +23,7 @@ package org.apache.airavata.client.sampl
import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
+import org.apache.airavata.client.api.ExperimentAdvanceOptions;
import org.apache.airavata.registry.api.PasswordCallback;
import
org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
import org.apache.airavata.registry.api.impl.WorkflowExecutionDataImpl;
@@ -94,9 +95,10 @@ public class RunWorkflow {
workflowInputs.add(workflowInput);
//Now inputs are set properly to the workflow, now we are about to run
the workflow(submit the workflow run to intepreterService)
+
String result
- =
airavataAPI.getExecutionManager().runExperiment(workflowName, workflowInputs,
"admin", "",
- workflowName);
+ =
airavataAPI.getExecutionManager().runExperiment(workflowName, workflowInputs);
+
System.out.println("Workflow Experiment ID Returned : " + result);
airavataAPI.getExecutionManager().waitForExperimentTermination(result);
ExperimentData experimentData =
airavataAPI.getProvenanceManager().getExperimentData(result);
