airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1180114 - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: ./ experiment/gui/ file/gui/ gpel/gui/ graph/dynamic/gui/ gui/ interpretor/ lead/ ode/ ode/gui/ pegasus/gui/ test/ util/ workflow/proxy/ xreg...
Date Fri, 07 Oct 2011 17:31:44 GMT
Author: lahiru
Date: Fri Oct  7 17:31:42 2011
New Revision: 1180114

URL: http://svn.apache.org/viewvc?rev=1180114&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-120.

Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.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/experiment/gui/WorkflowInterpreterLaunchWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/XRegistryConfigurationWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ODEScriptFiler.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.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/WorkflowInterpretorSkeleton.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/ode/ODEInvokerWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.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/proxy/WorkflowProxyClient.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryAccesser.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/gui/XRegistryWindow.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBaya.java Fri Oct  7 17:31:42 2011
@@ -116,16 +116,16 @@ public class XBaya {
                 } else if ("-workflow".equalsIgnoreCase(arg)) {
                     index++;
                     this.config.setWorkflow(args[index]);
-                } else if ("-RegistryCredentials".equalsIgnoreCase(arg)) {
-                    index++;
-                    String url = args[index];
-                    try {
-                        this.config.setXRegistryURL(parseURL(url));
-                    } catch (URISyntaxException e) {
-                        String message = "The XRegistry URL is in wrong format: " + url;
-                        logger.warn(message, e);
-                        this.config.addError(new XBayaException(message, e));
-                    }
+//                } else if ("-RegistryCredentials".equalsIgnoreCase(arg)) {
+//                    index++;
+//                    String url = args[index];
+//                    try {
+//                        this.config.setXRegistryURL(parseURL(url));
+//                    } catch (URISyntaxException e) {
+//                        String message = "The XRegistry URL is in wrong format: " + url;
+//                        logger.warn(message, e);
+//                        this.config.addError(new XBayaException(message, e));
+//                    }
                 } else if ("-gfacURL".equalsIgnoreCase(arg)) {
                     index++;
                     String url = args[index];

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=1180114&r1=1180113&r2=1180114&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 Fri Oct  7 17:31:42 2011
@@ -66,7 +66,7 @@ public class XBayaConfiguration {
 
     private URI gfacURL = XBayaConstants.DEFAULT_GFAC_URL;
 
-    private URI xRegistryURL = XBayaConstants.DEFAULT_XREGISTRY_URL;
+//    private URI xRegistryURL = XBayaConstants.DEFAULT_XREGISTRY_URL;
 
     private URI registryURL = XBayaConstants.REGISTRY_URL;
 
@@ -323,9 +323,9 @@ public class XBayaConfiguration {
      * 
      * @return The xRegistryURL
      */
-    public URI getXRegistryURL() {
-        return this.xRegistryURL;
-    }
+//    public URI getXRegistryURL() {
+//        return this.xRegistryURL;
+//    }
 
     /**
      * Sets registryURL.
@@ -333,9 +333,9 @@ public class XBayaConfiguration {
      * @param registryURL
      *            The xRegistryURL to set.
      */
-    public void setXRegistryURL(URI registryURL) {
-        this.xRegistryURL = registryURL;
-    }
+//    public void setXRegistryURL(URI registryURL) {
+//        this.xRegistryURL = registryURL;
+//    }
 
     /**
      * @return The DSC URL

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=1180114&r1=1180113&r2=1180114&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 Fri Oct  7 17:31:42 2011
@@ -45,7 +45,6 @@ import org.apache.airavata.xbaya.monitor
 import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
 import org.apache.airavata.xbaya.monitor.gui.MonitorStarter;
 import org.apache.airavata.xbaya.myproxy.MyProxyClient;
-import org.apache.airavata.xbaya.myproxy.gui.MyProxyDialog;
 import org.apache.airavata.xbaya.security.XBayaSecurity;
 import org.apache.airavata.xbaya.streaming.StreamTableModel;
 import org.apache.airavata.xbaya.wf.Workflow;
@@ -229,7 +228,7 @@ public class XBayaEngine {
         initSecurity();
 
         // load myProxy before loading components from registries.
-        loadMyProxy();
+//        loadMyProxy();
 
         initRegistry();
 
@@ -237,7 +236,7 @@ public class XBayaEngine {
         // initGPEL();
 
         // This has to be after gpel initialization.
-        loadDefaultGraph();
+//        loadDefaultGraph();
 
         // This has to be after loading a graph.
         initMonitor();
@@ -253,20 +252,20 @@ public class XBayaEngine {
         }
     }
 
-    private void loadMyProxy() {
-        if (this.configuration.isLoadMyProxy()) {
-            if (this.configuration.getMyProxyUsername() == null) {
-                this.getErrorWindow().error("Trying to load the proxy, but the myproxy usernameis not set.");
-            } else if (this.configuration.getXRegistryURL() == null) {
-                this.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
-            }
-
-        }
-    }
+//    private void loadyProxy() {
+//        if (this.configuration.isLoadMyProxy()) {
+//            if (this.configuration.getMyProxyUsername() == null) {
+//                this.getErrorWindow().error("Trying to load the proxy, but the myproxy usernameis not set.");
+//            } else if (this.configuration.getXRegistryURL() == null) {
+//                this.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.
@@ -307,51 +306,49 @@ public class XBayaEngine {
         }
 
         // load xRegistry only when myProxy is loaded and xRegistryURL is presented
-        if (this.configuration.getXRegistryURL() != null && this.configuration.isLoadMyProxy()) {
-            new Thread() {
-                @Override
-                public void run() {
-                    try {
-                        XRegistryComponent client = new XRegistryComponent(
-                                XBayaEngine.this.configuration.getXRegistryURL(), XRegistryComponent.Type.ABSTRACT,
-                                XBayaEngine.this.myProxyClient.getProxy());
-                        XBayaEngine.this.setXRegistryURL(XBayaEngine.this.configuration.getXRegistryURL());
-                        ComponentTreeNode componentTree = client.getComponentTree();
-                        componentTreeViewer.addComponentTree(componentTree);
-
-                    } catch (ComponentRegistryException e) {
-                        getErrorWindow().error(ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
-                    } catch (RuntimeException e) {
-                        getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
-                    }
-                }
-            }.start();
-        }
-    }
-
-    public void setXRegistryURL(URI xregistryURL) {
-        this.configuration.setXRegistryURL(xregistryURL);
-    }
-
-    public URI getXRegistryClient() {
-        return this.configuration.getXRegistryURL();
-    }
+//            new Thread() {
+//                @Override
+//                public void run() {
+//                    try {
+//                        XRegistryComponent client = new XRegistryComponent(
+//                                XBayaEngine.this.configuration.getXRegistryURL(), XRegistryComponent.Type.ABSTRACT,
+//                                XBayaEngine.this.myProxyClient.getProxy());
+//                        XBayaEngine.this.setXRegistryURL(XBayaEngine.this.configuration.getXRegistryURL());
+//                        ComponentTreeNode componentTree = client.getComponentTree();
+//                        componentTreeViewer.addComponentTree(componentTree);
+//
+//                    } catch (ComponentRegistryException e) {
+//                        getErrorWindow().error(ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
+//                    } catch (RuntimeException e) {
+//                        getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+//                    }
+//                }
+//            }.start();
+    }
+
+//    public void setXRegistryURL(URI xregistryURL) {
+//        this.configuration.setXRegistryURL(xregistryURL);
+//    }
+//
+//    public URI getXRegistryClient() {
+//        return this.configuration.getXRegistryURL();
+//    }
 
     /**
      * Loads a default graph if needed either from myLead or the server.
      */
-    private void loadDefaultGraph() {
-        this.configuration.getGPELTemplateID();
-        String localWorkflow = this.configuration.getWorkflow();
-        if (null != localWorkflow && !"".equals(localWorkflow)) {
-            XRegistryAccesser xregistryAccesser = new XRegistryAccesser(this.configuration.getMyProxyUsername(),
-                    this.configuration.getMyProxyPassphrase(), this.configuration.getMyProxyServer(),
-                    this.configuration.getXRegistryURL());
-            Workflow workflow = xregistryAccesser.getWorkflow(localWorkflow);
-            this.setWorkflow(workflow);
-        }
-
-    }
+//    private void loadDefaultGraph() {
+//        this.configuration.getGPELTemplateID();
+//        String localWorkflow = this.configuration.getWorkflow();
+//        if (null != localWorkflow && !"".equals(localWorkflow)) {
+//            XRegistryAccesser xregistryAccesser = new XRegistryAccesser(this.configuration.getMyProxyUsername(),
+//                    this.configuration.getMyProxyPassphrase(), this.configuration.getMyProxyServer(),
+//                    this.configuration.getXRegistryURL());
+//            Workflow workflow = xregistryAccesser.getWorkflow(localWorkflow);
+//            this.setWorkflow(workflow);
+//        }
+//
+//    }
 
     private void loadLocalGraph(String graphFilePath) {
         try {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java Fri Oct  7 17:31:42 2011
@@ -152,12 +152,12 @@ public class WorkflowInterpreterLaunchWi
             this.workflowInterpreterTextField.setText(XBayaConstants.DEFAULT_WORKFLOW_INTERPRETER_URL);
         }
 
-        URI registryURL = config.getXRegistryURL();
-        if (null != registryURL) {
-            this.xRegistryTextField.setText(registryURL.toString());
-        } else {
-            this.xRegistryTextField.setText(XBayaConstants.DEFAULT_XREGISTRY_URL);
-        }
+//        URI registryURL = config.getXRegistryURL();
+//        if (null != registryURL) {
+//            this.xRegistryTextField.setText(registryURL.toString());
+//        } else {
+//            this.xRegistryTextField.setText(XBayaConstants.DEFAULT_XREGISTRY_URL);
+//        }
 
         this.dialog.show();
     }
@@ -269,14 +269,14 @@ public class WorkflowInterpreterLaunchWi
             }
         }
 
-        final String xregistryUrl = this.xRegistryTextField.getText();
-        if (null != xregistryUrl && !"".equals(xregistryUrl)) {
-            try {
-                this.engine.getConfiguration().setXRegistryURL(new URI(xregistryUrl));
-            } catch (URISyntaxException e) {
-                this.engine.getErrorWindow().error(e);
-            }
-        }
+//        final String xregistryUrl = this.xRegistryTextField.getText();
+//        if (null != xregistryUrl && !"".equals(xregistryUrl)) {
+//            try {
+////                this.engine.getConfiguration().setXRegistryURL(new URI(xregistryUrl));
+//            } catch (URISyntaxException e) {
+//                this.engine.getErrorWindow().error(e);
+//            }
+//        }
 
         final String gFacUrl = this.gfacTextField.getText();
         if (null != gFacUrl && !"".equals(gFacUrl)) {
@@ -313,11 +313,11 @@ public class WorkflowInterpreterLaunchWi
                     configurations[0].setValue(engine.getConfiguration().getGFacURL().toString());
                     configurations[1] = new NameValue();
                     configurations[1].setName(HeaderConstants.HEADER_ELEMENT_XREGISTRY);
-                    if (null == engine.getConfiguration().getXRegistryURL()) {
-                        configurations[1].setValue(XBayaConstants.DEFAULT_XREGISTRY_URL.toString());
-                    } else {
-                        configurations[1].setValue(engine.getConfiguration().getXRegistryURL().toString());
-                    }
+//                    if (null == engine.getConfiguration().getXRegistryURL()) {
+//                        configurations[1].setValue(XBayaConstants.DEFAULT_XREGISTRY_URL.toString());
+//                    } else {
+//                        configurations[1].setValue(engine.getConfiguration().getXRegistryURL().toString());
+//                    }
                     configurations[2] = new NameValue();
                     configurations[2].setName(HeaderConstants.HEADER_ELEMENT_PROXYSERVER);
                     configurations[2].setValue(engine.getConfiguration().getMyProxyServer());

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/XRegistryConfigurationWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/XRegistryConfigurationWindow.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/XRegistryConfigurationWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/XRegistryConfigurationWindow.java Fri Oct  7 17:31:42 2011
@@ -67,14 +67,14 @@ public class XRegistryConfigurationWindo
      */
     public void show() {
 
-        if (this.uriField.getText().length() == 0) {
+//        if (this.uriField.getText().length() == 0) {
             // Show the default value.
-            URI url = this.engine.getConfiguration().getXRegistryURL();
-            if (url == null) {
-                url = XBayaConstants.DEFAULT_XREGISTRY_URL;
-            }
-            this.uriField.setText(url);
-        }
+//            URI url = this.engine.getConfiguration().getXRegistryURL();
+//            if (url == null) {
+//                url = XBayaConstants.DEFAULT_XREGISTRY_URL;
+//            }
+//            this.uriField.setText(url);
+//        }
         this.dialog.show();
     }
 
@@ -113,7 +113,7 @@ public class XRegistryConfigurationWindo
             // Error
             return;
         }
-        this.engine.setXRegistryURL(uri);
+//        this.engine.setXRegistryURL(uri);
 
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ODEScriptFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ODEScriptFiler.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ODEScriptFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/ODEScriptFiler.java Fri Oct  7 17:31:42 2011
@@ -24,6 +24,8 @@ package org.apache.airavata.xbaya.file.g
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Map;
 import java.util.Set;
 
@@ -112,8 +114,14 @@ public class ODEScriptFiler {
                 File bpelFile = new File(path + XBayaConstants.BPEL_SUFFIX);
                 // Add ".wsdl" at the end of the file name
                 File wsdlFile = new File(path + XBayaConstants.WSDL_SUFFIX);
-
-                process = wf.getOdeProcess(WSDLUtil.appendWSDLQuary(this.engine.getConfiguration().getXRegistryURL()),
+                //todo this has to fix, for compilation purpose passing dummy value instead of xregistry url
+                URI temp = null;
+                try {
+                    temp = new URI("temp");
+                } catch (URISyntaxException e) {
+                    e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+                }
+                process = wf.getOdeProcess(WSDLUtil.appendWSDLQuary(temp),
                         this.engine.getConfiguration().getODEURL());
                 String processString = process.xmlStringPretty();
                 FileWriter writer = new FileWriter(bpelFile);

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/gui/GPELInvokeWindow.java Fri Oct  7 17:31:42 2011
@@ -81,7 +81,7 @@ public class GPELInvokeWindow {
 
     protected XBayaTextField resourceCatalogTextField;
 
-    protected XBayaTextField xRegistryTextField;
+//    protected XBayaTextField xRegistryTextField;
 
     protected XBayaTextField gfacTextField;
 
@@ -264,7 +264,7 @@ public class GPELInvokeWindow {
         this.dscTextField.setText(configuration.getDSCURL());
 
         // XRegistry
-        this.xRegistryTextField.setText(configuration.getXRegistryURL());
+//        this.xRegistryTextField.setText(configuration.getXRegistryURL());
 
         // GFac URL
         this.gfacTextField.setText(configuration.getGFacURL());
@@ -288,8 +288,8 @@ public class GPELInvokeWindow {
         this.resourceCatalogTextField = new XBayaTextField();
         XBayaLabel resourceCatalogLabel = new XBayaLabel("Resource Catalog URL", this.resourceCatalogTextField);
 
-        this.xRegistryTextField = new XBayaTextField();
-        XBayaLabel xRegistryLabel = new XBayaLabel("XRegistry URL", this.xRegistryTextField);
+//        this.xRegistryTextField = new XBayaTextField();
+//        XBayaLabel xRegistryLabel = new XBayaLabel("XRegistry URL", this.xRegistryTextField);
 
         this.gfacTextField = new XBayaTextField();
         XBayaLabel gfacLabel = new XBayaLabel("GFac URL", this.gfacTextField);
@@ -304,8 +304,8 @@ public class GPELInvokeWindow {
         infoPanel.add(this.dscTextField);
         infoPanel.add(resourceCatalogLabel);
         infoPanel.add(this.resourceCatalogTextField);
-        infoPanel.add(xRegistryLabel);
-        infoPanel.add(this.xRegistryTextField);
+//        infoPanel.add(xRegistryLabel);
+//        infoPanel.add(this.xRegistryTextField);
         infoPanel.add(gfacLabel);
         infoPanel.add(this.gfacTextField);
         infoPanel.layout(5, 2, GridPanel.WEIGHT_NONE, 1);
@@ -400,19 +400,19 @@ public class GPELInvokeWindow {
         }
 
         // XRegistry
-        String xRegistry = this.xRegistryTextField.getText();
-        URI xRegistryURL;
-        if (xRegistry.length() == 0) {
-            xRegistryURL = null;
-        } else {
-            try {
-                xRegistryURL = new URI(xRegistry).parseServerAuthority();
-
-            } catch (URISyntaxException e) {
-                this.engine.getErrorWindow().error(ErrorMessages.XREGISTRY_URL_WRONG, e);
-                return;
-            }
-        }
+//        String xRegistry = this.xRegistryTextField.getText();
+//        URI xRegistryURL;
+//        if (xRegistry.length() == 0) {
+//            xRegistryURL = null;
+//        } else {
+//            try {
+//                xRegistryURL = new URI(xRegistry).parseServerAuthority();
+//
+//            } catch (URISyntaxException e) {
+//                this.engine.getErrorWindow().error(ErrorMessages.XREGISTRY_URL_WRONG, e);
+//                return;
+//            }
+//        }
 
         // GFac
         String gfac = this.gfacTextField.getText();
@@ -433,7 +433,7 @@ public class GPELInvokeWindow {
         monitorConfig.setTopic(topic);
         XBayaConfiguration config = this.engine.getConfiguration();
         config.setDSCURL(dscURL);
-        config.setXRegistryURL(xRegistryURL);
+//        config.setXRegistryURL(xRegistryURL);
         config.setGFacURL(gfacURL);
 
         this.invoker.invoke(this.workflow, inputs, redeploy);

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java Fri Oct  7 17:31:42 2011
@@ -93,9 +93,9 @@ public class DynamicWorkflowRunnerWindow
 
     private XBayaLabel resourceSelectionLabel;
 
-    private XBayaComboBox resourceSelectionComboBox;
+//    private XBayaComboBox resourceSelectionComboBox;
 
-    private XBayaTextField xRegistryTextField;
+//    private XBayaTextField xRegistryTextField;
 
     private JComboBox gfacUrlListField;
 
@@ -176,14 +176,14 @@ public class DynamicWorkflowRunnerWindow
 
         this.topicTextField.setText(UUID.randomUUID().toString());
 
-        XBayaConfiguration config = this.engine.getConfiguration();
+//        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);
-        }
+//        URI registryURL = config.getXRegistryURL();
+//        if (null != registryURL) {
+//            this.xRegistryTextField.setText(registryURL.toString());
+//        } else {
+//            this.xRegistryTextField.setText(XBayaConstants.DEFAULT_XREGISTRY_URL);
+//        }
 
         this.dialog.show();
     }
@@ -212,23 +212,23 @@ public class DynamicWorkflowRunnerWindow
     /**
      * ReInit Host Name ComboBox
      */
-    public void reinitHostComboBox() {
-        if (this.resourceSelectionComboBox == null)
-            this.resourceSelectionComboBox = new XBayaComboBox(new DefaultComboBoxModel(initHostNameList()));
-        else
-            this.resourceSelectionComboBox.setModel(new DefaultComboBoxModel(initHostNameList()));
-    }
+//    public void reinitHostComboBox() {
+//        if (this.resourceSelectionComboBox == null)
+//            this.resourceSelectionComboBox = new XBayaComboBox(new DefaultComboBoxModel(initHostNameList()));
+//        else
+//            this.resourceSelectionComboBox.setModel(new DefaultComboBoxModel(initHostNameList()));
+//    }
 
     private void initGUI() {
         this.parameterPanel = new GridPanel(true);
 
-        reinitHostComboBox();
-        this.resourceSelectionLabel = new XBayaLabel("Select a Compute Resource", this.resourceSelectionComboBox);
+//        reinitHostComboBox();
+//        this.resourceSelectionLabel = new XBayaLabel("Select a Compute Resource", this.resourceSelectionComboBox);
 
         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.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();
@@ -236,12 +236,12 @@ public class DynamicWorkflowRunnerWindow
         XBayaLabel interactLabel = new XBayaLabel("Enable Service Interactions", this.interactChkBox);
 
         GridPanel infoPanel = new GridPanel();
-        infoPanel.add(this.resourceSelectionLabel);
-        infoPanel.add(this.resourceSelectionComboBox);
+//        infoPanel.add(this.resourceSelectionLabel);
+//        infoPanel.add(this.resourceSelectionComboBox);
         infoPanel.add(topicLabel);
         infoPanel.add(this.topicTextField);
-        infoPanel.add(xRegistryLabel);
-        infoPanel.add(this.xRegistryTextField);
+//        infoPanel.add(xRegistryLabel);
+//        infoPanel.add(this.xRegistryTextField);
 //        infoPanel.add(gfacLabel);
 //        infoPanel.add(this.gfacTextField);
         infoPanel.add(gfacURLLabel);
@@ -249,7 +249,7 @@ public class DynamicWorkflowRunnerWindow
         infoPanel.add(interactLabel);
         infoPanel.add(this.interactChkBox);
 
-        infoPanel.layout(5, 2, GridPanel.WEIGHT_NONE, 1);
+//        infoPanel.layout(5, 2, GridPanel.WEIGHT_NONE, 1);
 
         GridPanel mainPanel = new GridPanel();
         mainPanel.add(this.parameterPanel);
@@ -324,14 +324,14 @@ 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.getErrorWindow().error(e);
-            }
-        }
+//        final String xregistryUrl = this.xRegistryTextField.getText();
+//        if (null != xregistryUrl && !"".equals(xregistryUrl)) {
+//            try {
+//                this.engine.getConfiguration().setXRegistryURL(new URI(xregistryUrl));
+//            } catch (URISyntaxException e) {
+//                this.engine.getErrorWindow().error(e);
+//            }
+//        }
 
         final String gFacUrl = (String)this.gfacUrlListField.getSelectedItem();
         if (null != gFacUrl && !"".equals(gFacUrl)) {
@@ -347,26 +347,26 @@ 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.getErrorWindow().error(e);
-            }
-
-        }
+//        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.getErrorWindow().error(e);
+//            }
+//
+//        }
 
         final LeadResourceMapping resourceMapping = mapping;
         final String topicString = topic;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaMenu.java Fri Oct  7 17:31:42 2011
@@ -65,7 +65,7 @@ public class XBayaMenu implements XBayaC
 
     private MonitorMenu monitorMenu;
 
-    private MyProxyMenu myProxyMenu;
+//    private MyProxyMenu myProxyMenu;
 
     private RegisterApplicationsMenu registerApplications;
 
@@ -85,7 +85,7 @@ public class XBayaMenu implements XBayaC
         this.amazonEC2Menu = new AmazonEC2Menu(this.engine);
         this.componentMenu = new ComponentMenu(this.engine);
         this.monitorMenu = new MonitorMenu(this.engine);
-        this.myProxyMenu = new MyProxyMenu(this.engine);
+//        this.myProxyMenu = new MyProxyMenu(this.engine);
         this.registerApplications = new RegisterApplicationsMenu(this.engine);
 
         createMenuBar();
@@ -114,7 +114,7 @@ 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.myProxyMenu.getMenu());
+//        this.menuBar.add(this.myProxyMenu.getMenu());
         this.menuBar.add(this.monitorMenu.getMenu());
         this.menuBar.add(this.registerApplications.getMenu());
 

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=1180114&r1=1180113&r2=1180114&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 Fri Oct  7 17:31:42 2011
@@ -122,7 +122,7 @@ 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);
+//        configuration.setXRegistryURL(XBayaConstants.DEFAULT_XREGISTRY_URL);
         return configuration;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Fri Oct  7 17:31:42 2011
@@ -133,8 +133,8 @@ public class WorkflowInterpretorSkeleton
         configuration.setMyProxyLifetime(XBayaConstants.DEFAULT_MYPROXY_LIFTTIME);
         configuration.setMyProxyPort(XBayaConstants.DEFAULT_MYPROXY_PORT);
         configuration.setMyProxyServer(findValue(vals, PROXYSERVER, XBayaConstants.DEFAULT_MYPROXY_SERVER));
-        configuration.setXRegistryURL(new URI(findValue(vals, XREGISTRY,
-                XBayaConstants.DEFAULT_XREGISTRY_URL.toString())));
+//        configuration.setXRegistryURL(new URI(findValue(vals, XREGISTRY,
+//                XBayaConstants.DEFAULT_XREGISTRY_URL.toString())));
         return configuration;
     }
 

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=1180114&r1=1180113&r2=1180114&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 Fri Oct  7 17:31:42 2011
@@ -154,7 +154,7 @@ public class LeadContextHeaderHelper {
      * @param xbayaConfiguration
      */
     public void setXBayaConfiguration(XBayaConfiguration xbayaConfiguration) {
-        setXRegistryURL(xbayaConfiguration.getXRegistryURL());
+//        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/ode/ODEInvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java Fri Oct  7 17:31:42 2011
@@ -77,7 +77,7 @@ public class ODEInvokerWindow {
     private MyProxyChecker myProxyChecker;
     private GridPanel parameterPanel;
     private XBayaTextField topicTextField;
-    private XBayaTextField xRegistryTextField;
+//    private XBayaTextField xRegistryTextField;
     private XBayaTextField gfacTextField;
     private JButton invokeButton;
     private XBayaDialog dialog;
@@ -113,8 +113,8 @@ 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.xRegistryTextField = new XBayaTextField();
+//        XBayaLabel xRegistryLabel = new XBayaLabel("XRegistry URL", this.xRegistryTextField);
 
         this.gfacTextField = new XBayaTextField();
         XBayaLabel gfacLabel = new XBayaLabel("GFac URL", this.gfacTextField);
@@ -131,8 +131,8 @@ public class ODEInvokerWindow {
         GridPanel infoPanel = new GridPanel();
         infoPanel.add(topicLabel);
         infoPanel.add(this.topicTextField);
-        infoPanel.add(xRegistryLabel);
-        infoPanel.add(this.xRegistryTextField);
+//        infoPanel.add(xRegistryLabel);
+//        infoPanel.add(this.xRegistryTextField);
         infoPanel.add(gfacLabel);
         infoPanel.add(this.gfacTextField);
         infoPanel.add(resourceMappingLabel);
@@ -234,20 +234,20 @@ public class ODEInvokerWindow {
         this.workflow.setGPELInstanceID(workfowInstanceID);
 
         // XRegistry
-        String xRegistry = this.xRegistryTextField.getText();
-        URI xRegistryURL;
-        if (xRegistry.length() == 0) {
-            this.engine.getErrorWindow().error("X-registry url is required");
-            return;
-        } else {
-            try {
-                xRegistryURL = new URI(xRegistry).parseServerAuthority();
-
-            } catch (URISyntaxException e) {
-                this.engine.getErrorWindow().error(ErrorMessages.XREGISTRY_URL_WRONG, e);
-                return;
-            }
-        }
+//        String xRegistry = this.xRegistryTextField.getText();
+//        URI xRegistryURL;
+//        if (xRegistry.length() == 0) {
+//            this.engine.getErrorWindow().error("X-registry url is required");
+//            return;
+//        } else {
+//            try {
+//                xRegistryURL = new URI(xRegistry).parseServerAuthority();
+//
+//            } catch (URISyntaxException e) {
+//                this.engine.getErrorWindow().error(ErrorMessages.XREGISTRY_URL_WRONG, e);
+//                return;
+//            }
+//        }
 
         // GFac
         String gfac = this.gfacTextField.getText();
@@ -267,7 +267,7 @@ public class ODEInvokerWindow {
         MonitorConfiguration monitorConfig = this.engine.getMonitor().getConfiguration();
         monitorConfig.setTopic(topic);
         XBayaConfiguration config = this.engine.getConfiguration();
-        config.setXRegistryURL(xRegistryURL);
+//        config.setXRegistryURL(xRegistryURL);
         config.setGFacURL(gfacURL);
 
         // Deal with the Lead resource mapping
@@ -464,11 +464,11 @@ public class ODEInvokerWindow {
         }
 
         // XRegistry
-        if (null != configuration.getXRegistryURL()) {
-            this.xRegistryTextField.setText(configuration.getXRegistryURL());
-        } else {
-            this.xRegistryTextField.setText(XBayaConstants.DEFAULT_XREGISTRY_URL);
-        }
+//        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/ode/gui/ODEDeploymentClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentClient.java Fri Oct  7 17:31:42 2011
@@ -87,10 +87,10 @@ public class ODEDeploymentClient {
 
             org.xmlpull.infoset.XmlElement workflowXml = workflow.toXML();
             XMLUtil.xmlElementToString(workflowXml);
-            URI xRegistryURL = this.engine.getConfiguration().getXRegistryURL();
-            if (xRegistryURL == null) {
-                xRegistryURL = XBayaConstants.DEFAULT_XREGISTRY_URL;
-            }
+//            URI xRegistryURL = this.engine.getConfiguration().getXRegistryURL();
+//            if (xRegistryURL == null) {
+//                xRegistryURL = XBayaConstants.DEFAULT_XREGISTRY_URL;
+//            }
             wfClient.deploy(workflow, false);
             hideUI();
             String oldWorkflowName = workflow.getName();
@@ -108,7 +108,7 @@ public class ODEDeploymentClient {
                 deployStreamControlWorkflowIfNecessary(this.engine.getWorkflow());
 
                 WorkflowProxyClient wpClient = new WorkflowProxyClient();
-                wpClient.setXRegistryUrl(this.engine.getConfiguration().getXRegistryURL());
+//                wpClient.setXRegistryUrl(this.engine.getConfiguration().getXRegistryURL());
                 wpClient.setEngineURL(this.engine.getConfiguration().getProxyURI());
                 wpClient.setXBayaEngine(this.engine);
                 GSSCredential proxy = null;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentWindow.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEDeploymentWindow.java Fri Oct  7 17:31:42 2011
@@ -80,7 +80,7 @@ public class ODEDeploymentWindow impleme
 
     private JCheckBox makePublicChkBox;
 
-    private XBayaTextField xRegistryTextField;
+//    private XBayaTextField xRegistryTextField;
 
     private XBayaTextField proxyTextField;
 
@@ -143,11 +143,11 @@ public class ODEDeploymentWindow impleme
         this.odeUriField.setText(uriString);
 
         XBayaConfiguration configuration = this.engine.getConfiguration();
-        URI xregistryURL = configuration.getXRegistryURL();
-        if (xregistryURL == null) {
-            xregistryURL = XBayaConstants.DEFAULT_XREGISTRY_URL;
-        }
-        this.xRegistryTextField.setText(xregistryURL);
+//        URI xregistryURL = configuration.getXRegistryURL();
+//        if (xregistryURL == null) {
+//            xregistryURL = XBayaConstants.DEFAULT_XREGISTRY_URL;
+//        }
+//        this.xRegistryTextField.setText(xregistryURL);
 
         URI proxyURI = configuration.getProxyURI();
         if (null != proxyURI) {
@@ -157,7 +157,7 @@ public class ODEDeploymentWindow impleme
         }
         if (this.configMode) {
             this.proxyTextField.setEnabled(false);
-            this.xRegistryTextField.setEnabled(false);
+//            this.xRegistryTextField.setEnabled(false);
             this.makePublicChkBox.setVisible(false);
             this.deploy.setText("OK");
         }
@@ -184,14 +184,14 @@ public class ODEDeploymentWindow impleme
      */
     public void deploy() throws WorkflowEngineException, GraphException {
 
-        String xregistryUrl = this.xRegistryTextField.getText();
-        if (null != xregistryUrl && !"".equals(xregistryUrl)) {
-            try {
-                this.engine.getConfiguration().setXRegistryURL(new URI(xregistryUrl));
-            } catch (URISyntaxException e) {
-                this.engine.getErrorWindow().error(e);
-            }
-        }
+//        String xregistryUrl = this.xRegistryTextField.getText();
+//        if (null != xregistryUrl && !"".equals(xregistryUrl)) {
+//            try {
+//                this.engine.getConfiguration().setXRegistryURL(new URI(xregistryUrl));
+//            } catch (URISyntaxException e) {
+//                this.engine.getErrorWindow().error(e);
+//            }
+//        }
 
         String odeUrl = this.odeUriField.getText();
         if (null != odeUrl && !"".equals(odeUrl)) {
@@ -228,7 +228,7 @@ public class ODEDeploymentWindow impleme
         }
 
         final WorkflowProxyClient client = new WorkflowProxyClient();
-        client.setXRegistryUrl(this.engine.getConfiguration().getXRegistryURL());
+//        client.setXRegistryUrl(this.engine.getConfiguration().getXRegistryURL());
         client.setEngineURL(this.engine.getConfiguration().getProxyURI());
         client.setXBayaEngine(this.engine);
         GSSCredential proxy = null;
@@ -280,8 +280,8 @@ public class ODEDeploymentWindow impleme
         this.odeUriField = new XBayaTextField();
         XBayaLabel uriLabel = new XBayaLabel("ODE URL", this.odeUriField);
 
-        this.xRegistryTextField = new XBayaTextField();
-        XBayaLabel xRegistryLabel = new XBayaLabel("XRegistry URL", this.xRegistryTextField);
+//        this.xRegistryTextField = new XBayaTextField();
+//        XBayaLabel xRegistryLabel = new XBayaLabel("XRegistry URL", this.xRegistryTextField);
 
         this.proxyTextField = new XBayaTextField();
         XBayaLabel proxyLable = new XBayaLabel("ODE proxy URL", this.proxyTextField);
@@ -292,8 +292,8 @@ public class ODEDeploymentWindow impleme
         mainPanel.add(uriLabel);
         mainPanel.add(this.odeUriField);
 
-        mainPanel.add(xRegistryLabel);
-        mainPanel.add(this.xRegistryTextField);
+//        mainPanel.add(xRegistryLabel);
+//        mainPanel.add(this.xRegistryTextField);
 
         mainPanel.add(proxyLable);
         mainPanel.add(this.proxyTextField);

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/pegasus/gui/PegasusInvokerWindow.java Fri Oct  7 17:31:42 2011
@@ -59,7 +59,7 @@ public class PegasusInvokerWindow {
 
     private GridPanel parameterPanel;
     private XBayaTextField topicTextField;
-    private XBayaTextField xRegistryTextField;
+//    private XBayaTextField xRegistryTextField;
     private XBayaTextField gfacTextField;
     private XBayaTextField inputFilepathField;
     private JButton invokeButton;
@@ -81,8 +81,8 @@ 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.xRegistryTextField = new XBayaTextField();
+//        XBayaLabel xRegistryLabel = new XBayaLabel("XRegistry URL", this.xRegistryTextField);
 
         this.gfacTextField = new XBayaTextField();
         XBayaLabel gfacLabel = new XBayaLabel("GFac URL", this.gfacTextField);
@@ -94,8 +94,8 @@ public class PegasusInvokerWindow {
         GridPanel infoPanel = new GridPanel();
         infoPanel.add(topicLabel);
         infoPanel.add(this.topicTextField);
-        infoPanel.add(xRegistryLabel);
-        infoPanel.add(this.xRegistryTextField);
+//        infoPanel.add(xRegistryLabel);
+//        infoPanel.add(this.xRegistryTextField);
         infoPanel.add(gfacLabel);
         infoPanel.add(this.gfacTextField);
         infoPanel.add(filePathLabel);
@@ -143,7 +143,7 @@ public class PegasusInvokerWindow {
             request.setWorkflowID(workflowID);
             request.setTopic(this.topicTextField.getText());
             request.setGFacLocation(this.gfacTextField.getText());
-            request.setXRegistryLocation(this.xRegistryTextField.getText());
+//            request.setXRegistryLocation(this.xRegistryTextField.getText());
             request.setInputStrings(new String[] { "lol", "lol2" });
             SubmitRefResponse response = stub.submitById(request);
         } catch (AxisFault e) {
@@ -209,13 +209,6 @@ public class PegasusInvokerWindow {
             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/test/GPELInvokeSetupForTesting.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GPELInvokeSetupForTesting.java Fri Oct  7 17:31:42 2011
@@ -207,7 +207,7 @@ public class GPELInvokeSetupForTesting e
         this.dscTextField.setText(configuration.getDSCURL());
 
         // XRegistry
-        this.xRegistryTextField.setText(configuration.getXRegistryURL());
+//        this.xRegistryTextField.setText(configuration.getXRegistryURL());
 
         // GFac URL
         this.gfacTextField.setText(configuration.getGFacURL());

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=1180114&r1=1180113&r2=1180114&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 Fri Oct  7 17:31:42 2011
@@ -82,7 +82,7 @@ public class XBayaUtil {
         leadContext.setNodeId(nodeId);
 
         leadContext.setTimeStep("1");
-        leadContext.setXRegistryUrl(new URI(configuration.getXRegistryURL().toString() + "?wsdl"));
+//        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/proxy/WorkflowProxyClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/WorkflowProxyClient.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/WorkflowProxyClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/proxy/WorkflowProxyClient.java Fri Oct  7 17:31:42 2011
@@ -549,11 +549,11 @@ public class WorkflowProxyClient extends
 			// retrieve the workflow from xregistry
 			checkAndLoadCredentials();
 
-			URI xregistryURL = this.xbayaEngine.getConfiguration()
-					.getXRegistryURL();
-			if (xregistryURL == null) {
-				xregistryURL = XBayaConstants.DEFAULT_XREGISTRY_URL;
-			}
+//			URI xregistryURL = this.xbayaEngine.getConfiguration()
+//					.getXRegistryURL();
+//			if (xregistryURL == null) {
+//				xregistryURL = XBayaConstants.DEFAULT_XREGISTRY_URL;
+//			}
 			XRegistryClient xregistryClient = new XRegistryClient(
 					gssCredential, XBayaSecurity.getTrustedCertificates(),
 					xregistryURL.toString());

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryAccesser.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryAccesser.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryAccesser.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryAccesser.java Fri Oct  7 17:31:42 2011
@@ -89,7 +89,7 @@ public class XRegistryAccesser {
     public XRegistryAccesser(XBayaEngine engine) {
         this.engine = engine;
         this.gssCredential = this.engine.getMyProxyClient().getProxy();
-        this.xregistryURL = this.engine.getConfiguration().getXRegistryURL();
+//        this.xregistryURL = this.engine.getConfiguration().getXRegistryURL();
     }
 
     /**
@@ -121,7 +121,7 @@ public class XRegistryAccesser {
      */
     private void connectToXRegistry() throws XRegistryClientException {
         if (null == this.gssCredential) {
-            new MyProxyDialog(this.engine).show(true);
+//            new MyProxyDialog(this.engine).show(true);
             this.gssCredential = this.engine.getMyProxyClient().getProxy();
             // if its still null => user cancelled
             if (null == this.gssCredential) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/gui/XRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/gui/XRegistryWindow.java?rev=1180114&r1=1180113&r2=1180114&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/gui/XRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/gui/XRegistryWindow.java Fri Oct  7 17:31:42 2011
@@ -44,6 +44,7 @@ import org.apache.airavata.xbaya.myproxy
 import org.apache.airavata.xbaya.xregistry.XRegistryComponent;
 import org.apache.airavata.xbaya.xregistry.XRegistryComponent.Type;
 import org.ietf.jgss.GSSCredential;
+import sun.net.util.URLUtil;
 
 public class XRegistryWindow {
 
@@ -81,7 +82,9 @@ public class XRegistryWindow {
     public void show() {
         if (this.urlTextField.getText().length() == 0) {
             // Show the default value.
-            URI url = this.engine.getConfiguration().getXRegistryURL();
+//            URI url = this.engine.getConfiguration().getXRegistryURL();
+
+            URI url = null;
             if (url == null) {
                 url = XBayaConstants.DEFAULT_XREGISTRY_URL;
             }
@@ -139,7 +142,7 @@ public class XRegistryWindow {
         }
 
         XRegistryComponent registry = new XRegistryComponent(url, type, proxy);
-        this.engine.setXRegistryURL(url);
+//        this.engine.setXRegistryURL(url);
         this.loader.load(registry);
     }
 



Mime
View raw message