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/01/09 21:49:13 UTC
svn commit: r1229343 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main:
java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
java/org/apache/airavata/xbaya/invoker/GenericInvoker.java
resources/services.xml
Author: lahiru
Date: Mon Jan 9 20:49:13 2012
New Revision: 1229343
URL: http://svn.apache.org/viewvc?rev=1229343&view=rev
Log:
fixing workflow interpreter service to work with gfac service invocation.
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/services.xml
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1229343&r1=1229342&r2=1229343&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Mon Jan 9 20:49:13 2012
@@ -21,9 +21,12 @@
package org.apache.airavata.xbaya.interpretor;
+import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.net.URL;
import java.util.List;
+import java.util.Properties;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
@@ -35,18 +38,34 @@ import org.apache.airavata.xbaya.graph.s
import org.apache.airavata.xbaya.monitor.MonitorException;
import org.apache.airavata.xbaya.ode.ODEClient;
import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.engine.ServiceLifeCycle;
/**
* WorkflowInterpretorSkeleton java skeleton for the axisService
*/
-public class WorkflowInterpretorSkeleton {
+public class WorkflowInterpretorSkeleton implements ServiceLifeCycle {
public static final String PROXYSERVER = "proxyserver";
public static final String MSGBOX = "msgbox";
public static final String GFAC = "gfac";
public static final String DSC = "dsc";
public static final String BROKER = "broker";
+ public static final String MYPROXY_USER = "myproxy.user";
+ public static final String MYPROXY_PASS = "myproxy.password";
+ public void startUp(ConfigurationContext configctx, AxisService service) {
+ URL url = this.getClass().getClassLoader().getResource("xbaya.properties");
+ Properties properties = new Properties();
+ try {
+ properties.load(url.openStream());
+ configctx.setProperty(MYPROXY_PASS, properties.get(MYPROXY_PASS));
+ configctx.setProperty(MYPROXY_USER, properties.get(MYPROXY_USER));
+ } catch (IOException e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+ }
/**
* Auto generated method signature
*
@@ -166,4 +185,7 @@ public class WorkflowInterpretorSkeleton
return defaultVal;
}
+ public void shutDown(ConfigurationContext configctx, AxisService service) {
+
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java?rev=1229343&r1=1229342&r2=1229343&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/GenericInvoker.java Mon Jan 9 20:49:13 2012
@@ -231,7 +231,7 @@ public class GenericInvoker implements I
builder.getWorkflowMonitoringContext().setWorkflowTimeStep(1);
builder.setUserIdentifier("xbaya-user");
//todo write a UI component to collect this information and pass it through Header
- builder.setGridMyProxyRepository("myproxy.nersc.gov","fangliu","",14000);
+// builder.setGridMyProxyRepository("myproxy.nersc.gov","fangliu","Jdas7wph",14000);
StickySoapHeaderHandler handler = new StickySoapHeaderHandler("use-workflowcontext-header", builder.getXml());
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/services.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/services.xml?rev=1229343&r1=1229342&r2=1229343&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/services.xml (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/resources/services.xml Mon Jan 9 20:49:13 2012
@@ -15,7 +15,7 @@
<!-- This file was auto-generated from WSDL -->
<!-- by the Apache Axis2 version: 1.4 Built on : Apr 26, 2008 (06:24:30 EDT) -->
<serviceGroup>
- <service name="WorkflowInterpretor">
+ <service name="WorkflowInterpretor" class="org.apache.airavata.xbaya.interpretor.WorkflowInterpretorSkeleton">
<messageReceivers>
<messageReceiver mep="http://www.w3.org/ns/wsdl/in-out" class="org.apache.airavata.xbaya.interpretor.WorkflowInterpretorMessageReceiverInOut"/>
</messageReceivers>