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/10/23 14:05:14 UTC

svn commit: r1187873 - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: ./ appwrapper/ component/gui/ experiment/gui/ graph/interaction/gui/ gui/ interpretor/ xregistry/

Author: smarru
Date: Sun Oct 23 12:05:13 2011
New Revision: 1187873

URL: http://svn.apache.org/viewvc?rev=1187873&view=rev
Log:
version number in about menu and minor xregistry clean up

Removed:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/
Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaVersion.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterThroughFileWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionRegistrationWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryWorkflowPublisherWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/interaction/gui/ServiceInteractionWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorMessages.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java Sun Oct 23 12:05:13 2011
@@ -31,19 +31,24 @@ public class XBayaConstants {
     public static final String APPLICATION_SHORT_NAME = "XBaya";
 
     /**
+     * The name of the project
+     */
+    public static final String PROJECT_NAME = "Apache Airavata";
+    
+    /**
      * The name of the application
      */
-    public static final String APPLICATION_NAME = "XBaya Workflow Composer";
+    public static final String APPLICATION_NAME = "XBaya Dashboard";
 
     /**
      * The URL of the web page of the application
      */
-    public static final URI WEB_URL = URI.create("http://www.extreme.indiana.edu/xgws/xbaya/");
+    public static final URI WEB_URL = URI.create("http://airavata.org");
 
     /**
      * Namespace URI
      */
-    public static final String NS_URI_XBAYA = "http://www.extreme.indiana.edu/xbaya/";
+    public static final String NS_URI_XBAYA = "http://airavata.apache.org/xbaya/";
 
     // Default values
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaVersion.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaVersion.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaVersion.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaVersion.java Sun Oct 23 12:05:13 2011
@@ -26,7 +26,7 @@ public class XBayaVersion {
     /**
      * Version number
      */
-    public final static String VERSION = "3.8.8";
+    public final static String VERSION = "0.1-INCUBATING";
 
     /**
      * Prints the version

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionRegistrationWindow.java Sun Oct 23 12:05:13 2011
@@ -410,22 +410,6 @@ public class HostDescriptionRegistration
                 hostBean.setJdkName(this.jdkNameComboBox.getText());
             }
 
-            /* Register to XRegistry */
-            RegistryAccesser xRegAccesser = new RegistryAccesser(this.engine);
-
-            // if (!this.isEditing) {
-            // xRegAccesser.registerHost(hostBean);
-            // } else {
-            // /* Delete old host bean */
-            // xRegAccesser.deleteHostDescription(this.editingHostBean.getHostName());
-            //
-            // /* Register new host bean */
-            // xRegAccesser.registerHost(hostBean);
-            //
-            // this.isEditing = false;
-            // this.addHostButton.setText("Add Host");
-            // }
-
         } catch (Exception e) {
             e.printStackTrace();
             this.hide();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterThroughFileWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterThroughFileWindow.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterThroughFileWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/RegisterThroughFileWindow.java Sun Oct 23 12:05:13 2011
@@ -153,7 +153,6 @@ public class RegisterThroughFileWindow {
 	 */
     protected void register() {
         try {
-            RegistryAccesser xregistryAccesser = new RegistryAccesser(this.engine);
             StringBuffer fileData = new StringBuffer(1000);
             BufferedReader reader = new BufferedReader(new FileReader(this.fileLocationField.getText()));
             char[] buf = new char[1024];
@@ -165,14 +164,6 @@ public class RegisterThroughFileWindow {
             }
             reader.close();
 
-            // if (this.docTypeComboBox.getText().equals("Host")) {
-            // xregistryAccesser.registerHost(fileData.toString());
-            // } else if (this.docTypeComboBox.getText().equals("Application")) {
-            // xregistryAccesser.registerApplication(fileData.toString());
-            // } else {
-            // xregistryAccesser.registerService(fileData.toString());
-            // }
-
             JOptionPane.showMessageDialog(RegisterThroughFileWindow.this.dialog.getDialog(),
                     this.docTypeComboBox.getText() + " description registered successfully", "Successfully",
                     JOptionPane.INFORMATION_MESSAGE);

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionRegistrationWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionRegistrationWindow.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionRegistrationWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionRegistrationWindow.java Sun Oct 23 12:05:13 2011
@@ -105,24 +105,6 @@ public class ServiceDescriptionRegistrat
         return window;
     }
 
-    // private Object[] initApplicationNameList() {
-    // XRegistryAccesser xRegAccesser = new XRegistryAccesser(this.engine);
-    // AppData[] appDataList = xRegAccesser.searchApplicationByName("");
-    // List<String> nameList = new ArrayList<String>();
-    // nameList.add("Select Application");
-    // for (AppData appData : appDataList) {
-    // nameList.add(appData.getName().getLocalPart());
-    // }
-    // return nameList.toArray();
-    // }
-
-    // /**
-    // * ReInit Application Name ComboBox
-    // */
-    // public void reinitApplicationComboBox() {
-    // this.appNameComboBox.setModel(new javax.swing.DefaultComboBoxModel(initApplicationNameList()));
-    // }
-
     /**
      * Clear ALl the TextFields
      */
@@ -286,24 +268,6 @@ public class ServiceDescriptionRegistrat
 
             serviceBean.setMethodBean(methodBean);
 
-            /* Register to XRegistry */
-            RegistryAccesser xRegAccesser = new RegistryAccesser(this.engine);
-
-            // if (!this.isEditing) {
-            // xRegAccesser.registerService(serviceBean);
-            // } else {
-            // /* Delete old Service Bean */
-            // QName qName = new QName(this.editingServiceBean.getObjectNamespace(),
-            // this.editingServiceBean.getServiceName());
-            // xRegAccesser.deleteServiceDescrption(qName);
-            //
-            // /* Register updated Service Bean */
-            // xRegAccesser.registerService(serviceBean);
-            //
-            // this.isEditing = false;
-            // this.addServiceButton.setText("Add Service");
-            // }
-
         } catch (Exception e) {
             this.engine.getErrorWindow().error(this.dialog.getDialog(), e.getMessage(), e);
             this.hide();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java Sun Oct 23 12:05:13 2011
@@ -61,8 +61,6 @@ public class ComponentMenu {
 
     private JMenuItem refreshAllItem;
 
-    private JMenuItem xregistryItem;
-
     private JMenuItem streamSourceItem;
 
     private JMenuItem workflowItem;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java Sun Oct 23 12:05:13 2011
@@ -39,8 +39,6 @@ public class ExperimentMenu {
 
     private JMenu experimentMenu;
 
-    private ODEDeploymentDescriptor odeDeploymentDescription;
-
     protected RegistryAccesser registryAccesser;
 
     private JMenuItem configureRegistryItem;
@@ -51,10 +49,6 @@ public class ExperimentMenu {
 
     private JMenuItem deleteWorkflowfromRegistryItem;
 
-    private JMenuItem deployWorkflowtoODEItem;
-
-    private JMenuItem launchODEWorkflowItem;
-
     private JMenuItem launchXBayaInterpreterItem;
 
     private JMenuItem launchGridChemWorkflowItem;
@@ -69,7 +63,6 @@ public class ExperimentMenu {
      */
     public ExperimentMenu(XBayaEngine engine) {
         this.engine = engine;
-        this.odeDeploymentDescription = new ODEDeploymentDescriptor();
         this.registryAccesser = new RegistryAccesser(engine);
 
         createExperimentMenu();
@@ -77,10 +70,10 @@ public class ExperimentMenu {
 
     private void createExperimentMenu() {
 
-        createConfigureXRegistryItem();
-        createLoadWorkflowfromXRegistryItem();
-        createSaveWorkflowtoXRegistryItem();
-        createDeleteWorkflowtoXRegistryItem();
+        createConfigureRegistryItem();
+        createLoadWorkflowfromRegistryItem();
+        createSaveWorkflowtoRegistryItem();
+        createDeleteWorkflowtoRegistryItem();
         createLaunchXBayaInterpreterItem();
         createLaunchGridChemWorkflowItem();
 
@@ -105,7 +98,7 @@ public class ExperimentMenu {
         return this.experimentMenu;
     }
 
-    private void createConfigureXRegistryItem() {
+    private void createConfigureRegistryItem() {
         this.configureRegistryItem = new JMenuItem("Configure Registry");
         configureRegistryItem.setMnemonic(KeyEvent.VK_C);
         configureRegistryItem.addActionListener(new AbstractAction() {
@@ -120,7 +113,7 @@ public class ExperimentMenu {
         });
     }
 
-    private void createLoadWorkflowfromXRegistryItem() {
+    private void createLoadWorkflowfromRegistryItem() {
         this.loadWorkflowfromRegistryItem = new JMenuItem("Load Workflow from Registry");
         this.loadWorkflowfromRegistryItem.addActionListener(new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
@@ -130,7 +123,7 @@ public class ExperimentMenu {
         });
     }
 
-    private void createSaveWorkflowtoXRegistryItem() {
+    private void createSaveWorkflowtoRegistryItem() {
         this.saveWorkflowtoRegistryItem = new JMenuItem("Save Workflow to Registry");
         this.saveWorkflowtoRegistryItem.setMnemonic(KeyEvent.VK_C);
         this.saveWorkflowtoRegistryItem.addActionListener(new AbstractAction() {
@@ -140,7 +133,7 @@ public class ExperimentMenu {
         });
     }
 
-    private void createDeleteWorkflowtoXRegistryItem() {
+    private void createDeleteWorkflowtoRegistryItem() {
         this.deleteWorkflowfromRegistryItem = new JMenuItem("Delete Workflows in Registry");
         this.deleteWorkflowfromRegistryItem.addActionListener(new AbstractAction() {
             public void actionPerformed(ActionEvent e) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java Sun Oct 23 12:05:13 2011
@@ -61,7 +61,7 @@ public class RegistryLoaderWindow {
     private XbayaEnhancedList<RegistrySearchResult> list;
 
     /**
-     * Constructs a XRegistryLoaderWindow.
+     * Constructs a RegistryLoaderWindow.
      * 
      * @param engine
      */
@@ -78,7 +78,7 @@ public class RegistryLoaderWindow {
     public void show() {
 
         /*
-         * this.list.getList().setListData( new String[]{ "Loading the workflow list from the XRegistry.",
+         * this.list.getList().setListData( new String[]{ "Loading the workflow list from the Registry.",
          * "Please wait for a moment."});
          */
         this.list.setEnabled(false);
@@ -125,7 +125,7 @@ public class RegistryLoaderWindow {
                     });
                 } catch (RuntimeException e) {
                     RegistryLoaderWindow.this.engine.getErrorWindow().error(
-                            ErrorMessages.XREGISTRY_WORKFLOW_LIST_LOAD_ERROR, e);
+                            ErrorMessages.REGISTRY_WORKFLOW_LIST_LOAD_ERROR, e);
                     hide();
                 } catch (Error e) {
                     RegistryLoaderWindow.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
@@ -232,7 +232,7 @@ public class RegistryLoaderWindow {
         });
         buttonPanel.add(cancelButton);
 
-        this.dialog = new XBayaDialog(this.engine, "Load a Workflow from the XRegistry", mainPanel, buttonPanel);
+        this.dialog = new XBayaDialog(this.engine, "Load a Workflow from the Registry", mainPanel, buttonPanel);
         this.dialog.setDefaultButton(this.okButton);
     }
 }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryWorkflowPublisherWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryWorkflowPublisherWindow.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryWorkflowPublisherWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryWorkflowPublisherWindow.java Sun Oct 23 12:05:13 2011
@@ -119,7 +119,7 @@ public class RegistryWorkflowPublisherWi
         buttonPanel.add(this.okButton);
 
         GridPanel mainPanel = new GridPanel();
-        TitledBorder border = new TitledBorder(new EtchedBorder(), "Save Workflow to XRegistry");
+        TitledBorder border = new TitledBorder(new EtchedBorder(), "Save Workflow to Registry");
         mainPanel.getSwingComponent().setBorder(border);
         mainPanel.add(nameLabel);
         mainPanel.add(this.nameTextField);
@@ -129,7 +129,7 @@ public class RegistryWorkflowPublisherWi
         mainPanel.add(chkMakePublic);
         mainPanel.layout(2, 2, 0, 0);
 
-        this.dialog = new XBayaDialog(this.engine, "Save Workflow to XRegistry", mainPanel, buttonPanel);
+        this.dialog = new XBayaDialog(this.engine, "Save Workflow to Registry", mainPanel, buttonPanel);
         this.dialog.setDefaultButton(this.okButton);
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/interaction/gui/ServiceInteractionWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/interaction/gui/ServiceInteractionWindow.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/interaction/gui/ServiceInteractionWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/interaction/gui/ServiceInteractionWindow.java Sun Oct 23 12:05:13 2011
@@ -102,7 +102,7 @@ public class ServiceInteractionWindow {
         buttonPanel.add(sendButton);
         buttonPanel.add(cancelButton);
 
-        this.dialog = new XBayaDialog(this.engine, "Deploy workflow to ODE and XRegistry", mainPanel, buttonPanel);
+        this.dialog = new XBayaDialog(this.engine, "Deploy workflow to ODE and Registry", mainPanel, buttonPanel);
         this.dialog.setDefaultButton(sendButton);
 
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/AboutWindow.java Sun Oct 23 12:05:13 2011
@@ -81,9 +81,9 @@ public class AboutWindow {
         });
         buttonPanel.add(okButton);
 
-        String message = "<html>" + "<h2>" + XBayaConstants.APPLICATION_NAME + "</h2>" + "Version: "
-                + XBayaVersion.VERSION + "<br>" + "<a href='" + XBayaConstants.WEB_URL.toString() + "'>"
-                + XBayaConstants.WEB_URL.toString() + "</a>" + "</html>";
+        String message = "<html>" + "<h2>" + XBayaConstants.PROJECT_NAME + "</h2>" + XBayaConstants.APPLICATION_NAME
+                + "<br>" + "Version: " + XBayaVersion.VERSION + "<br>" + "<a href='"
+                + XBayaConstants.WEB_URL.toString() + "'>" + XBayaConstants.WEB_URL.toString() + "</a>" + "</html>";
         JEditorPane editorPane = new JEditorPane(XmlConstants.CONTENT_TYPE_HTML, message);
         editorPane.setEditable(false);
         editorPane.setBackground(buttonPanel.getBackground());
@@ -102,7 +102,7 @@ public class AboutWindow {
             }
         });
 
-        this.dialog = new XBayaDialog(this.engine, XBayaConstants.APPLICATION_NAME, editorPane, buttonPanel);
+        this.dialog = new XBayaDialog(this.engine, XBayaConstants.PROJECT_NAME, editorPane, buttonPanel);
         this.dialog.setDefaultButton(okButton);
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorMessages.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorMessages.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorMessages.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/ErrorMessages.java Sun Oct 23 12:05:13 2011
@@ -169,9 +169,9 @@ public interface ErrorMessages {
     public static final String BROKER_URL_NOT_SET_ERROR = "Broker URL is not set.";
 
     /**
-     * Error while loading a list of workflows from XRegistry.
+     * Error while loading a list of workflows from Registry.
      */
-    public static final String XREGISTRY_WORKFLOW_LIST_LOAD_ERROR = "Failed to get list of workflows from XRegistry.";
+    public static final String REGISTRY_WORKFLOW_LIST_LOAD_ERROR = "Failed to get list of workflows from Registry.";
 
     /**
      * GFAC_URL_WRONG

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java?rev=1187873&r1=1187872&r2=1187873&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaGUI.java Sun Oct 23 12:05:13 2011
@@ -495,7 +495,6 @@ public class XBayaGUI implements EventLi
 
     /**
      * @param model
-     * @throws XregistryException
      * @throws MalformedURLException
      */
     public void addStreamSources(final StreamTableModel model) throws MalformedURLException {
@@ -705,7 +704,6 @@ public class XBayaGUI implements EventLi
     /**
      * @param newStreamName
      * @return
-     * @throws XRegistryClientException
      * @throws MalformedURLException
      * 
      */

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=1187873&r1=1187872&r2=1187873&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 Sun Oct 23 12:05:13 2011
@@ -41,7 +41,6 @@ import org.apache.airavata.xbaya.wf.Work
  */
 public class WorkflowInterpretorSkeleton {
 
-    public static final String XREGISTRY = "xregistry";
     public static final String PROXYSERVER = "proxyserver";
     public static final String MSGBOX = "msgbox";
     public static final String GFAC = "gfac";