airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1185718 - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: appwrapper/ experiment/gui/ gui/ lead/ ode/
Date Tue, 18 Oct 2011 15:22:23 GMT
Author: lahiru
Date: Tue Oct 18 15:22:22 2011
New Revision: 1185718

URL: http://svn.apache.org/viewvc?rev=1185718&view=rev
Log:
code cleanup of xbaya https://issues.apache.org/jira/browse/AIRAVATA-140.

Added:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistrySearchResult.java
      - copied, changed from r1185167, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/OGCEXRegistrySearchResult.java
Removed:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/OGCEXRegistrySearchResult.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/XRegistryConfigurationWindow.java
Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/SearchAndEditWindow.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/gui/ErrorMessages.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/ODEClient.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/SearchAndEditWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/SearchAndEditWindow.java?rev=1185718&r1=1185717&r2=1185718&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/SearchAndEditWindow.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/SearchAndEditWindow.java
Tue Oct 18 15:22:22 2011
@@ -21,43 +21,6 @@
 
 package org.apache.airavata.xbaya.appwrapper;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.swing.AbstractAction;
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-import javax.swing.border.EtchedBorder;
-import javax.swing.border.TitledBorder;
-import javax.xml.namespace.QName;
-
-import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.experiment.gui.OGCEXRegistrySearchResult;
-import org.apache.airavata.xbaya.gui.ErrorMessages;
-import org.apache.airavata.xbaya.gui.GridPanel;
-import org.apache.airavata.xbaya.gui.XBayaComboBox;
-import org.apache.airavata.xbaya.gui.XBayaDialog;
-import org.apache.airavata.xbaya.gui.XBayaLabel;
-import org.apache.airavata.xbaya.gui.XBayaTextField;
-import org.apache.airavata.xbaya.gui.XbayaEnhancedList;
-import org.apache.airavata.xbaya.registry.RegistryAccesser;
-import org.ogce.schemas.gfac.beans.ApplicationBean;
-import org.ogce.schemas.gfac.beans.HostBean;
-import org.ogce.schemas.gfac.beans.ServiceBean;
-
 public class SearchAndEditWindow {
 //    private XBayaDialog dialog;
 //

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=1185718&r1=1185717&r2=1185718&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
Tue Oct 18 15:22:22 2011
@@ -58,7 +58,7 @@ public class RegistryLoaderWindow {
 
     private JButton deleteButton;
 
-    private XbayaEnhancedList<OGCEXRegistrySearchResult> list;
+    private XbayaEnhancedList<RegistrySearchResult> list;
 
     /**
      * Constructs a XRegistryLoaderWindow.
@@ -100,11 +100,11 @@ public class RegistryLoaderWindow {
                                  * String[]{"No workflow"});
                                  */
                             } else {
-                                Vector<OGCEXRegistrySearchResult> results = new Vector<OGCEXRegistrySearchResult>();
+                                Vector<RegistrySearchResult> results = new Vector<RegistrySearchResult>();
                                 Node val = null;
                                 for (QName key : keys) {
                                     val = resultList.get(key);
-                                    results.add(new OGCEXRegistrySearchResult(val));
+                                    results.add(new RegistrySearchResult(val));
                                 }
                                 Session session = null;
                                 try {
@@ -146,7 +146,7 @@ public class RegistryLoaderWindow {
     }
 
     private void ok() {
-        OGCEXRegistrySearchResult result = this.list.getSelectedValue();
+        RegistrySearchResult result = this.list.getSelectedValue();
         hide();
 
         try {
@@ -159,7 +159,7 @@ public class RegistryLoaderWindow {
 
     private void delete() {
         RegistryAccesser registryAccesser = new RegistryAccesser(RegistryLoaderWindow.this.engine);
-        for (OGCEXRegistrySearchResult i : this.list.getSelectedValues()) {
+        for (RegistrySearchResult i : this.list.getSelectedValues()) {
             try {
                 registryAccesser.deleteOGCEWorkflow(i.getResourceId());
             } catch (RepositoryException e) {
@@ -175,7 +175,7 @@ public class RegistryLoaderWindow {
      */
     private void initGUI() {
 
-        this.list = new XbayaEnhancedList<OGCEXRegistrySearchResult>();
+        this.list = new XbayaEnhancedList<RegistrySearchResult>();
 
         this.list.addMouseListener(new MouseAdapter() {
             @Override

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistrySearchResult.java
(from r1185167, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/OGCEXRegistrySearchResult.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistrySearchResult.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistrySearchResult.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/OGCEXRegistrySearchResult.java&r1=1185167&r2=1185718&rev=1185718&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/OGCEXRegistrySearchResult.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistrySearchResult.java
Tue Oct 18 15:22:22 2011
@@ -30,7 +30,7 @@ import org.apache.airavata.commons.gfac.
 import org.apache.airavata.xbaya.XBayaConstants;
 import org.apache.airavata.xbaya.gui.TableRenderable;
 
-public class OGCEXRegistrySearchResult implements TableRenderable {
+public class RegistrySearchResult implements TableRenderable {
 
     private static String[] columnName = { "Name", "Description" };
 
@@ -45,12 +45,12 @@ public class OGCEXRegistrySearchResult i
     private Node data;
 
     /**
-     * Constructs a OGCEXRegistrySearchResult.
+     * Constructs a RegistrySearchResult.
      *
      * @param node
      */
 
-    public OGCEXRegistrySearchResult(Node node) {
+    public RegistrySearchResult(Node node) {
         try {
             String property = node.getProperty("Type").getString();
             if (property.equals(XBayaConstants.REGISTRY_TYPE_HOST_DESC)) {

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=1185718&r1=1185717&r2=1185718&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
Tue Oct 18 15:22:22 2011
@@ -168,30 +168,13 @@ public interface ErrorMessages {
      */
     public static final String BROKER_URL_NOT_SET_ERROR = "Broker URL is not set.";
 
-    /**
-     * XREGISTRY_URL_EMPTY
-     */
-    public static final String XREGISTRY_URL_EMPTY = "XRegistry URL cannot be empty.";
-
-    /**
-     * XREGISTRY_URL_WRONG
-     */
-    public static final String XREGISTRY_URL_WRONG = "XRegistry URL is in wrong format.";
 
     /**
      * Error while loading a list of workflows from XRegistry.
      */
     public static final String XREGISTRY_WORKFLOW_LIST_LOAD_ERROR = "Failed to get list of
workflows from XRegistry.";
 
-    /**
-     * XREGISTRY_WORKFLOW_NOT_FOUND_ERROR
-     */
-    public static final String XREGISTRY_WORKFLOW_NOT_FOUND_ERROR = "The specified workflow
doesn't exist in the XRegistry.";
 
-    /**
-     * GFAC_URL_URL_EMPTY
-     */
-    public static final String GFAC_URL_URL_EMPTY = "GFac URL cannot be empty.";
 
     /**
      * GFAC_URL_WRONG

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=1185718&r1=1185717&r2=1185718&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
Tue Oct 18 15:22:22 2011
@@ -109,15 +109,6 @@ public class LeadContextHeaderHelper {
     }
 
     /**
-     * @param xRegistryURL
-     */
-    public void setXRegistryURL(URI xRegistryURL) {
-        if (xRegistryURL != null) {
-            this.leadContextHeader.setXRegistryUrl(WSDLUtil.appendWSDLQuary(xRegistryURL));
-        }
-    }
-
-    /**
      * @param gFacURL
      */
     public void setGFacURL(URI gFacURL) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java?rev=1185718&r1=1185717&r2=1185718&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java
Tue Oct 18 15:22:22 2011
@@ -216,59 +216,7 @@ public class ODEClient {
         throw new XBayaRuntimeException(e);
     }
 
-    /**
-     * 
-     * @param workflow
-     *            workflow object
-     * @param topic
-     *            notification topic
-     * @param usedDN
-     *            eg
-     *            "/O=LEAD Project/OU=portal.leadproject.org/OU=cs.indiana.edu/CN=sshirasu/EMAIL=sshirasu@cs.indiana.edu"
-     * @param instanceID
-     *            workflowinstance id
-     * @param resourceMapping
-     *            resource mapping
-     * @param scmsURL
-     *            eg https://tyr12.cs.indiana.edu:60443/SCMS?wsdl
-     * @return
-     */
-    public LeadContextHeader getDefaultLeadHeader(Workflow workflow, String topic, String
usedDN, URI instanceID,
-            LeadResourceMapping resourceMapping, URI scmsURL) {
-        LeadContextHeaderHelper leadContextHelper = new LeadContextHeaderHelper();
-
-        leadContextHelper.setXRegistryURL(XBayaConstants.DEFAULT_XREGISTRY_URL);
-        leadContextHelper.setGFacURL(XBayaConstants.DEFAULT_GFAC_URL);
-
-        leadContextHelper.setUser(usedDN);
-        leadContextHelper.setWorkflowInstanceID(instanceID);
-        leadContextHelper.setWorkflowTemplateID(workflow.getUniqueWorkflowName());
-
-        MonitorConfiguration monitorConfiguration = new MonitorConfiguration(XBayaConstants.DEFAULT_BROKER_URL,
topic,
-                true, XBayaConstants.DEFAULT_MESSAGE_BOX_URL);
-        leadContextHelper.setMonitorConfiguration(monitorConfiguration);
-
-        LeadContextHeader leadContext = leadContextHelper.getLeadContextHeader();
-
-        leadContext.setNodeId(workflow.getName());
-
-        leadContext.setTimeStep("1");
-        try {
-            leadContext.setXRegistryUrl(new URI(XBayaConstants.DEFAULT_XREGISTRY_URL.toString()
+ "?wsdl"));
-        } catch (URISyntaxException e) {
-            throw new XBayaRuntimeException(e);
-        }
 
-        if (resourceMapping != null) {
-            leadContext.setResourceMapping(resourceMapping);
-        }
-        if (scmsURL != null) {
-            leadContext.setScmsUrl(scmsURL);
-        }
-
-        return leadContext;
-
-    }
 
 
 



Mime
View raw message