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 2012/08/25 18:24:13 UTC
svn commit: r1377317 - in /incubator/airavata/trunk/modules:
airavata-client/src/main/java/org/apache/airavata/client/
distribution/src/main/assembly/ distribution/src/main/resources/bin/
distribution/src/main/resources/conf/ workflow-model/workflow-mo...
Author: smarru
Date: Sat Aug 25 16:24:12 2012
New Revision: 1377317
URL: http://svn.apache.org/viewvc?rev=1377317&view=rev
Log:
Removing references to legacy xregistry
Removed:
incubator/airavata/trunk/modules/distribution/src/main/resources/bin/xregistry-migrator.sh
incubator/airavata/trunk/modules/distribution/src/main/resources/conf/xregistry.properties
Modified:
incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java
incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/ode/ODEClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ODEInvokerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/PegasusInvokerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java
Modified: incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java (original)
+++ incubator/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientConfiguration.java Sat Aug 25 16:24:12 2012
@@ -25,7 +25,6 @@ import java.net.URL;
public class AiravataClientConfiguration {
private URL gfacURL;
- private URL xregistryURL;
private String myproxyHost="myproxy.teragrid.org";
private URL messageboxURL;
private URL messagebrokerURL;
@@ -43,12 +42,6 @@ public class AiravataClientConfiguration
public void setGfacURL(URL gfacURL) {
this.gfacURL = gfacURL;
}
- public URL getXregistryURL() {
- return xregistryURL;
- }
- public void setXregistryURL(URL xregistryURL) {
- this.xregistryURL = xregistryURL;
- }
public String getMyproxyHost() {
return myproxyHost;
}
Modified: incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Sat Aug 25 16:24:12 2012
@@ -248,8 +248,6 @@
<include>globus:transfer-api-client</include>
<include>org.apache.airavata:airavata-registry-api</include>
<include>org.apache.airavata:airavata-registry-migrator:jar</include>
- <include>xregistry:xregistry-client:jar</include>
- <include>xregistry:xregistry_generated:jar</include>
<include>org.apache.airavata:airavata-common-registry-api</include>
<include>org.apache.airavata:airavata-workflow-execution-context</include>
<include>org.apache.airavata:airavata-workflow-tracking</include>
Modified: incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/ode/ODEClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/ode/ODEClient.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/ode/ODEClient.java (original)
+++ incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/ode/ODEClient.java Sat Aug 25 16:24:12 2012
@@ -82,61 +82,6 @@ public class ODEClient {
}
/**
- * Returns a WSDL that is ready to be used as the WSIF invokable WSDL to initiate the process
- *
- * @param xRegistryURI
- * @param gssCredential
- * @param qname
- * Qname of the workflow that was used to store in XRegistry
- * @param dscUrl
- * @param odeEprEndingWithPort
- * Something that look like https://kili.extreme.indiana.edu:17433
- * @return
- */
- // public WsdlDefinitions getWorkflowWSDL(URI xRegistryURI, GSSCredential gssCredential, QName qname,
- // String odeEprEndingWithPort) {
- // try {
- // XRegistryAccesser xregistryAccesser = new XRegistryAccesser(gssCredential, xRegistryURI);
- // Workflow workflow = xregistryAccesser.getWorkflow(qname);
- // // The REsulting WSDL is not affected by the DSCURL this is
- // // necessary to create the other scripts
- // // So send in some dummy URI for DSC
- // URI dscUrl = XBayaConstants.DEFAULT_DSC_URL;
- // return workflow.getOdeInvokableWSDL(dscUrl, odeEprEndingWithPort);
- // } catch (Exception e) {
- // throw new XBayaRuntimeException(e);
- // }
- // }
-
- // public ResourceData[] getStreamResources(XRegistryClient client) throws XRegistryClientException {
- // ResourceData[] result = client.findResource(STREAM_SOURCE_NS);
- // return result;
- // }
- //
- // public void deployStreamSource(XRegistryClient client, String name, String wsdlURL) throws
- // XRegistryClientException {
- // QName qname = new QName(STREAM_SOURCE_NS, name);
- // if (isResourceExist(client, qname)) {
- // throw new XRegistryClientException("Resource Already exist by qname:" + qname);
- // }
- // client.registerResource(qname, wsdlURL);
- // }
-
- /**
- * @param client
- * @param qname
- * @return
- * @throws XregistryException
- */
- // private boolean isResourceExist(XRegistryClient client, QName qname) throws XRegistryClientException {
- // String resource = client.getResource(qname);
- // if (resource != null && !"".equals(resource)) {
- // return true;
- // }
- // return false;
- // }
-
- /**
* @param workflow
* @return
*/
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java Sat Aug 25 16:24:12 2012
@@ -69,8 +69,6 @@ public class XBayaConfiguration extends
private URI gfacURL = XBayaConstants.DEFAULT_GFAC_URL;
- // private URI xRegistryURL = XBayaConstants.DEFAULT_XREGISTRY_URL;
-
private URI registryURL = XBayaConstants.REGISTRY_URL;
private String regigstryUserName = XBayaConstants.REGISTRY_USERNAME;
@@ -342,25 +340,6 @@ public class XBayaConfiguration extends
}
/**
- * Returns the xRegistryURL.
- *
- * @return The xRegistryURL
- */
- // public URI getXRegistryURL() {
- // return this.xRegistryURL;
- // }
-
- /**
- * Sets registryURL.
- *
- * @param registryURL
- * The xRegistryURL to set.
- */
- // public void setXRegistryURL(URI registryURL) {
- // this.xRegistryURL = registryURL;
- // }
-
- /**
* @return The DSC URL
*/
public URI getDSCURL() {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java Sat Aug 25 16:24:12 2012
@@ -169,18 +169,8 @@ public class XBayaEngine {
// Initialize security at the beginning.
initSecurity();
- // load myProxy before loading components from registries.
- // loadMyProxy();
-
initRegistry();
- // TODO May be we need to load a default workflow from Xregistry.
- // initGPEL();
-
- // This has to be after gpel initialization.
-// loadDefaultGraph();
-
- // This has to be after loading a graph.
initMonitor();
}
@@ -194,21 +184,6 @@ public class XBayaEngine {
}
}
- // private void loadyProxy() {
- // if (this.configuration.isLoadMyProxy()) {
- // if (this.configuration.getMyProxyUsername() == null) {
- // this.getGUI().getErrorWindow().error("Trying to load the proxy, but the myproxy usernameis not set.");
- // } else if (this.configuration.getXRegistryURL() == null) {
- // this.getGUI().getErrorWindow().error(
- // "Trying to load the XRegistry default services, but Xregistry url is not set");
- // } else {
- // MyProxyDialog dialog = new MyProxyDialog(this);
- // dialog.show(true); // blocking
- // }
- //
- // }
- // }
-
/**
* Initializes registris.
*/
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java Sat Aug 25 16:24:12 2012
@@ -119,7 +119,6 @@ public class TestWorkflowInterpreter {
configuration.setMyProxyLifetime(XBayaConstants.DEFAULT_MYPROXY_LIFTTIME);
configuration.setMyProxyPort(XBayaConstants.DEFAULT_MYPROXY_PORT);
configuration.setMyProxyServer(XBayaConstants.DEFAULT_MYPROXY_SERVER);
- // configuration.setXRegistryURL(XBayaConstants.DEFAULT_XREGISTRY_URL);
return configuration;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterInvoker.java Sat Aug 25 16:24:12 2012
@@ -34,7 +34,6 @@ public class WorkflowInterpreterInvoker
// configurations[0].setValue(XBayaConstants.DEFAULT_GFAC_URL.toString());
// configurations[1] = new NameValue();
// configurations[1].setName(HEADER_ELEMENT_REGISTRY);
- // configurations[1].setValue(XBayaConstants.DEFAULT_XREGISTRY_URL.toString());
// configurations[2] = new NameValue();
// configurations[2].setName(HEADER_ELEMENT_PROXYSERVER);
// configurations[2].setValue(XBayaConstants.DEFAULT_MYPROXY_SERVER);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LeadContextHeaderHelper.java Sat Aug 25 16:24:12 2012
@@ -144,7 +144,6 @@ public class LeadContextHeaderHelper {
* @param xbayaConfiguration
*/
public void setXBayaConfiguration(XBayaConfiguration xbayaConfiguration) {
- // setXRegistryURL(xbayaConfiguration.getXRegistryURL());
setGFacURL(xbayaConfiguration.getGFacURL());
// The followings might overwrite some variables.
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java Sat Aug 25 16:24:12 2012
@@ -57,10 +57,8 @@ public class RegistryAccesser {
private GSSCredential gssCredential;
- private URI xregistryURL;
-
/**
- * Constructs a XRegistryAccesser.
+ * Constructs a RegistryAccesser.
*
* @param engine
*/
@@ -131,29 +129,8 @@ public class RegistryAccesser {
workflowId = StringUtil.convertToJavaIdentifier(workflowId);
- // FIXME::Commenting the workflow UUID. It is debatable if the
- // workflow template id should be unique or not.
- // workflowId = workflowId + UUID.randomUUID();
-
QName workflowQName = new QName(XBayaConstants.OGCE_WORKFLOW_NS, workflowId);
- // first find whether this resource is already in xregistry
- // TODO: Add the check back
- // DocData[] resource =
- // client.findOGCEResource(workflowQName.toString(), "Workflow",
- // null);
- // if (resource != null && !"".equals(resource)) {
- // // if already there then remove
- //
- // int result =
- // JOptionPane.showConfirmDialog(this.engine.getGUI().getGraphCanvas().getSwingComponent(),
- // "Workflow Already Exist in Xregistry. Do you want to overwrite",
- // "Workflow already exist", JOptionPane.YES_NO_OPTION);
- // if(result != JOptionPane.YES_OPTION){
- // return;
- // }
- // client.removeResource(workflowQName);
- // }
String workflowAsString = XMLUtil.xmlElementToString(workflow.toXML());
String owner = this.engine.getConfiguration().getRegistryUserName();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WSIFTestCase.java Sat Aug 25 16:24:12 2012
@@ -34,8 +34,6 @@ public class WSIFTestCase extends XBayaT
private ComponentTreeNode resouceCatalogComponentTree;
- private ComponentTreeNode xRegistryComponentTree;
-
/**
* @param args
*/
@@ -50,7 +48,6 @@ public class WSIFTestCase extends XBayaT
protected void setUp() throws Exception {
super.setUp();
this.resouceCatalogComponentTree = null;
- this.xRegistryComponentTree = null;
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ODEInvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ODEInvokerWindow.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ODEInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ODEInvokerWindow.java Sat Aug 25 16:24:12 2012
@@ -76,7 +76,6 @@ public class ODEInvokerWindow {
private MyProxyChecker myProxyChecker;
private GridPanel parameterPanel;
private XBayaTextField topicTextField;
- // private XBayaTextField xRegistryTextField;
private XBayaTextField gfacTextField;
private JButton invokeButton;
private XBayaDialog dialog;
@@ -112,9 +111,6 @@ public class ODEInvokerWindow {
this.topicTextField = new XBayaTextField();
XBayaLabel topicLabel = new XBayaLabel("Notification Topic", this.topicTextField);
- // this.xRegistryTextField = new XBayaTextField();
- // XBayaLabel xRegistryLabel = new XBayaLabel("XRegistry URL", this.xRegistryTextField);
-
this.gfacTextField = new XBayaTextField();
XBayaLabel gfacLabel = new XBayaLabel("GFac URL", this.gfacTextField);
@@ -130,8 +126,6 @@ public class ODEInvokerWindow {
GridPanel infoPanel = new GridPanel();
infoPanel.add(topicLabel);
infoPanel.add(this.topicTextField);
- // infoPanel.add(xRegistryLabel);
- // infoPanel.add(this.xRegistryTextField);
infoPanel.add(gfacLabel);
infoPanel.add(this.gfacTextField);
infoPanel.add(resourceMappingLabel);
@@ -232,22 +226,6 @@ public class ODEInvokerWindow {
URI workfowInstanceID = URI.create(StringUtil.convertToJavaIdentifier(topic));
this.workflow.setGPELInstanceID(workfowInstanceID);
- // XRegistry
- // String xRegistry = this.xRegistryTextField.getText();
- // URI xRegistryURL;
- // if (xRegistry.length() == 0) {
- // this.engine.getGUI().getErrorWindow().error("X-registry url is required");
- // return;
- // } else {
- // try {
- // xRegistryURL = new URI(xRegistry).parseServerAuthority();
- //
- // } catch (URISyntaxException e) {
- // this.engine.getGUI().getErrorWindow().error(ErrorMessages.XREGISTRY_URL_WRONG, e);
- // return;
- // }
- // }
-
// GFac
String gfac = this.gfacTextField.getText();
URI gfacURL;
@@ -266,7 +244,6 @@ public class ODEInvokerWindow {
MonitorConfiguration monitorConfig = this.engine.getMonitor().getConfiguration();
monitorConfig.setTopic(topic);
XBayaConfiguration config = this.engine.getConfiguration();
- // config.setXRegistryURL(xRegistryURL);
config.setGFacURL(gfacURL);
// Deal with the Lead resource mapping
@@ -458,13 +435,6 @@ public class ODEInvokerWindow {
this.topicTextField.setText(UUID.randomUUID().toString());
}
- // XRegistry
- // if (null != configuration.getXRegistryURL()) {
- // this.xRegistryTextField.setText(configuration.getXRegistryURL());
- // } else {
- // this.xRegistryTextField.setText(XBayaConstants.DEFAULT_XREGISTRY_URL);
- // }
-
// GFac URL
this.gfacTextField.setText(configuration.getGFacURL());
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/PegasusInvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/PegasusInvokerWindow.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/PegasusInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/PegasusInvokerWindow.java Sat Aug 25 16:24:12 2012
@@ -58,7 +58,6 @@ public class PegasusInvokerWindow {
private GridPanel parameterPanel;
private XBayaTextField topicTextField;
- // private XBayaTextField xRegistryTextField;
private XBayaTextField gfacTextField;
private XBayaTextField inputFilepathField;
private JButton invokeButton;
@@ -80,9 +79,6 @@ public class PegasusInvokerWindow {
this.topicTextField = new XBayaTextField();
XBayaLabel topicLabel = new XBayaLabel("Notification Topic", this.topicTextField);
- // this.xRegistryTextField = new XBayaTextField();
- // XBayaLabel xRegistryLabel = new XBayaLabel("XRegistry URL", this.xRegistryTextField);
-
this.gfacTextField = new XBayaTextField();
XBayaLabel gfacLabel = new XBayaLabel("GFac URL", this.gfacTextField);
@@ -93,8 +89,6 @@ public class PegasusInvokerWindow {
GridPanel infoPanel = new GridPanel();
infoPanel.add(topicLabel);
infoPanel.add(this.topicTextField);
- // infoPanel.add(xRegistryLabel);
- // infoPanel.add(this.xRegistryTextField);
infoPanel.add(gfacLabel);
infoPanel.add(this.gfacTextField);
infoPanel.add(filePathLabel);
@@ -142,7 +136,6 @@ public class PegasusInvokerWindow {
request.setWorkflowID(workflowID);
request.setTopic(this.topicTextField.getText());
request.setGFacLocation(this.gfacTextField.getText());
- // request.setXRegistryLocation(this.xRegistryTextField.getText());
request.setInputStrings(new String[] { "lol", "lol2" });
SubmitRefResponse response = stub.submitById(request);
} catch (AxisFault e) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java Sat Aug 25 16:24:12 2012
@@ -94,8 +94,6 @@ public class DynamicWorkflowRunnerWindow
// private XBayaComboBox resourceSelectionComboBox;
- // private XBayaTextField xRegistryTextField;
-
private JComboBox gfacUrlListField;
private JCheckBox interactChkBox;
@@ -192,15 +190,6 @@ public class DynamicWorkflowRunnerWindow
this.topicTextField.setText(UUID.randomUUID().toString());
- // XBayaConfiguration config = this.engine.getConfiguration();
- // this.gfacTextField.setText(config.getGFacURL().toString());
- // URI registryURL = config.getXRegistryURL();
- // if (null != registryURL) {
- // this.xRegistryTextField.setText(registryURL.toString());
- // } else {
- // this.xRegistryTextField.setText(XBayaConstants.DEFAULT_XREGISTRY_URL);
- // }
-
this.dialog.show();
}
@@ -214,18 +203,6 @@ public class DynamicWorkflowRunnerWindow
this.parameterTextFields.clear();
}
- // FIXME: Change this to use JCR registry
- // private Object[] initHostNameList() {
- // XRegistryAccesser xRegAccesser = new XRegistryAccesser(this.engine);
- // HostDescData[] hostDataList = xRegAccesser.searchHostByName("");
- // List<String> nameList = new ArrayList<String>();
- // nameList.add("");
- // for (HostDescData hostData : hostDataList) {
- // nameList.add(hostData.getName().toString());
- // }
- // return nameList.toArray();
- // }
-
/**
* ReInit Host Name ComboBox
*/
@@ -246,8 +223,6 @@ public class DynamicWorkflowRunnerWindow
this.topicTextField = new XBayaTextField();
XBayaLabel topicLabel = new XBayaLabel("Notification topic", this.topicTextField);
- // this.xRegistryTextField = new XBayaTextField();
- // XBayaLabel xRegistryLabel = new XBayaLabel("XRegistry URL", this.xRegistryTextField);
this.gfacUrlListField = new JComboBox();
XBayaLabel gfacURLLabel = new XBayaLabel("GFac URL", this.gfacUrlListField);
this.interactChkBox = new JCheckBox();
@@ -264,10 +239,6 @@ public class DynamicWorkflowRunnerWindow
infoPanel.add(this.instanceNameTextField);
infoPanel.add(topicLabel);
infoPanel.add(this.topicTextField);
- // infoPanel.add(xRegistryLabel);
- // infoPanel.add(this.xRegistryTextField);
- // infoPanel.add(gfacLabel);
- // infoPanel.add(this.gfacTextField);
infoPanel.add(gfacURLLabel);
infoPanel.add(this.gfacUrlListField);
infoPanel.add(interactLabel);
@@ -362,15 +333,6 @@ public class DynamicWorkflowRunnerWindow
inputNode.setDefaultValue(value);
}
- // final String xregistryUrl = this.xRegistryTextField.getText();
- // if (null != xregistryUrl && !"".equals(xregistryUrl)) {
- // try {
- // this.engine.getConfiguration().setXRegistryURL(new URI(xregistryUrl));
- // } catch (URISyntaxException e) {
- // this.engine.getGUI().getErrorWindow().error(e);
- // }
- // }
-
final String gFacUrl = (String) this.gfacUrlListField.getSelectedItem();
if (null != gFacUrl && !"".equals(gFacUrl)) {
try {
@@ -385,27 +347,7 @@ public class DynamicWorkflowRunnerWindow
* Load host description from xregistry and add to interpreter
*/
LeadResourceMapping mapping = null;
- // String host = this.resourceSelectionComboBox.getText();
- // if (host != null && !host.isEmpty()) {
- // XRegistryAccesser xregistryAccesser = new XRegistryAccesser(this.engine);
- //
- // HostDescriptionRegistrationWindow hostWindow = HostDescriptionRegistrationWindow.getInstance();
- //
- // if (!hostWindow.isEngineSet()) {
- // hostWindow.setXBayaEngine(this.engine);
- // }
- //
- // HostBean hostBean = xregistryAccesser.getHostBean(host);
- //
- // mapping = new LeadResourceMapping(host);
- // try {
- // mapping.setGatekeeperEPR(new URI(hostBean.getGateKeeperendPointReference()));
- // } catch (Exception e) {
- // this.engine.getGUI().getErrorWindow().error(e);
- // }
- //
- // }
-
+
final LeadResourceMapping resourceMapping = mapping;
final String topicString = topic;
new Thread() {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java Sat Aug 25 16:24:12 2012
@@ -114,7 +114,6 @@ public class XBayaUtil {
leadContext.setNodeId(nodeId);
leadContext.setTimeStep("1");
- // leadContext.setXRegistryUrl(new URI(configuration.getXRegistryURL().toString() + "?wsdl"));
if (resourceMapping != null) {
leadContext.setResourceMapping(resourceMapping);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java?rev=1377317&r1=1377316&r2=1377317&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java Sat Aug 25 16:24:12 2012
@@ -66,8 +66,6 @@ public abstract class WorkflowClient ext
protected URI engineURL;
- String xregistryURL;
-
// ===========================================================================
// Concrete Methods
// ===========================================================================
@@ -250,8 +248,6 @@ public abstract class WorkflowClient ext
public abstract void connect() throws WorkflowEngineException;
- public abstract void setXRegistryUrl(URI xRegistryURL);
-
public abstract void setXBayaEngine(XBayaEngine xBayaEngine);
}