You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/10/11 16:12:15 UTC

svn commit: r1181795 - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: experiment/gui/OGCEXRegistryLoaderWindow.java xregistry/XRegistryAccesser.java

Author: lahiru
Date: Tue Oct 11 14:12:14 2011
New Revision: 1181795

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

Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/OGCEXRegistryLoaderWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/xregistry/XRegistryAccesser.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/OGCEXRegistryLoaderWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/OGCEXRegistryLoaderWindow.java?rev=1181795&r1=1181794&r2=1181795&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/OGCEXRegistryLoaderWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/OGCEXRegistryLoaderWindow.java Tue Oct 11 14:12:14 2011
@@ -163,7 +163,7 @@ public class OGCEXRegistryLoaderWindow {
         XRegistryAccesser xregistryAccesser = new XRegistryAccesser(OGCEXRegistryLoaderWindow.this.engine);
         for (OGCEXRegistrySearchResult i : this.list.getSelectedValues()) {
             try {
-                xregistryAccesser.deleteOGCEWorkflow(i.getQname());
+                xregistryAccesser.deleteOGCEWorkflow(i.getResourceId());
             } catch (XRegistryClientException e) {
                 e.printStackTrace();
             }

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=1181795&r1=1181794&r2=1181795&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 Tue Oct 11 14:12:14 2011
@@ -338,11 +338,8 @@ public class XRegistryAccesser {
      * @throws XregistryException
      */
     public void deleteOGCEWorkflow(QName workflowTemplateId) throws XRegistryClientException {
-        if (this.xregistryClient == null) {
-            connectToXRegistry();
-        }
-        this.xregistryClient.removeOGCEResource(workflowTemplateId,
-                XBayaConstants.XR_Resource_Types.WorkflowTemplate.toString());
+        Registry registry = connectToRegistry();
+        registry.deleteWorkflow(workflowTemplateId,this.engine.getConfiguration().getRegigstryUserName());
     }
 
     /**