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 2012/06/27 18:08:26 UTC
svn commit: r1354600 - in /incubator/airavata/trunk/modules: airavata-client/
airavata-client/src/main/java/org/apache/airavata/client/airavata/
airavata-client/src/main/java/org/apache/airavata/client/api/
airavata-client/src/test/resources/ workflow-...
Author: lahiru
Date: Wed Jun 27 16:08:24 2012
New Revision: 1354600
URL: http://svn.apache.org/viewvc?rev=1354600&view=rev
Log:
Adding new method to Airavata Client to getWorkflowServiceNode Names.
Modified:
incubator/airavata/trunk/modules/airavata-client/pom.xml
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java
incubator/airavata/trunk/modules/airavata-client/src/test/resources/xbaya.properties
incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java
Modified: incubator/airavata/trunk/modules/airavata-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/pom.xml?rev=1354600&r1=1354599&r2=1354600&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/pom.xml (original)
+++ incubator/airavata/trunk/modules/airavata-client/pom.xml Wed Jun 27 16:08:24 2012
@@ -47,6 +47,11 @@
<artifactId>airavata-xbaya-gui</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-workflow-model-parent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java?rev=1354600&r1=1354599&r2=1354600&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/airavata/AiravataClient.java Wed Jun 27 16:08:24 2012
@@ -827,4 +827,21 @@ public class AiravataClient implements A
return currentUser;
}
+ public List<String> getWorkflowServiceIDs(String templateID){
+ Property workflowAsString = null;
+ try {
+ workflowAsString = this.getWorkflowAsString(templateID);
+ Workflow workflow = new Workflow(workflowAsString.getString());
+ return workflow.getWorkflowServiceNodeIDs();
+ } catch (RegistryException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ } catch (RepositoryException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ } catch (GraphException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ } catch (ComponentException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+ }
+
}
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java?rev=1354600&r1=1354599&r2=1354600&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java Wed Jun 27 16:08:24 2012
@@ -274,7 +274,17 @@ public interface AiravataAPI {
* @return
*/
public ExecutionManager getExecutionManager();
-
+
+ /**
+ *
+ * @return
+ */
public String getCurrentUser();
+ /**
+ *
+ * @param templateID
+ * @return
+ */
+ public String[] getWorkflowServiceNodeIDs(String templateID);
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/airavata-client/src/test/resources/xbaya.properties
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/test/resources/xbaya.properties?rev=1354600&r1=1354599&r2=1354600&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/test/resources/xbaya.properties (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/test/resources/xbaya.properties Wed Jun 27 16:08:24 2012
@@ -6,8 +6,27 @@ jcr.url=http://localhost:8081/rmi
jcr.username=admin
jcr.password=admin
with.Listener=false
+output=output=Hi
#Following properties are optional, if user doesn't send them server will use the predefined values for these.
myproxy.url=myproxy.teragrid.org
-myproxy.username=ogce
-myproxy.password=Jdas
-trusted.cert.location=/path/to/certs
+myproxy.username=ccguser
+myproxy.password=80c#emc0mm
+trusted.cert.location=/home/paramchem/certificates
+molecule_id=3pom
+geom_mol2=/u/ac/ccguser/proposed_dir_structure/toppar/cgenff/releases/2b7/3pom.mol2
+toppar_main_tgz=gsiftp://login-ember.ncsa.teragrid.org//u/ac/ccguser/proposed_dir_structure/toppar/cgenff/releases/2b7/main.tgz
+toppar_usr_tgz=gsiftp://login-ember.ncsa.teragrid.org
+toppar_mol_str=http://ccg-mw1.ncsa.uiuc.edu/cgenff/leoshen/cgenff_project/3pom/toppar/3pom.str
+molecule_dir_in_tgz=
+GC_UserName=leoshen
+GC_ProjectName=leoshen_cgenff_proj_
+GC_WorkflowName=3pom__1334773521
+Input_3=scan1
+clobber=true
+Input_2=http://ccg-mw1.ncsa.uiuc.edu/cgenff/leoshen/cgenff_project/3pom/scan1/3pom.gjf
+allscan_vars_str=http://ccg-mw1.ncsa.uiuc.edu/cgenff/leoshen/cgenff_project/3pom/fit_verify/3pom.allscan_vars
+extrapars_txt=gsiftp://login-ember.ncsa.teragrid.org
+multiplicities_txt=http://ccg-mw1.ncsa.uiuc.edu/cgenff/leoshen/cgenff_project/3pom/fit/multiplicities
+initialize_script=http://ccg-mw1.ncsa.uiuc.edu/cgenff/leoshen/cgenff_project/3pom/fit/initialize
+allscan_vars_str_2=http://ccg-mw1.ncsa.uiuc.edu/cgenff/leoshen/cgenff_project/3pom/fit/3pom.allscan_vars_2
+output.data.directory=/Users/lahirugunathilake/work/airavata
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java?rev=1354600&r1=1354599&r2=1354600&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java (original)
+++ incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/wf/Workflow.java Wed Jun 27 16:08:24 2012
@@ -940,4 +940,15 @@ public class Workflow implements Cloneab
this.setGpelProcess(script.getGpelProcess());
this.setWorkflowWSDL(script.getWorkflowWSDL().getWsdlDefinitions());
}
+
+ public List<String> getWorkflowServiceNodeIDs() {
+ List<NodeImpl> nodes = getGraph().getNodes();
+ ArrayList<String> nodeIDs = new ArrayList<String>();
+ for (Node node : nodes) {
+ if (node instanceof WSNode) {
+ nodeIDs.add(node.getID());
+ }
+ }
+ return nodeIDs;
+ }
}
\ No newline at end of file