You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2011/08/01 04:36:55 UTC
svn commit: r1152677 - in /incubator/airavata/trunk/xbaya-gui: ./
src/main/java/org/apache/airavata/xbaya/
src/main/java/org/apache/airavata/xbaya/component/registry/
src/main/java/org/apache/airavata/xbaya/gpel/gui/
src/main/java/org/apache/airavata/x...
Author: smarru
Date: Mon Aug 1 02:36:48 2011
New Revision: 1152677
URL: http://svn.apache.org/viewvc?rev=1152677&view=rev
Log:
Deprecated support for mylead catalog to fix AIRAVATA-51
Removed:
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/mylead/MyLead.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/mylead/MyLeadAgentStub.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/mylead/MyLeadConfiguration.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/mylead/MyLeadException.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/mylead/MyLeadQueryResultItem.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/mylead/gui/
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyLeadAgentStubTestCase.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyLeadTestCase.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/MyLEADUtil.java
Modified:
incubator/airavata/trunk/xbaya-gui/ (props changed)
incubator/airavata/trunk/xbaya-gui/pom.xml
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELConfigurationWindow.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorMessages.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/HeaderConstants.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyDialog.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamPublisher.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamSourceWindow.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LoadTest.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonOneTimeRunnerTestCase.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/WSDLUtil.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XmlFormatter.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/GPELWorkflowContext.java
Propchange: incubator/airavata/trunk/xbaya-gui/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 1 02:36:48 2011
@@ -1 +1 @@
-target
+.classpath
Modified: incubator/airavata/trunk/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/pom.xml?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/pom.xml (original)
+++ incubator/airavata/trunk/xbaya-gui/pom.xml Mon Aug 1 02:36:48 2011
@@ -196,31 +196,6 @@
<version>0.1</version>
</dependency>
<dependency>
- <groupId>lead</groupId>
- <artifactId>lead-metadata</artifactId>
- <version>1.8.1</version>
- </dependency>
- <dependency>
- <groupId>lead</groupId>
- <artifactId>lead-metadata-util</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>mylead</groupId>
- <artifactId>xmccat-types-metadata</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>mylead</groupId>
- <artifactId>lead-xmccat-domain-metadata</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>mylead</groupId>
- <artifactId>mylead-agent-typelib</artifactId>
- <version>3.4</version>
- </dependency>
- <dependency>
<groupId>xregistry</groupId>
<artifactId>xregistry-client</artifactId>
<version>1.1</version>
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/GpelWorkflowClient.java Mon Aug 1 02:36:48 2011
@@ -252,7 +252,6 @@ public class GpelWorkflowClient implemen
leadContextHeader.setWorkflowTemplateId(new URI(workflow.getGPELTemplateID().toString()));
leadContextHeader.setWorkflowInstanceId(new URI(instance.getInstanceId().toString()));
leadContextHeader.setUserDn(proxy.getName().toString());
- leadContextHeader.setMyleadAgentUrl(new URI(XBayaConstants.DEFAULT_MYLEAD_AGENT_URL.toString() + "?wsdl"));
WsaEndpointReference eventSink = WseClientAPI.createEndpointReference(
XBayaConstants.DEFAULT_BROKER_URL.toString(), topic);
leadContextHeader.setEventSink(eventSink);
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java Mon Aug 1 02:36:48 2011
@@ -184,9 +184,7 @@ public class XBaya {
System.err.println("Usage: java " + XBaya.class.getName() + " [-help]" + "[-config file]" + " [-title title]"
+ " [-workflow workflow]" + " [-enableLocalRegistry]" + " [-localRegistry dir]"
+ " [-gpelEngineURL url]" + " [-templateID templateID]" + " [-instanceID instanceID]"
- + " [-xRegistryURL url]" + " [-gfacURL url]" + " [-dscURL url" + " [-myLeadAgentURL url]"
- + " [-myLeadUser userDN]" + " [-myLeadProject projectID]" + " [-myLeadWorkflow workflow]"
- + " [-myLeadSampleUser userDN]" + " [-myLeadSampleProject projectID]" + " [-startMonitor {true,false}]"
+ + " [-xRegistryURL url]" + " [-gfacURL url]" + " [-dscURL url" + " [-startMonitor {true,false}]"
+ " [-brokerURL url]" + " [-topic topic]" + " [-pullMode {true,false}]" + " [-myProxyServer host]"
+ " [-karmaURL url]" + " [-karmaWorkflowInstanceID]" + " [-myProxyPort port]"
+ " [-myProxyUsername username]" + " [-myProxyLifetime sec]" + " [-loadMyProxy {true,false}]"
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java Mon Aug 1 02:36:48 2011
@@ -67,22 +67,6 @@ public class XBayaConfiguration {
private URI dscURL = XBayaConstants.DEFAULT_DSC_URL;
- // MyLead related
-
- private URI myLeadAgentURL = XBayaConstants.DEFAULT_MYLEAD_AGENT_URL;
-
- private String myLeadUser = null;
-
- private String myLeadProject = null;
-
- private String myLeadWorkflowName = null;
-
- private String myLeadWorkflowNS = null;
-
- private String myLeadSampleUser = XBayaConstants.DEFAULT_MYLEAD_SAMPLE_USER;
-
- private String myLeadSampleProject = XBayaConstants.DEFAULT_MYLEAD_SAMPLE_PROJECT_ID;
-
// Monitor related
private boolean startMonitor = false;
@@ -170,10 +154,6 @@ public class XBayaConfiguration {
if (dsc != null) {
this.dscURL = dsc;
}
- URI mylead = config.getMyLeadAgentUrl();
- if (mylead != null) {
- this.myLeadAgentURL = mylead;
- }
URI broker = config.getBrokerUrl();
if (broker != null) {
this.brokerURL = broker;
@@ -363,139 +343,6 @@ public class XBayaConfiguration {
}
/**
- * Returns the myLeadAgentUrl.
- *
- * @return The myLeadAgentUrl
- */
- public URI getMyLeadAgentURL() {
- return this.myLeadAgentURL;
- }
-
- /**
- * Sets myLeadAgentUrl.
- *
- * @param myLeadAgentURL
- * The myLeadAgentUrl to set.
- */
- public void setMyLeadAgentURL(URI myLeadAgentURL) {
- this.myLeadAgentURL = myLeadAgentURL;
- }
-
- /**
- * Returns the myLeadProject.
- *
- * @return The myLeadProject
- */
- public String getMyLeadProject() {
- return this.myLeadProject;
- }
-
- /**
- * Sets myLeadProject.
- *
- * @param myLeadProject
- * The myLeadProject to set.
- */
- public void setMyLeadProject(String myLeadProject) {
- this.myLeadProject = myLeadProject;
- }
-
- /**
- * Returns the myLeadUser.
- *
- * @return The myLeadUser
- */
- public String getMyLeadUser() {
- return this.myLeadUser;
- }
-
- /**
- * Sets myLeadUser.
- *
- * @param myLeadUser
- * The myLeadUser to set.
- */
- public void setMyLeadUser(String myLeadUser) {
- this.myLeadUser = myLeadUser;
- }
-
- /**
- * Returns the myLeadWorkflowName.
- *
- * @return The myLeadWorkflowName
- */
- public String getMyLeadWorkflowName() {
- return this.myLeadWorkflowName;
- }
-
- /**
- * Sets myLeadWorkflowName.
- *
- * @param myLeadWorkflowName
- * The myLeadWorkflowName to set.
- */
- public void setMyLeadWorkflowName(String myLeadWorkflowName) {
- this.myLeadWorkflowName = myLeadWorkflowName;
- }
-
- /**
- * Returns the myLeadWorkflowNS.
- *
- * @return The myLeadWorkflowNS
- */
- public String getMyLeadWorkflowNS() {
- return this.myLeadWorkflowNS;
- }
-
- /**
- * Sets myLeadWorkflowNS.
- *
- * @param myLeadWorkflowNS
- * The myLeadWorkflowNS to set.
- */
- public void setMyLeadWorkflowNS(String myLeadWorkflowNS) {
- this.myLeadWorkflowNS = myLeadWorkflowNS;
- }
-
- /**
- * Returns the myLeadSampleProject.
- *
- * @return The myLeadSampleProject
- */
- public String getMyLeadSampleProject() {
- return this.myLeadSampleProject;
- }
-
- /**
- * Sets myLeadSampleProject.
- *
- * @param myLeadSampleProject
- * The myLeadSampleProject to set.
- */
- public void setMyLeadSampleProject(String myLeadSampleProject) {
- this.myLeadSampleProject = myLeadSampleProject;
- }
-
- /**
- * Returns the myLeadSampleUser.
- *
- * @return The myLeadSampleUser
- */
- public String getMyLeadSampleUser() {
- return this.myLeadSampleUser;
- }
-
- /**
- * Sets myLeadSampleUser.
- *
- * @param myLeadSampleUser
- * The myLeadSampleUser to set.
- */
- public void setMyLeadSampleUser(String myLeadSampleUser) {
- this.myLeadSampleUser = myLeadSampleUser;
- }
-
- /**
* Returns the topic.
*
* @return The topic
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java Mon Aug 1 02:36:48 2011
@@ -83,26 +83,6 @@ public class XBayaConstants {
public static final URI DEFAULT_DSC_URL = URI.create("https://silktree.cs.indiana.edu:52520/");
/**
- * Default myLead agent URL
- */
- public static final URI DEFAULT_MYLEAD_AGENT_URL = URI.create("https://pagodatree.cs.indiana.edu:20243/agent");
-
- /**
- * DEFAULT_MYLEAD_SAMPLE_USER
- */
- public static final String DEFAULT_MYLEAD_SAMPLE_USER = "/O=LEAD Project/OU=Indiana University Extreme Lab/OU=linbox1.extreme.indiana.edu/OU=extreme.indiana.edu/CN=drworkflow/EMAIL=drlead@cs.indiana.edu ";
-
- /**
- * DEFAULT_MYLEAD_SAMPLE_PROJECT_NAME
- */
- public static final String DEFAULT_MYLEAD_SAMPLE_PROJECT_NAME = "Sample Workflows";
-
- /**
- * DEFAULT_MYLEAD_SAMPLE_PROJECT_ID
- */
- public static final String DEFAULT_MYLEAD_SAMPLE_PROJECT_ID = "urn:uuid:8cfe9f0f-4d2a-45a1-abe5-c858411d9832";
-
- /**
* DEFAULT_MYPROXY_SERVER
*/
public static final String DEFAULT_MYPROXY_SERVER = "myproxy.teragrid.org";
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java Mon Aug 1 02:36:48 2011
@@ -45,8 +45,6 @@ import org.apache.airavata.xbaya.gui.XBa
import org.apache.airavata.xbaya.monitor.Monitor;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.monitor.gui.MonitorStarter;
-import org.apache.airavata.xbaya.mylead.MyLead;
-import org.apache.airavata.xbaya.mylead.MyLeadConfiguration;
import org.apache.airavata.xbaya.myproxy.MyProxyClient;
import org.apache.airavata.xbaya.myproxy.gui.MyProxyDialog;
import org.apache.airavata.xbaya.security.XBayaSecurity;
@@ -69,8 +67,6 @@ public class XBayaEngine {
private XBayaGUI gui;
- private MyLead myLead;
-
private WorkflowClient workflowClient;
private SubWorkflowUpdater subWorkflowUpdater;
@@ -112,7 +108,6 @@ public class XBayaEngine {
// These have to be before the GUI setup.
this.workflowClient = WorkflowEngineManager.getWorkflowClient();
this.workflowClient.setXBayaEngine(this);
- this.myLead = new MyLead();
this.subWorkflowUpdater = new SubWorkflowUpdater(this);
@@ -175,15 +170,6 @@ public class XBayaEngine {
}
/**
- * Returns the MyLeadConnection.
- *
- * @return the MyLeadConnection
- */
- public MyLead getMyLead() {
- return this.myLead;
- }
-
- /**
* Sets the workflow.
*
* @param workflow
@@ -248,7 +234,6 @@ public class XBayaEngine {
// load myProxy before loading components from registries.
loadMyProxy();
- initMyLead();
initRegistry();
// TODO May be we need to load a default workflow from Xregistry.
@@ -286,18 +271,6 @@ public class XBayaEngine {
}
}
- private void initMyLead() {
- MyLeadConfiguration myLeadConfiguration = this.myLead.getConfiguration();
- try {
- myLeadConfiguration.set(this.configuration.getMyLeadAgentURL(), this.configuration.getMyLeadUser(),
- this.configuration.getMyLeadProject());
- } catch (RuntimeException e) {
- getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
- } catch (Error e) {
- getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
- }
- }
-
/**
* Initializes registris.
*/
@@ -397,9 +370,6 @@ public class XBayaEngine {
*/
private void loadDefaultGraph() {
this.configuration.getGPELTemplateID();
- if (null != this.configuration.getMyLeadWorkflowNS() && null != this.configuration.getMyLeadWorkflowName()) {
- new QName(this.configuration.getMyLeadWorkflowNS(), this.configuration.getMyLeadWorkflowName());
- }
String localWorkflow = this.configuration.getWorkflow();
if (null != localWorkflow && !"".equals(localWorkflow)) {
XRegistryAccesser xregistryAccesser = new XRegistryAccesser(this.configuration.getMyProxyUsername(),
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java Mon Aug 1 02:36:48 2011
@@ -42,7 +42,7 @@ public class ComponentRegistryLoader imp
private WaitDialog loadingDialog;
/**
- * Constructs a MyLeadWorkflowLoader.
+ * Constructs a WorkflowLoader.
*
* @param engine
*/
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELConfigurationWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELConfigurationWindow.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELConfigurationWindow.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELConfigurationWindow.java Mon Aug 1 02:36:48 2011
@@ -52,7 +52,7 @@ public class GPELConfigurationWindow {
private XBayaTextField uriField;
/**
- * Constructs a MyLeadSaveWorkflowWindow.
+ * Constructs a SaveWorkflowWindow.
*
* @param engine
*/
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvoker.java Mon Aug 1 02:36:48 2011
@@ -184,7 +184,6 @@ public class GPELInvoker implements Canc
try {
LeadContextHeaderHelper leadContextHelper = new LeadContextHeaderHelper();
leadContextHelper.setXBayaConfiguration(xbayaConfiguration);
- leadContextHelper.setMyLeadConfiguration(this.engine.getMyLead().getConfiguration());
leadContextHelper.setWorkflow(workflow);
leadContextHelper.setMonitorConfiguration(monitorConfiguration);
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorMessages.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorMessages.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorMessages.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorMessages.java Mon Aug 1 02:36:48 2011
@@ -94,16 +94,6 @@ public interface ErrorMessages {
public static final String COMPONENT_FORMAT_ERROR = "The component is in wrong format.";
/**
- * Errro while connecting to the myLead agent.
- */
- public static final String MYLEAD_CONNECTION_ERROR = "Failed to connect to the myLead agent.";
-
- /**
- * Error while loading a template name list.
- */
- public static final String MYLEAD_TEMPLATE_NAME_LIST_LOAD_ERROR = "Failed to load the workflow template name list from myLead.";
-
- /**
* GPEL_ERROR
*/
public static final String GPEL_ERROR = "Error occured while communicating with the GPEL Engine.";
@@ -154,16 +144,6 @@ public interface ErrorMessages {
public static final String WORKFLOW_WSDL_ERROR = "The workflow WSDL is in wrong format.";
/**
- * Error while saving a template.
- */
- public static final String MYLEAD_SAVE_TEMPLATE_ERROR = "Failed to save the workflow template to myLead.";
-
- /**
- * Error while loading a template.
- */
- public static final String MYLEAD_LOAD_TEMPLATE_ERROR = "Failed to load the workflow template from myLead.";
-
- /**
* Error while subscribing to notification.
*/
public static final String MONITOR_SUBSCRIPTION_ERROR = "Failed to subscribe to notification.";
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java Mon Aug 1 02:36:48 2011
@@ -39,7 +39,6 @@ import org.apache.airavata.xbaya.experim
import org.apache.airavata.xbaya.file.gui.FileMenu;
import org.apache.airavata.xbaya.gpel.gui.GPELMenu;
import org.apache.airavata.xbaya.monitor.gui.MonitorMenu;
-import org.apache.airavata.xbaya.mylead.gui.MyLeadMenu;
import org.apache.airavata.xbaya.myproxy.gui.MyProxyMenu;
import org.apache.airavata.xbaya.pegasus.gui.PegasusMenu;
import org.apache.airavata.xbaya.wf.gui.WorkflowMenu;
@@ -62,8 +61,6 @@ public class XBayaMenu implements XBayaC
private AmazonEC2Menu amazonEC2Menu;
- private MyLeadMenu myLeadMenu;
-
private ComponentMenu componentMenu;
private MonitorMenu monitorMenu;
@@ -86,7 +83,6 @@ public class XBayaMenu implements XBayaC
this.gpelMenu = new GPELMenu(this.engine);
this.pegasusMenu = new PegasusMenu(this.engine);
this.amazonEC2Menu = new AmazonEC2Menu(this.engine);
- this.myLeadMenu = new MyLeadMenu(this.engine);
this.componentMenu = new ComponentMenu(this.engine);
this.monitorMenu = new MonitorMenu(this.engine);
this.myProxyMenu = new MyProxyMenu(this.engine);
@@ -118,7 +114,6 @@ public class XBayaMenu implements XBayaC
this.menuBar.add(this.gpelMenu.getMenu());
this.menuBar.add(this.pegasusMenu.getMenu());
this.menuBar.add(this.amazonEC2Menu.getMenu());
- this.menuBar.add(this.myLeadMenu.getMenu());
this.menuBar.add(this.myProxyMenu.getMenu());
this.menuBar.add(this.monitorMenu.getMenu());
this.menuBar.add(this.registerApplications.getMenu());
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/HeaderConstants.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/HeaderConstants.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/HeaderConstants.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/HeaderConstants.java Mon Aug 1 02:36:48 2011
@@ -26,7 +26,6 @@ public interface HeaderConstants {
public static final String HEADER_ELEMENT_GFAC = "gfac";
public static final String HEADER_ELEMENT_XREGISTRY = "xregistry";
public static final String HEADER_ELEMENT_PROXYSERVER = "proxyserver";
- public static final String HEADER_ELEMENT_MYLEAD = "mylead";
public static final String HEADER_ELEMENT_MSGBOX = "msgbox";
public static final String HEADER_ELEMENT_DSC = "dsc";
public static final String HEADER_ELEMENT_BROKER = "broker";
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java Mon Aug 1 02:36:48 2011
@@ -214,7 +214,6 @@ public class TestWorkflowInterpreter {
configuration.setDSCURL(XBayaConstants.DEFAULT_DSC_URL);
configuration.setGFacURL(XBayaConstants.DEFAULT_GFAC_URL);
configuration.setMessageBoxURL(XBayaConstants.DEFAULT_MESSAGE_BOX_URL);
- configuration.setMyLeadAgentURL(XBayaConstants.DEFAULT_MYLEAD_AGENT_URL);
configuration.setMyProxyLifetime(XBayaConstants.DEFAULT_MYPROXY_LIFTTIME);
configuration.setMyProxyPort(XBayaConstants.DEFAULT_MYPROXY_PORT);
configuration.setMyProxyServer(XBayaConstants.DEFAULT_MYPROXY_SERVER);
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Mon Aug 1 02:36:48 2011
@@ -93,8 +93,6 @@ import org.apache.airavata.xbaya.jython.
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.monitor.MonitorException;
import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
-import org.apache.airavata.xbaya.mylead.MyLead;
-import org.apache.airavata.xbaya.mylead.MyLeadConfiguration;
import org.apache.airavata.xbaya.myproxy.MyProxyClient;
import org.apache.airavata.xbaya.myproxy.gui.MyProxyChecker;
import org.apache.airavata.xbaya.ode.ODEClient;
@@ -559,13 +557,10 @@ public class WorkflowInterpreter {
try {
if (this.mode == GUI_MODE) {
leadCtxHeader = WSDLUtil.buildLeadContextHeader(this.workflow, this.configuration,
- this.engine.getMyLead(),
new MonitorConfiguration(this.configuration.getBrokerURL(), this.topic, true,
this.configuration.getMessageBoxURL()), wsNode.getID(), null);
} else {
leadCtxHeader = WSDLUtil.buildLeadContextHeader(this.workflow, this.configuration,
- // Set the userdn in the right proxy if necessary
- new MyLead(new MyLeadConfiguration(), proxy),
new MonitorConfiguration(this.configuration.getBrokerURL(), this.topic, true,
this.configuration.getMessageBoxURL()), wsNode.getID(), null);
}
@@ -715,136 +710,120 @@ public class WorkflowInterpreter {
node.getGUI().setBodyColor(NodeState.FINISHED.color);
}
- private void handleForEach(Node node) throws XBayaException {
- final ForEachNode forEachNode = (ForEachNode) node;
- EndForEachNode endForEachNode = null;
- Collection<Node> repeatNodes = node.getOutputPort(0).getToNodes();
- // we will support only one for now
- if (repeatNodes.size() != 1) {
- throw new WorkFlowInterpreterException(
- "Only one node allowed inside foreach");
- }
- Iterator<Node> iterator = repeatNodes.iterator();
- if (iterator.hasNext()) {
-
- Node middleNode = iterator.next();
-
- if (!(middleNode instanceof WSNode)) {
- throw new WorkFlowInterpreterException(
- "Encountered Node inside foreach that is not a WSNode"
- + middleNode);
- }
- Iterator<Node> endForEachNodeItr = middleNode.getOutputPort(0)
- .getToNodes().iterator();
- while (endForEachNodeItr.hasNext()) {
- Node node2 = endForEachNodeItr.next();
- if (!(node2 instanceof EndForEachNode)) {
- throw new WorkFlowInterpreterException(
- "Found More than one node inside foreach");
- } else {
- endForEachNode = (EndForEachNode) node2;
- }
-
- }
- final WSNode foreachWSNode = (WSNode) middleNode;
- final LinkedList<String> listOfValues = new LinkedList<String>();
-
- Node forEachInputNode = forEachNode.getInputPort(0).getFromNode();
- // if input node for for-each is WSNode
- if (forEachInputNode instanceof WSNode) {
- WorkflowInvoker workflowInvoker = this.invokerMap
- .get(forEachInputNode);
- if (workflowInvoker != null) {
- if (workflowInvoker instanceof GenericInvoker) {
- /*
- * TODO How this code handle object from GenericInvoker
- */
- String message = ((GenericInvoker) workflowInvoker)
- .getOutputs().toString();
- XmlElement msgElmt = XmlConstants.BUILDER
- .parseFragmentFromString(message);
- Iterator children = msgElmt.children().iterator();
- while (children.hasNext()) {
- Object object = children.next();
- if (object instanceof XmlElement) {
- XmlElement child = (XmlElement) object;
- Iterator valItr = child.children().iterator();
- if (valItr.hasNext()) {
- Object object2 = valItr.next();
- if (object2 instanceof String) {
- listOfValues.add(object2.toString());
- }
- }
- }
- }
- } else if (workflowInvoker instanceof WorkflowInvokerWrapperForGFacInvoker) {
- String outputName = forEachInputNode.getOutputPort(0)
- .getName();
- org.xmlpull.v1.builder.XmlElement msgElmt = (org.xmlpull.v1.builder.XmlElement) workflowInvoker
- .getOutput(outputName);
- Iterator children = msgElmt.children();
- while (children.hasNext()) {
- Object object = children.next();
- if (object instanceof org.xmlpull.v1.builder.XmlElement) {
- org.xmlpull.v1.builder.XmlElement child = (org.xmlpull.v1.builder.XmlElement) object;
- Iterator valItr = child.children();
- if (valItr.hasNext()) {
- Object object2 = valItr.next();
- if (object2 instanceof String) {
- listOfValues.add(object2.toString());
- }
- }
- }
- }
- }
- } else {
- throw new WorkFlowInterpreterException(
- "Did not find inputs from WS to foreach");
- }
- // if input node for for-each is input
- } else if (forEachInputNode instanceof InputNode) {
- for (DataPort dataPort : forEachNode.getInputPorts()) {
- Object val = findInputFromPort(dataPort);
- if (null == val) {
- throw new WorkFlowInterpreterException(
- "Unable to find input for the node:"
- + node.getID());
- }
- String[] vals = val.toString().split(",");
- listOfValues.addAll(Arrays.asList(vals));
- }
- } else {
- throw new WorkFlowInterpreterException(
- "Did not find inputs to foreach");
- }
-
- if (listOfValues.size() > 0) {
- forEachNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
- foreachWSNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
- endForEachNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
- final EndForEachNode tempendForEachNode = endForEachNode;
- final SystemComponentInvoker systemInvoker = new SystemComponentInvoker();
- this.invokerMap.put(endForEachNode, systemInvoker);
- new Thread() {
- @Override
- public void run() {
- try {
- runInThread(listOfValues, forEachNode,
- foreachWSNode, tempendForEachNode,
- systemInvoker);
- } catch (XBayaException e) {
- WorkflowInterpreter.this.engine
- .getErrorWindow().error(e);
- }
- }
-
- }.start();
- } else {
- throw new WorkFlowInterpreterException(
- "No array values found for foreach");
- }
- }
- }
+ private void handleForEach(Node node) throws XBayaException {
+ final ForEachNode forEachNode = (ForEachNode) node;
+ EndForEachNode endForEachNode = null;
+ Collection<Node> repeatNodes = node.getOutputPort(0).getToNodes();
+ // we will support only one for now
+ if (repeatNodes.size() != 1) {
+ throw new WorkFlowInterpreterException("Only one node allowed inside foreach");
+ }
+ Iterator<Node> iterator = repeatNodes.iterator();
+ if (iterator.hasNext()) {
+
+ Node middleNode = iterator.next();
+
+ if (!(middleNode instanceof WSNode)) {
+ throw new WorkFlowInterpreterException("Encountered Node inside foreach that is not a WSNode"
+ + middleNode);
+ }
+ Iterator<Node> endForEachNodeItr = middleNode.getOutputPort(0).getToNodes().iterator();
+ while (endForEachNodeItr.hasNext()) {
+ Node node2 = endForEachNodeItr.next();
+ if (!(node2 instanceof EndForEachNode)) {
+ throw new WorkFlowInterpreterException("Found More than one node inside foreach");
+ } else {
+ endForEachNode = (EndForEachNode) node2;
+ }
+
+ }
+ final WSNode foreachWSNode = (WSNode) middleNode;
+ final LinkedList<String> listOfValues = new LinkedList<String>();
+
+ Node forEachInputNode = forEachNode.getInputPort(0).getFromNode();
+ // if input node for for-each is WSNode
+ if (forEachInputNode instanceof WSNode) {
+ WorkflowInvoker workflowInvoker = this.invokerMap.get(forEachInputNode);
+ if (workflowInvoker != null) {
+ if (workflowInvoker instanceof GenericInvoker) {
+ /*
+ * TODO How this code handle object from GenericInvoker
+ */
+ String message = ((GenericInvoker) workflowInvoker).getOutputs().toString();
+ XmlElement msgElmt = XmlConstants.BUILDER.parseFragmentFromString(message);
+ Iterator children = msgElmt.children().iterator();
+ while (children.hasNext()) {
+ Object object = children.next();
+ if (object instanceof XmlElement) {
+ XmlElement child = (XmlElement) object;
+ Iterator valItr = child.children().iterator();
+ if (valItr.hasNext()) {
+ Object object2 = valItr.next();
+ if (object2 instanceof String) {
+ listOfValues.add(object2.toString());
+ }
+ }
+ }
+ }
+ } else if (workflowInvoker instanceof WorkflowInvokerWrapperForGFacInvoker) {
+ String outputName = forEachInputNode.getOutputPort(0).getName();
+ org.xmlpull.v1.builder.XmlElement msgElmt = (org.xmlpull.v1.builder.XmlElement) workflowInvoker
+ .getOutput(outputName);
+ Iterator children = msgElmt.children();
+ while (children.hasNext()) {
+ Object object = children.next();
+ if (object instanceof org.xmlpull.v1.builder.XmlElement) {
+ org.xmlpull.v1.builder.XmlElement child = (org.xmlpull.v1.builder.XmlElement) object;
+ Iterator valItr = child.children();
+ if (valItr.hasNext()) {
+ Object object2 = valItr.next();
+ if (object2 instanceof String) {
+ listOfValues.add(object2.toString());
+ }
+ }
+ }
+ }
+ }
+ } else {
+ throw new WorkFlowInterpreterException("Did not find inputs from WS to foreach");
+ }
+ // if input node for for-each is input
+ } else if (forEachInputNode instanceof InputNode) {
+ for (DataPort dataPort : forEachNode.getInputPorts()) {
+ Object val = findInputFromPort(dataPort);
+ if (null == val) {
+ throw new WorkFlowInterpreterException("Unable to find input for the node:" + node.getID());
+ }
+ String[] vals = val.toString().split(",");
+ listOfValues.addAll(Arrays.asList(vals));
+ }
+ } else {
+ throw new WorkFlowInterpreterException("Did not find inputs to foreach");
+ }
+
+ if (listOfValues.size() > 0) {
+ forEachNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
+ foreachWSNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
+ endForEachNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
+ final EndForEachNode tempendForEachNode = endForEachNode;
+ final SystemComponentInvoker systemInvoker = new SystemComponentInvoker();
+ this.invokerMap.put(endForEachNode, systemInvoker);
+ new Thread() {
+ @Override
+ public void run() {
+ try {
+ runInThread(listOfValues, forEachNode, foreachWSNode, tempendForEachNode, systemInvoker);
+ } catch (XBayaException e) {
+ WorkflowInterpreter.this.engine.getErrorWindow().error(e);
+ }
+ }
+
+ }.start();
+ } else {
+ throw new WorkFlowInterpreterException("No array values found for foreach");
+ }
+ }
+ }
private void handleIf(Node node) throws XBayaException {
IfNode ifNode = (IfNode) node;
@@ -918,203 +897,154 @@ public class WorkflowInterpreter {
node.getGUI().setBodyColor(NodeState.FINISHED.color);
}
- private void runInThread(LinkedList<String> listOfValues,
- ForEachNode forEachNode, WSNode foreachWSNode,
- EndForEachNode endForEachNode, SystemComponentInvoker tempInvoker)
- throws XBayaException {
- WSComponent wsComponent = foreachWSNode.getComponent();
- QName portTypeQName = wsComponent.getPortTypeQName();
-
- WorkflowInvoker invoker = null;
- LinkedList<WorkflowInvoker> invokerList = new LinkedList<WorkflowInvoker>();
- for (Iterator<String> iterator = listOfValues.iterator(); iterator
- .hasNext();) {
- String input = iterator.next();
- String wsdlLocation = getEPR(foreachWSNode);
- final String gfacURLString = this.engine.getConfiguration()
- .getGFacURL().toString();
-
- /*
- * Duplication start Code below copied from handleWSComponent
- */
- if (null == wsdlLocation) {
- if (gfacURLString.startsWith("https")) {
- GSSCredential proxy = null;
- if (this.mode == GUI_MODE) {
- this.myProxyChecker.loadIfNecessary();
- MyProxyClient myProxyClient = this.engine
- .getMyProxyClient();
- proxy = myProxyClient.getProxy();
- } else {
- proxy = SecurityUtil.getGSSCredential(this.username,
- this.password,
- this.configuration.getMyProxyServer());
- }
-
- LeadContextHeader leadCtxHeader = null;
- try {
- if (this.mode == GUI_MODE) {
- leadCtxHeader = WSDLUtil.buildLeadContextHeader(
- this.workflow,
- this.configuration,
- this.engine.getMyLead(),
- new MonitorConfiguration(this.configuration
- .getBrokerURL(), this.topic, true,
- this.configuration
- .getMessageBoxURL()),
- foreachWSNode.getID(), null);
- } else {
- leadCtxHeader = WSDLUtil
- .buildLeadContextHeader(
- this.workflow,
- this.configuration,
- // Set the userdn in the right proxy
- // if necessary
- new MyLead(
- new MyLeadConfiguration(),
- proxy),
- new MonitorConfiguration(
- this.configuration
- .getBrokerURL(),
- this.topic, true,
- this.configuration
- .getMessageBoxURL()),
- foreachWSNode.getID(), null);
- }
- } catch (URISyntaxException e) {
- throw new XBayaException(e);
- }
-
- leadCtxHeader.setServiceId(foreachWSNode.getID());
- try {
- leadCtxHeader.setWorkflowId(new URI(this.workflow
- .getName()));
-
- /*
- * We do this so that the wsdl resolver can is setup
- * wsdlresolver.getInstance is static so once this is
- * done rest of the loading should work.
- */
- XBayaSecurity.init();
-
- } catch (URISyntaxException e) {
- throw new XBayaRuntimeException(e);
- }
-
- /*
- * Resource Mapping Header
- */
- if (this.resourceMapping != null) {
- leadCtxHeader.setResourceMapping(this.resourceMapping);
- }
-
- /*
- * If there is a instance control component connects to this
- * component send information in soap header
- */
- for (Node n : foreachWSNode.getControlInPort()
- .getFromNodes()) {
- if (n instanceof InstanceNode) {
- // TODO make it as constant
- LeadResourceMapping x = new LeadResourceMapping(
- "AMAZON");
-
- x.addAttribute("ACCESS_KEY", AmazonCredential
- .getInstance().getAwsAccessKeyId());
- x.addAttribute("SECRET_KEY", AmazonCredential
- .getInstance().getAwsSecretAccessKey());
-
- if (((InstanceNode) n).isStartNewInstance()) {
- x.addAttribute("AMI_ID",
- ((InstanceNode) n).getIdAsValue());
- x.addAttribute("INS_TYPE",
- ((InstanceNode) n).getInstanceType());
- } else {
- x.addAttribute("INS_ID",
- ((InstanceNode) n).getIdAsValue());
- }
-
- x.addAttribute("USERNAME",
- ((InstanceNode) n).getUsername());
-
- // set to leadHeader
- leadCtxHeader.setResourceMapping(x);
- }
- }
-
- invoker = new WorkflowInvokerWrapperForGFacInvoker(
- portTypeQName,
- gfacURLString,
- this.configuration.getMessageBoxURL().toString(),
- leadCtxHeader,
- this.notifier
- .createServiceNotificationSender(foreachWSNode
- .getID()));
- } else {
- invoker = new GenericInvoker(
- portTypeQName,
- WSDLUtil.wsdlDefinitions5ToWsdlDefintions3(foreachWSNode
- .getComponent().getWSDL()),
- foreachWSNode.getID(), this.configuration
- .getMessageBoxURL().toString(),
- gfacURLString, this.notifier, this.configuration,
- null);
- }
-
- } else {
- if (!wsdlLocation.endsWith("?wsdl")) {
- wsdlLocation += "?wsdl";
- }
- invoker = new GenericInvoker(portTypeQName, wsdlLocation,
- foreachWSNode.getID(), this.configuration
- .getMessageBoxURL().toString(), gfacURLString,
- this.notifier);
- }
- /*
- * End duplication
- */
-
- invoker.setup();
- invoker.setOperation(wsComponent.getOperationName());
- invokerList.add(invoker);
- // find inputs
- List<DataPort> inputPorts = foreachWSNode.getInputPorts();
- for (DataPort port : inputPorts) {
- Object inputVal = findInputFromPort(port);
-
- /*
- * Handle ForEachNode
- */
- Node fromNode = port.getFromNode();
- if (fromNode instanceof ForEachNode) {
- inputVal = input;
- }
-
- if (null == inputVal) {
- throw new WorkFlowInterpreterException(
- "Unable to find inputs for the node:"
- + foreachWSNode.getID());
- }
- invoker.setInput(port.getName(), inputVal);
- }
- invoker.invoke();
- }
-
- String outputStr = "";
- for (Iterator<WorkflowInvoker> iterator = invokerList.iterator(); iterator
- .hasNext();) {
- WorkflowInvoker workflowInvoker = iterator.next();
- Object output = workflowInvoker.getOutput(foreachWSNode
- .getOutputPort(0).getName());
- outputStr += "\n<value>" + output + "</value>";
- }
- tempInvoker.addOutput(endForEachNode.getOutputPort(0).getName(),
- outputStr);
- forEachNode.getGUI().setBodyColor(NodeState.FINISHED.color);
- foreachWSNode.getGUI().setBodyColor(NodeState.FINISHED.color);
- endForEachNode.getGUI().setBodyColor(NodeState.FINISHED.color);
+ private void runInThread(LinkedList<String> listOfValues, ForEachNode forEachNode, WSNode foreachWSNode,
+ EndForEachNode endForEachNode, SystemComponentInvoker tempInvoker) throws XBayaException {
+ WSComponent wsComponent = foreachWSNode.getComponent();
+ QName portTypeQName = wsComponent.getPortTypeQName();
+
+ WorkflowInvoker invoker = null;
+ LinkedList<WorkflowInvoker> invokerList = new LinkedList<WorkflowInvoker>();
+ for (Iterator<String> iterator = listOfValues.iterator(); iterator.hasNext();) {
+ String input = iterator.next();
+ String wsdlLocation = getEPR(foreachWSNode);
+ final String gfacURLString = this.engine.getConfiguration().getGFacURL().toString();
+
+ /*
+ * Duplication start Code below copied from handleWSComponent
+ */
+ if (null == wsdlLocation) {
+ if (gfacURLString.startsWith("https")) {
+ GSSCredential proxy = null;
+ if (this.mode == GUI_MODE) {
+ this.myProxyChecker.loadIfNecessary();
+ MyProxyClient myProxyClient = this.engine.getMyProxyClient();
+ proxy = myProxyClient.getProxy();
+ } else {
+ proxy = SecurityUtil.getGSSCredential(this.username, this.password,
+ this.configuration.getMyProxyServer());
+ }
+
+ LeadContextHeader leadCtxHeader = null;
+ try {
+ if (this.mode == GUI_MODE) {
+ leadCtxHeader = WSDLUtil.buildLeadContextHeader(this.workflow, this.configuration,
+ new MonitorConfiguration(this.configuration.getBrokerURL(), this.topic, true,
+ this.configuration.getMessageBoxURL()), foreachWSNode.getID(), null);
+ } else {
+ leadCtxHeader = WSDLUtil.buildLeadContextHeader(this.workflow,
+ this.configuration,
+ new MonitorConfiguration(this.configuration.getBrokerURL(), this.topic, true,
+ this.configuration.getMessageBoxURL()), foreachWSNode.getID(), null);
+ }
+ } catch (URISyntaxException e) {
+ throw new XBayaException(e);
+ }
+
+ leadCtxHeader.setServiceId(foreachWSNode.getID());
+ try {
+ leadCtxHeader.setWorkflowId(new URI(this.workflow.getName()));
+
+ /*
+ * We do this so that the wsdl resolver can is setup wsdlresolver.getInstance is static so once
+ * this is done rest of the loading should work.
+ */
+ XBayaSecurity.init();
- }
+ } catch (URISyntaxException e) {
+ throw new XBayaRuntimeException(e);
+ }
+
+ /*
+ * Resource Mapping Header
+ */
+ if (this.resourceMapping != null) {
+ leadCtxHeader.setResourceMapping(this.resourceMapping);
+ }
+
+ /*
+ * If there is a instance control component connects to this component send information in soap
+ * header
+ */
+ for (Node n : foreachWSNode.getControlInPort().getFromNodes()) {
+ if (n instanceof InstanceNode) {
+ // TODO make it as constant
+ LeadResourceMapping x = new LeadResourceMapping("AMAZON");
+
+ x.addAttribute("ACCESS_KEY", AmazonCredential.getInstance().getAwsAccessKeyId());
+ x.addAttribute("SECRET_KEY", AmazonCredential.getInstance().getAwsSecretAccessKey());
+
+ if (((InstanceNode) n).isStartNewInstance()) {
+ x.addAttribute("AMI_ID", ((InstanceNode) n).getIdAsValue());
+ x.addAttribute("INS_TYPE", ((InstanceNode) n).getInstanceType());
+ } else {
+ x.addAttribute("INS_ID", ((InstanceNode) n).getIdAsValue());
+ }
+
+ x.addAttribute("USERNAME", ((InstanceNode) n).getUsername());
+
+ // set to leadHeader
+ leadCtxHeader.setResourceMapping(x);
+ }
+ }
+
+ invoker = new WorkflowInvokerWrapperForGFacInvoker(portTypeQName, gfacURLString, this.configuration
+ .getMessageBoxURL().toString(), leadCtxHeader,
+ this.notifier.createServiceNotificationSender(foreachWSNode.getID()));
+ } else {
+ invoker = new GenericInvoker(portTypeQName,
+ WSDLUtil.wsdlDefinitions5ToWsdlDefintions3(foreachWSNode.getComponent().getWSDL()),
+ foreachWSNode.getID(), this.configuration.getMessageBoxURL().toString(), gfacURLString,
+ this.notifier, this.configuration, null);
+ }
+
+ } else {
+ if (!wsdlLocation.endsWith("?wsdl")) {
+ wsdlLocation += "?wsdl";
+ }
+ invoker = new GenericInvoker(portTypeQName, wsdlLocation, foreachWSNode.getID(), this.configuration
+ .getMessageBoxURL().toString(), gfacURLString, this.notifier);
+ }
+ /*
+ * End duplication
+ */
+
+ invoker.setup();
+ invoker.setOperation(wsComponent.getOperationName());
+ invokerList.add(invoker);
+ // find inputs
+ List<DataPort> inputPorts = foreachWSNode.getInputPorts();
+ for (DataPort port : inputPorts) {
+ Object inputVal = findInputFromPort(port);
+
+ /*
+ * Handle ForEachNode
+ */
+ Node fromNode = port.getFromNode();
+ if (fromNode instanceof ForEachNode) {
+ inputVal = input;
+ }
+
+ if (null == inputVal) {
+ throw new WorkFlowInterpreterException("Unable to find inputs for the node:"
+ + foreachWSNode.getID());
+ }
+ invoker.setInput(port.getName(), inputVal);
+ }
+ invoker.invoke();
+ }
+
+ String outputStr = "";
+ for (Iterator<WorkflowInvoker> iterator = invokerList.iterator(); iterator.hasNext();) {
+ WorkflowInvoker workflowInvoker = iterator.next();
+ Object output = workflowInvoker.getOutput(foreachWSNode.getOutputPort(0).getName());
+ outputStr += "\n<value>" + output + "</value>";
+ }
+ tempInvoker.addOutput(endForEachNode.getOutputPort(0).getName(), outputStr);
+ forEachNode.getGUI().setBodyColor(NodeState.FINISHED.color);
+ foreachWSNode.getGUI().setBodyColor(NodeState.FINISHED.color);
+ endForEachNode.getGUI().setBodyColor(NodeState.FINISHED.color);
+
+ }
private ArrayList<Node> getReadyOutputNodesDynamically() {
ArrayList<Node> list = new ArrayList<Node>();
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java Mon Aug 1 02:36:48 2011
@@ -39,7 +39,7 @@ public class WorkflowInterpreterInvoker
throws AxisFault, RemoteException, ComponentException {
String workflowAsString = workflow.toXMLText();
- NameValue[] configurations = new NameValue[7];
+ NameValue[] configurations = new NameValue[6];
configurations[0] = new NameValue();
configurations[0].setName(HEADER_ELEMENT_GFAC);
configurations[0].setValue(XBayaConstants.DEFAULT_GFAC_URL.toString());
@@ -49,21 +49,18 @@ public class WorkflowInterpreterInvoker
configurations[2] = new NameValue();
configurations[2].setName(HEADER_ELEMENT_PROXYSERVER);
configurations[2].setValue(XBayaConstants.DEFAULT_MYPROXY_SERVER);
+
configurations[3] = new NameValue();
- configurations[3].setName(HEADER_ELEMENT_MYLEAD);
- configurations[3].setValue(XBayaConstants.DEFAULT_MYLEAD_AGENT_URL.toString());
+ configurations[3].setName(HEADER_ELEMENT_MSGBOX);
+ configurations[3].setValue(XBayaConstants.DEFAULT_MESSAGE_BOX_URL.toString());
configurations[4] = new NameValue();
- configurations[4].setName(HEADER_ELEMENT_MSGBOX);
- configurations[4].setValue(XBayaConstants.DEFAULT_MESSAGE_BOX_URL.toString());
+ configurations[4].setName(HEADER_ELEMENT_DSC);
+ configurations[4].setValue(XBayaConstants.DEFAULT_DSC_URL.toString());
configurations[5] = new NameValue();
- configurations[5].setName(HEADER_ELEMENT_DSC);
- configurations[5].setValue(XBayaConstants.DEFAULT_DSC_URL.toString());
-
- configurations[6] = new NameValue();
- configurations[6].setName(HEADER_ELEMENT_BROKER);
- configurations[6].setValue(XBayaConstants.DEFAULT_BROKER_URL.toString());
+ configurations[5].setName(HEADER_ELEMENT_BROKER);
+ configurations[5].setValue(XBayaConstants.DEFAULT_BROKER_URL.toString());
LinkedList<NameValue> nameValPairsList = new LinkedList<NameValue>();
List<InputNode> wfInputs = new ODEClient().getInputNodes(workflow);
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Mon Aug 1 02:36:48 2011
@@ -44,7 +44,6 @@ public class WorkflowInterpretorSkeleton
public static final String XREGISTRY = "xregistry";
public static final String PROXYSERVER = "proxyserver";
- public static final String MYLEAD = "mylead";
public static final String MSGBOX = "msgbox";
public static final String GFAC = "gfac";
public static final String DSC = "dsc";
@@ -133,8 +132,6 @@ public class WorkflowInterpretorSkeleton
configuration.setGFacURL(new URI(findValue(vals, GFAC, XBayaConstants.DEFAULT_GFAC_URL.toString())));
configuration.setMessageBoxURL(new URI(findValue(vals, MSGBOX,
XBayaConstants.DEFAULT_MESSAGE_BOX_URL.toString())));
- configuration.setMyLeadAgentURL(new URI(findValue(vals, MYLEAD,
- XBayaConstants.DEFAULT_MYLEAD_AGENT_URL.toString())));
configuration.setMyProxyLifetime(XBayaConstants.DEFAULT_MYPROXY_LIFTTIME);
configuration.setMyProxyPort(XBayaConstants.DEFAULT_MYPROXY_PORT);
configuration.setMyProxyServer(findValue(vals, PROXYSERVER, XBayaConstants.DEFAULT_MYPROXY_SERVER));
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java Mon Aug 1 02:36:48 2011
@@ -26,7 +26,6 @@ import java.net.URI;
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
-import org.apache.airavata.xbaya.mylead.MyLeadConfiguration;
import org.apache.airavata.xbaya.util.WSDLUtil;
import org.apache.airavata.xbaya.wf.Workflow;
@@ -93,15 +92,6 @@ public class LeadContextHeaderHelper {
}
/**
- * @param myLeadAgentURL
- */
- public void setMyLeadAgentURL(URI myLeadAgentURL) {
- if (myLeadAgentURL != null) {
- this.leadContextHeader.setMyleadAgentUrl(WSDLUtil.appendWSDLQuary(myLeadAgentURL));
- }
- }
-
- /**
* @param brokerURL
* @param topic
*/
@@ -148,14 +138,6 @@ public class LeadContextHeaderHelper {
}
/**
- * @param myleadConfiguration
- */
- public void setMyLeadConfiguration(MyLeadConfiguration myleadConfiguration) {
- setUser(myleadConfiguration.getUser());
- setMyLeadAgentURL(myleadConfiguration.getURL());
- }
-
- /**
* @param monitorConfiguration
*/
public void setMonitorConfiguration(MonitorConfiguration monitorConfiguration) {
@@ -163,7 +145,7 @@ public class LeadContextHeaderHelper {
}
/**
- * This method has to be called before setMyLeadConfiguration() or setMonitorConfiguration because this will
+ * This method has to be called before setMonitorConfiguration because this will
* overwrite some variables.
*
* @param xbayaConfiguration
@@ -175,8 +157,6 @@ public class LeadContextHeaderHelper {
// The followings might overwrite some variables.
setWorkflowTemplateID(xbayaConfiguration.getGPELTemplateID());
setWorkflowInstanceID(xbayaConfiguration.getGPELInstanceID());
- setUser(xbayaConfiguration.getMyLeadUser());
- setMyLeadAgentURL(xbayaConfiguration.getMyLeadAgentURL());
setEventSink(xbayaConfiguration.getBrokerURL(), xbayaConfiguration.getTopic());
}
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyDialog.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyDialog.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/gui/MyProxyDialog.java Mon Aug 1 02:36:48 2011
@@ -66,7 +66,7 @@ public class MyProxyDialog {
private boolean blocking;
/**
- * Constructs a MyLeadSaveWorkflowWindow.
+ * Constructs a SaveWorkflowWindow.
*
* @param engine
*/
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java Mon Aug 1 02:36:48 2011
@@ -62,14 +62,6 @@ import xsul.xhandler_soap_sticky_header.
import xsul.xwsif_runtime.WSIFClient;
import xsul.xwsif_runtime.XmlBeansWSIFRuntime;
import xsul5.wsdl.WsdlDefinitions;
-import edu.indiana.dde.mylead.agent.AgentPortType;
-import edu.indiana.dde.mylead.agent.xmlbeans.CollectionType;
-import edu.indiana.dde.mylead.agent.xmlbeans.CreateCollectionsRequestType;
-import edu.indiana.dde.mylead.agent.xmlbeans.CreateExperimentsRequestDocument;
-import edu.indiana.dde.mylead.agent.xmlbeans.OperationResponseDocument;
-import edu.indiana.extreme.lead.metadata.LEADResourceType;
-import edu.indiana.extreme.lead.metadata.ThemeType;
-import edu.indiana.extreme.lead.metadata.util.MinimalLEADMetadata;
public class ODEClient {
@@ -258,7 +250,6 @@ public class ODEClient {
leadContextHelper.setGFacURL(XBayaConstants.DEFAULT_GFAC_URL);
leadContextHelper.setUser(usedDN);
- leadContextHelper.setMyLeadAgentURL(XBayaConstants.DEFAULT_MYLEAD_AGENT_URL);
leadContextHelper.setWorkflowInstanceID(instanceID);
leadContextHelper.setWorkflowTemplateID(workflow.getUniqueWorkflowName());
@@ -423,59 +414,6 @@ public class ODEClient {
}
- /**
- * @param client
- * @param instanceID
- * @param userDN
- * @param wsdlLoc
- * @param experimentName
- * @param experimentDescription
- * @return
- */
- private static OperationResponseDocument createExperiment(String instanceID, String templateID, String userDN,
- String wsdlLoc, String experimentName, String experimentDescription) {
- AgentPortType stub = new ODEClient().createStub(userDN, wsdlLoc);
- CreateExperimentsRequestDocument experimentDoc = CreateExperimentsRequestDocument.Factory.newInstance();
- CreateCollectionsRequestType createCollectionReq = CreateCollectionsRequestType.Factory.newInstance();
- CollectionType collectionInfo = createCollectionReq.addNewCollectionInfo();
-
- MinimalLEADMetadata minimalLEADMetadata = new MinimalLEADMetadata(userDN, experimentName, experimentDescription);
-
- LEADResourceType leadResource = minimalLEADMetadata.getLeadResourceDoc().getLEADresource();
- ThemeType theme = leadResource.addNewData().addNewIdinfo().addNewKeywords().addNewTheme();
-
- theme.addNewThemekey().setStringValue(instanceID);
- theme.setThemekt("ROOT_WORKFLOW_ID");
-
- theme = leadResource.addNewData().addNewIdinfo().addNewKeywords().addNewTheme();
-
- theme.addNewThemekey().setStringValue(templateID);
- theme.setThemekt("ROOT_WORKFLOW_INSTANCE_ID");
-
- collectionInfo.setLEADresource(leadResource);
-
- collectionInfo.setAssignNewResourceID(true);
-
- experimentDoc.setCreateExperimentsRequest(createCollectionReq);
-
- OperationResponseDocument res = stub.createExperiments(experimentDoc);
- return res;
- }
-
- private AgentPortType createStub(String dn, String wsdlLoc) {
- LeadContextHeader leadContextHeader = new LeadContextHeader("NEI", dn);
- leadContextHeader.setUserDn(dn);
- StickySoapHeaderHandler soapHeaderHandler = new StickySoapHeaderHandler("use-lead-header", leadContextHeader);
-
- WSIFClient wcl = XmlBeansWSIFRuntime.newClient(wsdlLoc);
- wcl.addHandler(soapHeaderHandler);
-
- AgentPortType stub = (AgentPortType) wcl.generateDynamicStub(AgentPortType.class);
-
- return stub;
-
- }
-
public ResourceData[] getStreamResources(XRegistryClient client) throws XRegistryClientException {
ResourceData[] result = client.findResource(STREAM_SOURCE_NS);
return result;
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamPublisher.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamPublisher.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamPublisher.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamPublisher.java Mon Aug 1 02:36:48 2011
@@ -60,7 +60,6 @@ public class StreamPublisher {
LeadContextHeaderHelper leadContextHelper = new LeadContextHeaderHelper();
XBayaConfiguration configuration = engine.getConfiguration();
leadContextHelper.setXBayaConfiguration(configuration);
- leadContextHelper.setMyLeadConfiguration(engine.getMyLead().getConfiguration());
leadContextHelper.setWorkflowInstanceID(engine.getWorkflow().getGPELInstanceID());
leadContextHelper.setWorkflowTemplateID(engine.getWorkflow()
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamSourceWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamSourceWindow.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamSourceWindow.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/streaming/StreamSourceWindow.java Mon Aug 1 02:36:48 2011
@@ -20,6 +20,7 @@
*/
package org.apache.airavata.xbaya.streaming;
+
public class StreamSourceWindow {
}
\ No newline at end of file
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LoadTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LoadTest.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LoadTest.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/LoadTest.java Mon Aug 1 02:36:48 2011
@@ -32,6 +32,7 @@ import org.apache.airavata.xbaya.gui.XBa
import org.apache.airavata.xbaya.jython.gui.JythonRunnerWindow;
import org.apache.airavata.xbaya.myproxy.MyProxyClient;
import org.apache.airavata.xbaya.myproxy.gui.MyProxyLoader;
+
public class LoadTest {
private int load = 1;
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java Mon Aug 1 02:36:48 2011
@@ -61,14 +61,6 @@ public abstract class XBayaTestCase exte
this.configuration.setTopic("xbaya-test");
}
- // MyLEAD
- if (this.configuration.getMyLeadUser() == null) {
- this.configuration.setMyLeadUser(SAMPLE_MY_LEAD_USER);
- }
- if (this.configuration.getMyLeadProject() == null) {
- this.configuration.setMyLeadProject(SAMPLE_MY_LEAD_PROJECT);
- }
-
// Overwrite some default setting.
String gpelURLString = System.getProperty("gpel.url");
if (gpelURLString != null) {
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonOneTimeRunnerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonOneTimeRunnerTestCase.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonOneTimeRunnerTestCase.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/jython/JythonOneTimeRunnerTestCase.java Mon Aug 1 02:36:48 2011
@@ -20,6 +20,7 @@
*/
package org.apache.airavata.xbaya.test.jython;
+
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.jython.runner.JythonOneTimeRunnerImpl;
import org.apache.airavata.xbaya.jython.script.JythonScript;
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/WSDLUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/WSDLUtil.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/WSDLUtil.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/WSDLUtil.java Mon Aug 1 02:36:48 2011
@@ -39,7 +39,6 @@ import org.apache.airavata.xbaya.XBayaRu
import org.apache.airavata.xbaya.component.ComponentException;
import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
-import org.apache.airavata.xbaya.mylead.MyLead;
import org.apache.airavata.xbaya.wf.Workflow;
import org.xmlpull.infoset.XmlAttribute;
import org.xmlpull.infoset.XmlBuilderException;
@@ -480,7 +479,7 @@ public class WSDLUtil {
XBayaConfiguration configuration = engine.getConfiguration();
Workflow workflow = engine.getWorkflow();
- LeadContextHeader leadContext = buildLeadContextHeader(workflow, configuration, engine.getMyLead(),
+ LeadContextHeader leadContext = buildLeadContextHeader(workflow, configuration,
monitorConfiguration, nodeId, resourceMapping);
return leadContext;
@@ -494,16 +493,14 @@ public class WSDLUtil {
* @param resourceMapping
* @param configuration
* @param workflow
- * @param myLead
* @return
* @throws URISyntaxException
*/
public static LeadContextHeader buildLeadContextHeader(Workflow workflow, XBayaConfiguration configuration,
- MyLead myLead, MonitorConfiguration monitorConfiguration, String nodeId, LeadResourceMapping resourceMapping)
+ MonitorConfiguration monitorConfiguration, String nodeId, LeadResourceMapping resourceMapping)
throws URISyntaxException {
LeadContextHeaderHelper leadContextHelper = new LeadContextHeaderHelper();
leadContextHelper.setXBayaConfiguration(configuration);
- leadContextHelper.setMyLeadConfiguration(myLead.getConfiguration());
leadContextHelper.setWorkflowInstanceID(workflow.getGPELInstanceID());
leadContextHelper.setWorkflowTemplateID(workflow.getUniqueWorkflowName());
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XmlFormatter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XmlFormatter.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XmlFormatter.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XmlFormatter.java Mon Aug 1 02:36:48 2011
@@ -38,8 +38,8 @@ import org.xml.sax.SAXException;
/**
* Pretty-prints xml, supplied as a string.
- * <p/>
- * eg. <code>
+ * <p/>
+ * eg. <code>
* String formattedXml = new XmlFormatter().format("<tag><nested>hello</nested></tag>");
* </code>
*/
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/GPELWorkflowContext.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/GPELWorkflowContext.java?rev=1152677&r1=1152676&r2=1152677&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/GPELWorkflowContext.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/GPELWorkflowContext.java Mon Aug 1 02:36:48 2011
@@ -61,7 +61,6 @@ public class GPELWorkflowContext impleme
leadContextHeader.setWorkflowTemplateId(workflow.getGPELTemplateID());
leadContextHeader.setWorkflowInstanceId(new URI(client.getInstanceID()));
leadContextHeader.setUserDn(proxy.getName().toString());
- leadContextHeader.setMyleadAgentUrl(new URI(XBayaConstants.DEFAULT_MYLEAD_AGENT_URL.toString() + "?wsdl"));
WsaEndpointReference eventSink = WseClientAPI.createEndpointReference(
XBayaConstants.DEFAULT_BROKER_URL.toString(), topic);
leadContextHeader.setEventSink(eventSink);