You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/09/10 08:32:10 UTC
svn commit: r1382653 [2/3] - in /incubator/airavata/trunk/modules:
airavata-client/src/main/java/org/apache/airavata/client/
commons/registry-api/src/main/java/org/apache/airavata/registry/api/
gfac-core/src/main/java/org/apache/airavata/core/gfac/cont...
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURL.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURL.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURL.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURL.java Mon Sep 10 06:32:08 2012
@@ -21,32 +21,32 @@
package org.apache.airavata.xbaya.model.registrybrowser;
-import java.net.URL;
+import java.net.URI;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
public class GFacURL {
- private AiravataRegistry registry;
- private URL gfacURL;
+ private AiravataRegistry2 registry;
+ private URI gfacURL;
- public GFacURL(AiravataRegistry registry, URL gfacURL) {
+ public GFacURL(AiravataRegistry2 registry, URI url) {
setRegistry(registry);
- setGfacURL(gfacURL);
+ setGfacURL(url);
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
- public URL getGfacURL() {
+ public URI getGfacURL() {
return gfacURL;
}
- public void setGfacURL(URL gfacURL) {
- this.gfacURL = gfacURL;
+ public void setGfacURL(URI url) {
+ this.gfacURL = url;
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java Mon Sep 10 06:32:08 2012
@@ -22,42 +22,33 @@
package org.apache.airavata.xbaya.model.registrybrowser;
import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
public class GFacURLs {
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
- public GFacURLs(AiravataRegistry registry) {
+ public GFacURLs(AiravataRegistry2 registry) {
setRegistry(registry);
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
public List<GFacURL> getURLS() {
List<GFacURL> urls = new ArrayList<GFacURL>();
- try {
- List<String> gfacDescriptorList = getRegistry().getGFacDescriptorList();
- for (String urlString : gfacDescriptorList) {
- try {
- urls.add(new GFacURL(getRegistry(), new URL(urlString)));
- } catch (MalformedURLException e) {
- // practically speaking this exception should not be possible. just in case,
- e.printStackTrace();
- }
- }
- } catch (RegistryException e) {
- e.printStackTrace();
+ List<URI> gfacDescriptorList = getRegistry().getGFacURIs();
+ for (URI url : gfacDescriptorList) {
+ urls.add(new GFacURL(getRegistry(), url));
}
return urls;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java Mon Sep 10 06:32:08 2012
@@ -25,24 +25,24 @@ import java.util.List;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
public class HostDescriptions {
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
- public HostDescriptions(AiravataRegistry registry) {
+ public HostDescriptions(AiravataRegistry2 registry) {
setRegistry(registry);
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
public List<HostDescription> getDescriptions() throws RegistryException{
- return getRegistry().searchHostDescription(".*");
+ return getRegistry().getHostDescriptors();
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURL.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURL.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURL.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURL.java Mon Sep 10 06:32:08 2012
@@ -23,22 +23,22 @@ package org.apache.airavata.xbaya.model.
import java.net.URI;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
public class InterpreterServiceURL {
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
private URI interpreterServiceURL;
- public InterpreterServiceURL(AiravataRegistry registry, URI interpreterServiceURI) {
+ public InterpreterServiceURL(AiravataRegistry2 registry, URI interpreterServiceURI) {
setRegistry(registry);
setInterpreterServiceURI(interpreterServiceURI);
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java Mon Sep 10 06:32:08 2012
@@ -25,33 +25,28 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
public class InterpreterServiceURLs {
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
- public InterpreterServiceURLs(AiravataRegistry registry) {
+ public InterpreterServiceURLs(AiravataRegistry2 registry) {
setRegistry(registry);
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
public List<InterpreterServiceURL> getURLS() {
List<InterpreterServiceURL> urls = new ArrayList<InterpreterServiceURL>();
- try {
- List<URI> gfacDescriptorList = getRegistry().getInterpreterServiceURLList();
- for (URI uri : gfacDescriptorList) {
- urls.add(new InterpreterServiceURL(getRegistry(), uri));
- }
- } catch (RegistryException e) {
- e.printStackTrace();
+ List<URI> gfacDescriptorList = getRegistry().getWorkflowInterpreterURIs();
+ for (URI uri : gfacDescriptorList) {
+ urls.add(new InterpreterServiceURL(getRegistry(), uri));
}
return urls;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURL.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURL.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURL.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURL.java Mon Sep 10 06:32:08 2012
@@ -23,22 +23,22 @@ package org.apache.airavata.xbaya.model.
import java.net.URI;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
public class MessageBoxURL {
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
private URI messageBoxURL;
- public MessageBoxURL(AiravataRegistry registry, URI messageBoxURL) {
+ public MessageBoxURL(AiravataRegistry2 registry, URI messageBoxURL) {
setRegistry(registry);
setMessageBoxURL(messageBoxURL);
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java Mon Sep 10 06:32:08 2012
@@ -25,34 +25,27 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
public class MessageBoxURLs {
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
- public MessageBoxURLs(AiravataRegistry registry) {
+ public MessageBoxURLs(AiravataRegistry2 registry) {
setRegistry(registry);
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
public List<MessageBoxURL> getURLS() {
List<MessageBoxURL> urls = new ArrayList<MessageBoxURL>();
- try {
- List<URI> gfacDescriptorList = getRegistry().getMessageBoxServiceURLList();
- for (URI uri : gfacDescriptorList) {
- urls.add(new MessageBoxURL(getRegistry(), uri));
- }
- } catch (RegistryException e) {
- e.printStackTrace();
- }
+ URI gfacDescriptor = getRegistry().getMessageBoxURI();
+ urls.add(new MessageBoxURL(getRegistry(), gfacDescriptor));
return urls;
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java Mon Sep 10 06:32:08 2012
@@ -25,24 +25,24 @@ import java.util.List;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
public class ServiceDescriptions {
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
- public ServiceDescriptions(AiravataRegistry registry) {
+ public ServiceDescriptions(AiravataRegistry2 registry) {
setRegistry(registry);
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
public List<ServiceDescription> getDescriptions() throws RegistryException {
- return getRegistry().searchServiceDescription("");
+ return getRegistry().getServiceDescriptors();
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java Mon Sep 10 06:32:08 2012
@@ -30,7 +30,7 @@ import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.workflow.WorkflowServiceIOData;
import org.apache.airavata.schemas.gfac.Parameter;
import org.apache.airavata.xbaya.interpretor.NameValue;
@@ -38,9 +38,9 @@ import org.apache.airavata.xbaya.util.XB
import org.xml.sax.SAXException;
public class XBayaWorkflowExperiments {
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
- public XBayaWorkflowExperiments(AiravataRegistry registry) {
+ public XBayaWorkflowExperiments(AiravataRegistry2 registry) {
setRegistry(registry);
}
@@ -63,7 +63,7 @@ public class XBayaWorkflowExperiments {
List<String> workflowExecutionIdByUser = getRegistry().getWorkflowExecutionIdByUser(".*");
for (String expId : workflowExecutionIdByUser) {
XBayaWorkflowExperiment xBayaWorkflowExperiment = new XBayaWorkflowExperiment(expId, null);
- xBayaWorkflowExperiment.add(new XBayaWorkflow(expId,getRegistry().getWorkflowExecutionTemplateName(expId),null));
+ xBayaWorkflowExperiment.add(new XBayaWorkflow(expId,getRegistry().getWorkflowExecutionTemplateName(expId,expId),null));
experiments.put(expId,xBayaWorkflowExperiment);
}
} catch (RegistryException e) {
@@ -133,10 +133,10 @@ public class XBayaWorkflowExperiments {
}
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplate.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplate.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplate.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplate.java Mon Sep 10 06:32:08 2012
@@ -21,30 +21,30 @@
package org.apache.airavata.xbaya.model.registrybrowser;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
public class XBayaWorkflowTemplate {
- private Node workflowNode;
+ private String workflowGraph;
+ private String workflowName;
- public XBayaWorkflowTemplate(Node workflowNode) {
- setWorkflowNode(workflowNode);
+ public XBayaWorkflowTemplate(String workflowName, String workflowGraph) {
+ setWorkflowGraph(workflowGraph);
+ setWorkflowName(workflowName);
}
- public Node getWorkflowNode() {
- return workflowNode;
+ public String getWorkflowGraph() {
+ return workflowGraph;
}
- public void setWorkflowNode(Node workflowNode) {
- this.workflowNode = workflowNode;
+ public void setWorkflowGraph(String workflowGraph) {
+ this.workflowGraph = workflowGraph;
}
- public String getWorkflowName() {
- try {
- return getWorkflowNode().getName();
- } catch (RepositoryException e) {
- e.printStackTrace();
- return null;
- }
- }
+ public String getWorkflowName() {
+ return workflowName;
+ }
+
+ public void setWorkflowName(String workflowName) {
+ this.workflowName = workflowName;
+ }
+
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java Mon Sep 10 06:32:08 2012
@@ -25,33 +25,30 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.jcr.Node;
-import javax.xml.namespace.QName;
-
import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
public class XBayaWorkflowTemplates {
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
- public XBayaWorkflowTemplates(AiravataRegistry registry) {
+ public XBayaWorkflowTemplates(AiravataRegistry2 registry) {
setRegistry(registry);
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
public List<XBayaWorkflowTemplate> getWorkflows() {
List<XBayaWorkflowTemplate> workflows = new ArrayList<XBayaWorkflowTemplate>();
try {
- Map<QName, Node> workflowMap = registry.getWorkflows(registry.getUsername());
- for (Node xBayaWorkflowNode : workflowMap.values()) {
- workflows.add(new XBayaWorkflowTemplate(xBayaWorkflowNode));
+ Map<String, String> workflowMap = registry.getWorkflows();
+ for (String xBayaWorkflowName : workflowMap.keySet()) {
+ workflows.add(new XBayaWorkflowTemplate(xBayaWorkflowName,workflowMap.get(xBayaWorkflowName)));
}
} catch (RegistryException e) {
e.printStackTrace();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java Mon Sep 10 06:32:08 2012
@@ -22,7 +22,7 @@ package org.apache.airavata.xbaya.proven
import java.util.List;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.workflow.WorkflowExecution;
import org.apache.airavata.registry.api.workflow.WorkflowServiceIOData;
import org.apache.airavata.workflow.model.graph.Node;
@@ -33,11 +33,11 @@ public class ProvenanceReader {
private String experimentId;
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
private Node node;
- public ProvenanceReader(Node node,String experimentId,AiravataRegistry registry) {
+ public ProvenanceReader(Node node,String experimentId,AiravataRegistry2 registry) {
this.experimentId = experimentId;
this.registry = registry;
this.node = node;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java Mon Sep 10 06:32:08 2012
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.workflow.WorkflowServiceIOData;
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
import org.apache.airavata.workflow.model.graph.DataPort;
@@ -59,10 +59,10 @@ public final class ProvenanceWrite imple
private String experimentId;
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
public ProvenanceWrite(Node node, String workflowName,
- Map<Node, Invoker> invokerMap, String experimentId,AiravataRegistry registry) {
+ Map<Node, Invoker> invokerMap, String experimentId,AiravataRegistry2 registry) {
this.node = node;
this.workflowName = workflowName;
this.invokerMap = invokerMap;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java Mon Sep 10 06:32:08 2012
@@ -21,7 +21,7 @@
package org.apache.airavata.xbaya.provenance;
import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
import org.apache.airavata.registry.api.workflow.WorkflowNodeType;
import org.apache.airavata.registry.api.workflow.WorkflowServiceIOData;
@@ -31,9 +31,9 @@ import org.slf4j.LoggerFactory;
public class WorkflowNodeStatusUpdater {
private static Logger logger = LoggerFactory.getLogger(WorkflowNodeStatusUpdater.class);
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
- public WorkflowNodeStatusUpdater(AiravataRegistry registry) {
+ public WorkflowNodeStatusUpdater(AiravataRegistry2 registry) {
this.registry = registry;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java Mon Sep 10 06:32:08 2012
@@ -20,22 +20,21 @@
*/
package org.apache.airavata.xbaya.provenance;
+import java.sql.Timestamp;
+
import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
import org.apache.airavata.registry.api.workflow.WorkflowRunTimeData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.sql.Timestamp;
-import java.util.Date;
-
public class WorkflowStatusUpdater {
private static Logger logger = LoggerFactory.getLogger(WorkflowStatusUpdater.class);
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
- public WorkflowStatusUpdater(AiravataRegistry registry) {
+ public WorkflowStatusUpdater(AiravataRegistry2 registry) {
this.registry = registry;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java Mon Sep 10 06:32:08 2012
@@ -21,11 +21,9 @@
package org.apache.airavata.xbaya.registry;
-import java.net.URI;
import java.util.ArrayList;
import java.util.Map;
-import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.xml.namespace.QName;
@@ -92,9 +90,9 @@ public class RegistryAccesser {
*/
public Workflow getOGCEWorkflow(QName workflowTemplateId) throws RepositoryException, GraphException,
ComponentException, Exception {
- AiravataRegistry registry = connectToRegistry();
- Node node = registry.getWorkflow(workflowTemplateId, this.engine.getConfiguration().getRegistryUserName());
- XmlElement xwf = XMLUtil.stringToXmlElement(node.getProperty("workflow").getString());
+ AiravataRegistry2 registry = connectToRegistry();
+ String xml = registry.getWorkflowGraphXML(workflowTemplateId.getLocalPart());
+ XmlElement xwf = XMLUtil.stringToXmlElement(xml);
Workflow workflow = new Workflow(xwf);
return workflow;
}
@@ -134,11 +132,18 @@ public class RegistryAccesser {
String workflowAsString = XMLUtil.xmlElementToString(workflow.toXML());
String owner = this.engine.getConfiguration().getRegistryUserName();
- AiravataRegistry registry = this.connectToRegistry();
- boolean result = registry.saveWorkflow(workflowQName, workflow.getName(), workflow.getDescription(), workflowAsString,
- owner, registryPublishingWindow.isMakePublic());
+ AiravataRegistry2 registry = this.connectToRegistry();
+ if (registry.isWorkflowExists(workflow.getName())){
+ registry.updateWorkflow(workflow.getName(), workflowAsString);
+ }else{
+ registry.addWorkflow(workflow.getName(), workflowAsString);
+ }
+ if (registryPublishingWindow.isMakePublic()){
+
+ registry.publishWorkflow(workflow.getName());
+ }
registryPublishingWindow.hide();
- return result;
+ return true;
} catch (Exception e) {
this.engine.getGUI().getErrorWindow().error(e.getMessage(), e);
}
@@ -153,8 +158,8 @@ public class RegistryAccesser {
*/
public void deleteOGCEWorkflow(QName workflowTemplateId) throws RegistryException {
if (XBayaUtil.acquireJCRRegistry(this.engine)) {
- AiravataRegistry registry = connectToRegistry();
- registry.deleteWorkflow(workflowTemplateId, this.engine.getConfiguration().getRegistryUserName());
+ AiravataRegistry2 registry = connectToRegistry();
+ registry.removeWorkflow(workflowTemplateId.getLocalPart());
}
}
@@ -164,18 +169,16 @@ public class RegistryAccesser {
* @return
*/
public Workflow getWorkflow(QName qname) throws RegistryException {
- AiravataRegistry registry = connectToRegistry();
- Node node = registry.getWorkflow(qname, this.engine.getConfiguration().getRegistryUserName());
+ AiravataRegistry2 registry = connectToRegistry();
+ String xml = registry.getWorkflowGraphXML(qname.getLocalPart());
Workflow workflow = null;
try {
- XmlElement xwf = XMLUtil.stringToXmlElement(node.getProperty("workflow").getString());
+ XmlElement xwf = XMLUtil.stringToXmlElement(xml);
workflow = new Workflow(xwf);
} catch (GraphException e) {
e.printStackTrace(); // To change body of catch statement use File | Settings | File Templates.
} catch (ComponentException e) {
e.printStackTrace(); // To change body of catch statement use File | Settings | File Templates.
- } catch (RepositoryException e) {
- e.printStackTrace(); // To change body of catch statement use File | Settings | File Templates.
}
return workflow;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java Mon Sep 10 06:32:08 2012
@@ -100,7 +100,7 @@ public class ApplicationDeploymentDescri
if (askQuestion("Application description",
"Are you sure that you want to remove the application description \""
+ getApplicationDeploymentDescriptionWrap().getDescription().getType().getApplicationName().getStringValue() + "\"?")) {
- getRegistry().deleteDeploymentDescription(getApplicationDeploymentDescriptionWrap().getService(),
+ getRegistry().removeApplicationDescriptor(getApplicationDeploymentDescriptionWrap().getService(),
getApplicationDeploymentDescriptionWrap().getHost(),
getApplicationDeploymentDescriptionWrap().getDescription().getType().getApplicationName().getStringValue());
((AbstractAiravataTreeNode) getParent()).refresh();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java Mon Sep 10 06:32:08 2012
@@ -29,7 +29,7 @@ import javax.swing.JTree;
import javax.swing.tree.TreeNode;
import org.apache.airavata.common.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptionWrap;
import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptions;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
@@ -99,11 +99,11 @@ public class ApplicationDeploymentDescri
private void deleteApplicationDescription(JTree tree) throws Exception {
if (askQuestion("Application descriptions",
"Are you sure that you want to remove all application descriptions in this registry?")) {
- AiravataRegistry registry = getRegistry();
+ AiravataRegistry2 registry = getRegistry();
List<ApplicationDeploymentDescriptionWrap> descriptions = getApplicationDeploymentDescriptions()
.getDescriptions();
for (ApplicationDeploymentDescriptionWrap descriptionWrap : descriptions) {
- registry.deleteDeploymentDescription(descriptionWrap.getService(), descriptionWrap.getHost(),
+ registry.removeApplicationDescriptor(descriptionWrap.getService(), descriptionWrap.getHost(),
descriptionWrap.getDescription().getType().getApplicationName().getStringValue());
}
refresh();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java Mon Sep 10 06:32:08 2012
@@ -98,7 +98,7 @@ public class HostDescriptionNode extends
private boolean deleteHostDescription(JTree tree) throws RegistryException {
if (askQuestion("Host description", "Are you sure that you want to remove the host description \""
+ getHostDescription().getType().getHostName() + "\"?")) {
- getRegistry().deleteHostDescription(getHostDescription().getType().getHostName());
+ getRegistry().removeHostDescriptor(getHostDescription().getType().getHostName());
((AbstractAiravataTreeNode) getParent()).refresh();
reloadTreeNode(tree, getParent());
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java Mon Sep 10 06:32:08 2012
@@ -30,7 +30,7 @@ import javax.swing.tree.TreeNode;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.xbaya.model.registrybrowser.HostDescriptions;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
import org.apache.airavata.xbaya.ui.actions.registry.browser.AddAction;
@@ -98,10 +98,10 @@ public class HostDescriptionsNode extend
private void deleteHostDescription(JTree tree) throws Exception {
if (askQuestion("Host descriptions",
"Are you sure that you want to remove all host descriptions in this registry?")) {
- AiravataRegistry registry = getRegistry();
+ AiravataRegistry2 registry = getRegistry();
List<HostDescription> descriptions = getHostDescriptions().getDescriptions();
for (HostDescription descriptionWrap : descriptions) {
- registry.deleteHostDescription(descriptionWrap.getType().getHostName());
+ registry.removeHostDescriptor(descriptionWrap.getType().getHostName());
}
refresh();
reloadTreeNode(tree, this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java Mon Sep 10 06:32:08 2012
@@ -28,12 +28,9 @@ import java.util.List;
import javax.swing.Icon;
import javax.swing.tree.TreeNode;
-import org.apache.airavata.registry.api.AiravataRegistry;
import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.model.registrybrowser.AiravataConfigurations;
-import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptions;
-import org.apache.airavata.xbaya.model.registrybrowser.GFacURLs;
import org.apache.airavata.xbaya.model.registrybrowser.HostDescriptions;
import org.apache.airavata.xbaya.model.registrybrowser.ServiceDescriptions;
import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowExperiments;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java Mon Sep 10 06:32:08 2012
@@ -107,7 +107,7 @@ public class ServiceDescriptionNode exte
private boolean deleteServiceDescription(JTree tree) throws RegistryException {
if (askQuestion("Application", "Are you sure that you want to remove the applications associated with \""
+ getServiceDescription().getType().getName() + "\"?")) {
- getRegistry().deleteServiceDescription(getServiceDescription().getType().getName());
+ getRegistry().removeServiceDescriptor(getServiceDescription().getType().getName());
((AbstractAiravataTreeNode) getParent()).refresh();
reloadTreeNode(tree, getParent());
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java Mon Sep 10 06:32:08 2012
@@ -30,7 +30,7 @@ import javax.swing.tree.TreeNode;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.xbaya.model.registrybrowser.ServiceDescriptions;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
import org.apache.airavata.xbaya.ui.actions.registry.browser.AddAction;
@@ -100,10 +100,10 @@ public class ServiceDescriptionsNode ext
private void deleteServiceDescription(JTree tree) throws Exception {
if (askQuestion("Applications",
"Are you sure that you want to remove all applications defined in this registry?")) {
- AiravataRegistry registry = getRegistry();
+ AiravataRegistry2 registry = getRegistry();
List<ServiceDescription> descriptions = getServiceDescriptions().getDescriptions();
for (ServiceDescription descriptionWrap : descriptions) {
- registry.deleteServiceDescription(descriptionWrap.getType().getName());
+ registry.removeServiceDescriptor(descriptionWrap.getType().getName());
}
refresh();
reloadTreeNode(tree, this);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java Mon Sep 10 06:32:08 2012
@@ -28,7 +28,6 @@ import javax.jcr.PathNotFoundException;
import javax.swing.Icon;
import javax.swing.JTree;
import javax.swing.tree.TreeNode;
-import javax.xml.namespace.QName;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.registry.api.exception.ServiceDescriptionRetrieveException;
@@ -94,7 +93,7 @@ public class XBayaWorkflowTemplateNode e
if (askQuestion("XBaya Workflow", "Are you sure that you want to remove the workflow \""
+ getXbayaWorkflow().getWorkflowName() + "\"?")) {
try {
- getRegistry().deleteWorkflow(new QName(getXbayaWorkflow().getWorkflowName()), getRegistry().getUsername());
+ getRegistry().removeWorkflow(getXbayaWorkflow().getWorkflowName());
((AbstractAiravataTreeNode) getParent()).refresh();
reloadTreeNode(tree, getParent());
} catch (RegistryException e) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java Mon Sep 10 06:32:08 2012
@@ -38,8 +38,6 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.RepositoryException;
import javax.swing.JFrame;
import javax.swing.JOptionPane;
import javax.swing.JSplitPane;
@@ -49,7 +47,6 @@ import javax.swing.UIManager;
import javax.swing.WindowConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import javax.xml.namespace.QName;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.common.utils.SwingUtil;
@@ -823,16 +820,12 @@ public class XBayaGUI implements EventLi
this.newGraphCanvas(true, false);
JCRComponentRegistry jcrComponentRegistry = this.engine.getConfiguration().getJcrComponentRegistry();
try {
- javax.jcr.Node node = jcrComponentRegistry.getRegistry().getWorkflow(new QName(XBayaConstants.LEAD_NS, this.engine.getConfiguration().getWorkflow()), this.engine.getConfiguration().getRegistryUserName());
- XmlElement xwf = XMLUtil.stringToXmlElement(node.getProperty("workflow").getString());
+ String xml = jcrComponentRegistry.getRegistry().getWorkflowGraphXML(this.engine.getConfiguration().getWorkflow());
+ XmlElement xwf = XMLUtil.stringToXmlElement(xml);
Workflow workflow = new Workflow(xwf);
setWorkflow(workflow);
} catch (RegistryException e) {
getErrorWindow().error(ErrorMessages.REPOSITORY_CONFIGURATION_IS_WRONG_FAILED_TO_LOAD_THE_WORKFLOW, e);
- } catch (PathNotFoundException e) {
- getErrorWindow().error(ErrorMessages.GIVEN_WORKFLOW_NAME_IS_WRONG, e);
- } catch (RepositoryException e) {
- getErrorWindow().error(ErrorMessages.REPOSITORY_CONFIGURATION_IS_WRONG_FAILED_TO_LOAD_THE_WORKFLOW, e);
} catch (GraphException e) {
getErrorWindow().error(ErrorMessages.WORKFLOW_IS_WRONG, e);
} catch (ComponentException e) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java Mon Sep 10 06:32:08 2012
@@ -34,7 +34,6 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
import java.util.List;
-import java.util.regex.Pattern;
import javax.swing.BorderFactory;
import javax.swing.JButton;
@@ -54,7 +53,8 @@ import org.apache.airavata.common.utils.
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.GlobusHostType;
import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
@@ -75,7 +75,7 @@ public class ApplicationDescriptionDialo
private XBayaTextField txtAppName;
private XBayaTextField txtTempDir;
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
private ApplicationDeploymentDescription shellApplicationDescription;
private JLabel lblError;
private boolean applcationDescCreated = false;
@@ -128,18 +128,16 @@ public class ApplicationDescriptionDialo
int i = 1;
String defaultName = baseName + i;
try {
- List<ApplicationDeploymentDescription> applicationDeploymentDescriptions = getRegistry()
- .searchDeploymentDescription(getServiceName(),
+ ApplicationDeploymentDescription applicationDeploymentDescription = getRegistry()
+ .getApplicationDescriptors(getServiceName(),
getHostName());
while (true) {
boolean notFound = true;
- for (ApplicationDeploymentDescription deploymentDescription : applicationDeploymentDescriptions) {
- if (deploymentDescription.getType()
- .getApplicationName().getStringValue()
- .equals(defaultName)) {
- notFound = false;
- break;
- }
+ if (applicationDeploymentDescription.getType()
+ .getApplicationName().getStringValue()
+ .equals(defaultName)) {
+ notFound = false;
+ break;
}
if (notFound) {
break;
@@ -158,7 +156,7 @@ public class ApplicationDescriptionDialo
iniGUI();
if (originalService!=null){
try {
- ServiceDescription disc = getRegistry().getServiceDescription(originalService);
+ ServiceDescription disc = getRegistry().getServiceDescriptor(originalService);
if(disc!=null){
setServiceDescription(disc);
}
@@ -521,7 +519,7 @@ public class ApplicationDescriptionDialo
cmbHostName.removeAllItems();
setHostName(null);
try {
- List<HostDescription> hostDescriptions = getRegistry().searchHostDescription(".*");
+ List<HostDescription> hostDescriptions = getRegistry().getHostDescriptors();
for (HostDescription hostDescription : hostDescriptions) {
if (hostDescription.getType().getHostName() == null) {
cmbHostName.addItem(hostDescription.getType().getHostName());
@@ -606,10 +604,14 @@ public class ApplicationDescriptionDialo
public void saveApplicationDescription() {
try {
- getRegistry().saveDeploymentDescription(getServiceName(), getHostName(), getShellApplicationDescription());
+ try {
+ getRegistry().addApplicationDescriptor(getServiceName(), getHostName(), getShellApplicationDescription());
+ } catch (DescriptorAlreadyExistsException e) {
+ getRegistry().updateApplicationDescriptor(getServiceName(), getHostName(), getShellApplicationDescription());
+ }
if (!isNewDescritor() && (!getServiceName().equals(getOriginalService()) || !getHostName().equals(getOriginalHost()))) {
try {
- getRegistry().deleteDeploymentDescription(getOriginalService(),
+ getRegistry().removeApplicationDescriptor(getOriginalService(),
getOriginalHost(),getOriginalDeploymentDescription().getType()
.getApplicationName().getStringValue());
} catch (RegistryException e) {
@@ -654,14 +656,14 @@ public class ApplicationDescriptionDialo
throw new Exception("Name of the application cannot be empty!!!");
}
- List<ApplicationDeploymentDescription> deploymentDescriptions = null;
+ ApplicationDeploymentDescription deploymentDescriptions = null;
try {
- deploymentDescriptions = getRegistry().searchDeploymentDescription(getServiceName(), getHostName(),
- Pattern.quote(getApplicationName()));
+ deploymentDescriptions = getRegistry().getApplicationDescriptor(getServiceName(), getHostName(),
+ getApplicationName());
} catch (RegistryException e) {
throw e;
}
- if (deploymentDescriptions.size() > 0 && (isNewDescritor() || (!getServiceName().equals(getOriginalService()) || !getHostName().equals(getOriginalHost())))) {
+ if (deploymentDescriptions!=null && (isNewDescritor() || (!getServiceName().equals(getOriginalService()) || !getHostName().equals(getOriginalHost())))) {
throw new Exception("Application name already exists for the selected service & host!!!");
}
@@ -701,7 +703,7 @@ public class ApplicationDescriptionDialo
if (hostName!=null) {
HostDescription hostDescription;
try {
- hostDescription = registry.getHostDescription(hostName);
+ hostDescription = registry.getHostDescriptor(hostName);
if (hostDescription.getType() instanceof GlobusHostType) {
getShellApplicationDescription().getType().changeType(
GramApplicationDeploymentType.type);
@@ -759,11 +761,11 @@ public class ApplicationDescriptionDialo
}
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java Mon Sep 10 06:32:08 2012
@@ -41,7 +41,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.jcr.PathNotFoundException;
import javax.swing.BorderFactory;
import javax.swing.DefaultCellEditor;
import javax.swing.JButton;
@@ -66,9 +65,10 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.registry.api.exception.gateway.DescriptorDoesNotExistsException;
+import org.apache.airavata.registry.api.exception.gateway.MalformedDescriptorException;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.DataType;
import org.apache.airavata.schemas.gfac.HostDescriptionType;
@@ -479,25 +479,36 @@ public class DeploymentDescriptionDialog
ignoreTableChanges=true;
updateIODataTable(descType);
getDeployments().clear();
- Map<HostDescription, List<ApplicationDeploymentDescription>> descs = getRegistry().getApplicationDescriptorswithHosts(descType.getName());
- for (HostDescription hostDesc : descs.keySet()) {
- getDeployments().put(hostDesc.getType().getHostName(), new HostDeployment(hostDesc, descs.get(hostDesc).get(0)));
- }
+ try {
+ Map<String, ApplicationDeploymentDescription> descs = getRegistry().getApplicationDescriptors(descType.getName());
+ for (String hostDescName : descs.keySet()) {
+ getDeployments().put(hostDescName, new HostDeployment(getRegistry().getHostDescriptor(hostDescName), descs.get(hostDescName)));
+ }
- updateDeploymentTable();
- Boolean selected = false;
- if (descType.getPortType()!=null && descType.getPortType().getMethod()!=null) {
- XmlCursor cursor = descType.getPortType().getMethod().newCursor();
- String value = cursor.getAttributeText(new QName("forceFileStagingToWorkDir"));
- cursor.dispose();
- selected = false;
- if (value != null) {
- selected = Boolean.parseBoolean(value);
+ updateDeploymentTable();
+ Boolean selected = false;
+ if (descType.getPortType()!=null && descType.getPortType().getMethod()!=null) {
+ XmlCursor cursor = descType.getPortType().getMethod().newCursor();
+ String value = cursor.getAttributeText(new QName("forceFileStagingToWorkDir"));
+ cursor.dispose();
+ selected = false;
+ if (value != null) {
+ selected = Boolean.parseBoolean(value);
+ }
}
+ chkForceFileStagingToWorkDir.setSelected(selected);
+ setForceFileStagingToWorkDir(selected);
+ ignoreTableChanges=false;
+ } catch (MalformedDescriptorException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (DescriptorDoesNotExistsException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (RegistryException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
- chkForceFileStagingToWorkDir.setSelected(selected);
- setForceFileStagingToWorkDir(selected);
- ignoreTableChanges=false;
}
private void updateIODataTable(ServiceDescriptionType descType) {
@@ -644,11 +655,9 @@ public class DeploymentDescriptionDialog
getServiceDescriptionType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[] {}));
getRegistry().addServiceDescriptor(getServiceDescription());
if (!isNewDescription()) {
- Map<HostDescription, List<ApplicationDeploymentDescription>> descs = getRegistry().getApplicationDescriptorswithHosts(getServiceName());
- for (HostDescription hostDesc : descs.keySet()) {
- for (ApplicationDeploymentDescription app : descs.get(hostDesc)) {
- getRegistry().removeApplicationDescriptor(getServiceName(), hostDesc.getType().getHostName(), app.getType().getApplicationName().getStringValue());
- }
+ Map<String, ApplicationDeploymentDescription> descs = getRegistry().getApplicationDescriptors(getServiceName());
+ for (String hostDescName : descs.keySet()) {
+ getRegistry().removeApplicationDescriptor(getServiceName(), hostDescName, descs.get(hostDescName).getType().getApplicationName().getStringValue());
}
}
for (String hostName : getDeployments().keySet()) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java Mon Sep 10 06:32:08 2012
@@ -49,6 +49,8 @@ import org.apache.airavata.commons.gfac.
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.registry.api.exception.gateway.DescriptorDoesNotExistsException;
+import org.apache.airavata.registry.api.exception.gateway.MalformedDescriptorException;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.registrybrowser.nodes.JCRBrowserIcons;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
@@ -114,8 +116,13 @@ public class DescriptorEditorDialog exte
@Override
public void mouseClicked(MouseEvent e) {
if (e.getClickCount()==2){
- editDescriptor();
- }
+ try {
+ editDescriptor();
+ } catch (RegistryException e1) {
+ engine.getGUI().getErrorWindow().error("Error while editing descriptor", e1);
+ e1.printStackTrace();
+ }
+ }
}
});
GridPanel infoPanel=new GridPanel();
@@ -126,7 +133,12 @@ public class DescriptorEditorDialog exte
JButton newButton = new JButton("New...");
newButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- newDescriptor();
+ try {
+ newDescriptor();
+ } catch (RegistryException e1) {
+ engine.getGUI().getErrorWindow().error("Error while creating descriptors", e1);
+ e1.printStackTrace();
+ }
}
});
descriptorList.addListSelectionListener(new ListSelectionListener(){
@@ -140,14 +152,24 @@ public class DescriptorEditorDialog exte
editButton = new JButton("Edit...");
editButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- editDescriptor();
+ try {
+ editDescriptor();
+ } catch (RegistryException e1) {
+ engine.getGUI().getErrorWindow().error("Error while editing descriptor", e1);
+ e1.printStackTrace();
+ }
}
});
removeButton = new JButton("Remove");
removeButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- deleteDescriptor();
+ try {
+ deleteDescriptor();
+ } catch (RegistryException e1) {
+ engine.getGUI().getErrorWindow().error("Error while removing descriptor", e1);
+ e1.printStackTrace();
+ }
}
});
JButton closeButton = new JButton("Close");
@@ -180,10 +202,15 @@ public class DescriptorEditorDialog exte
this.dialog.setDefaultButton(editButton);
editButton.setEnabled(false);
removeButton.setEnabled(false);
- loadDescriptors();
+ try {
+ loadDescriptors();
+ } catch (RegistryException e1) {
+ engine.getGUI().getErrorWindow().error("Error while loading descriptors", e1);
+ e1.printStackTrace();
+ }
}
- private void editDescriptor() {
+ private void editDescriptor() throws MalformedDescriptorException, RegistryException {
switch (descriptorType){
case HOST:
HostDescription h = (HostDescription) getSelected();
@@ -217,7 +244,7 @@ public class DescriptorEditorDialog exte
}
}
- private void newDescriptor() {
+ private void newDescriptor() throws MalformedDescriptorException, RegistryException {
switch (descriptorType){
case HOST:
HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
@@ -253,7 +280,7 @@ public class DescriptorEditorDialog exte
protected boolean askQuestion(String title, String question) {
return JOptionPane.showConfirmDialog(null, question, title, JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
}
- private boolean deleteDescriptor(){
+ private boolean deleteDescriptor() throws DescriptorDoesNotExistsException, RegistryException{
String title=null;
String question=null;
switch (descriptorType){
@@ -299,7 +326,7 @@ public class DescriptorEditorDialog exte
return true;
}
- private void loadDescriptors() {
+ private void loadDescriptors() throws MalformedDescriptorException, RegistryException {
try {
//allow the registry cache to update
Thread.sleep(500);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java Mon Sep 10 06:32:08 2012
@@ -47,7 +47,7 @@ import org.apache.airavata.common.utils.
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.xbaya.registrybrowser.nodes.JCRBrowserIcons;
import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
@@ -61,11 +61,11 @@ public class DescriptorListDialog extend
private XBayaDialog dialog;
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
private JList descriptorList;
- private Map<ApplicationDeploymentDescription,String> dlist;
+ private Map<String[],ApplicationDeploymentDescription> dlist;
private JButton okButton;
@@ -82,7 +82,7 @@ public class DescriptorListDialog extend
/**
* @param engine XBaya workflow engine
*/
- public DescriptorListDialog(AiravataRegistry registry, DescriptorType descriptorType) {
+ public DescriptorListDialog(AiravataRegistry2 registry, DescriptorType descriptorType) {
setRegistry(registry);
this.descriptorType=descriptorType;
initGUI();
@@ -192,14 +192,14 @@ public class DescriptorListDialog extend
List<?> descriptors=null;
switch (descriptorType){
case HOST:
- descriptors = getRegistry().searchHostDescription(".*");
+ descriptors = getRegistry().getHostDescriptors();
break;
case SERVICE:
- descriptors = getRegistry().searchServiceDescription(".*");
+ descriptors = getRegistry().getServiceDescriptors();
break;
case APPLICATION:
- dlist=getRegistry().searchDeploymentDescription();
- descriptors =Arrays.asList(dlist.keySet().toArray(new ApplicationDeploymentDescription[]{}));
+ dlist=getRegistry().getApplicationDescriptors();
+ descriptors =Arrays.asList(dlist.values().toArray(new ApplicationDeploymentDescription[]{}));
break;
}
for (Object d : descriptors) {
@@ -240,11 +240,11 @@ public class DescriptorListDialog extend
}
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java Mon Sep 10 06:32:08 2012
@@ -50,6 +50,8 @@ import org.apache.airavata.common.utils.
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.registry.api.exception.gateway.DescriptorDoesNotExistsException;
+import org.apache.airavata.registry.api.exception.gateway.MalformedDescriptorException;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.GlobusHostType;
import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
@@ -490,19 +492,27 @@ public class HostDeploymentDialog extend
this.hostName = hostName;
if (hostName != null) {
HostDescription hostDescription;
- hostDescription = registry.getHostDescriptor(hostName);
- if (hostDescription.getType() instanceof GlobusHostType) {
- getShellApplicationDescription().getType().changeType(
- GramApplicationDeploymentType.type);
- } else {
- getShellApplicationDescription().getType().changeType(
- ApplicationDeploymentDescriptionType.type);
- }
- btnHostAdvanceOptions.setVisible(hostDescription.getType() instanceof GlobusHostType);
- String hostAddress = hostDescription.getType().getHostAddress();
- boolean isLocal = isLocalAddress(hostAddress);
- btnExecBrowse.setVisible(isLocal);
- btnTmpDirBrowse.setVisible(isLocal);
+ try {
+ hostDescription = registry.getHostDescriptor(hostName);
+ if (hostDescription.getType() instanceof GlobusHostType) {
+ getShellApplicationDescription().getType().changeType(
+ GramApplicationDeploymentType.type);
+ } else {
+ getShellApplicationDescription().getType().changeType(
+ ApplicationDeploymentDescriptionType.type);
+ }
+ btnHostAdvanceOptions.setVisible(hostDescription.getType() instanceof GlobusHostType);
+ String hostAddress = hostDescription.getType().getHostAddress();
+ boolean isLocal = isLocalAddress(hostAddress);
+ btnExecBrowse.setVisible(isLocal);
+ btnTmpDirBrowse.setVisible(isLocal);
+ } catch (DescriptorDoesNotExistsException e) {
+ e.printStackTrace();
+ } catch (MalformedDescriptorException e) {
+ e.printStackTrace();
+ } catch (RegistryException e) {
+ e.printStackTrace();
+ }
}
updateDialogStatus();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java Mon Sep 10 06:32:08 2012
@@ -41,6 +41,7 @@ import org.apache.airavata.common.regist
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException;
import org.apache.airavata.schemas.gfac.GlobusHostType;
import org.apache.airavata.schemas.gfac.HostDescriptionType;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
@@ -397,8 +398,17 @@ public class HostDescriptionDialog exten
public void saveHostDescription() {
HostDescription desc = getHostDescription();
- getRegistry().addHostDescriptor(desc);
- setHostCreated(true);
+ try {
+ getRegistry().addHostDescriptor(desc);
+ setHostCreated(true);
+ } catch (DescriptorAlreadyExistsException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (RegistryException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ setHostCreated(false);
}
public AiravataRegistry2 getRegistry() {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java Mon Sep 10 06:32:08 2012
@@ -64,7 +64,7 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.schemas.gfac.DataType;
import org.apache.airavata.schemas.gfac.InputParameterType;
import org.apache.airavata.schemas.gfac.OutputParameterType;
@@ -90,7 +90,7 @@ public class ServiceDescriptionDialog ex
private JButton okButton;
private JButton btnDeleteParameter;
private DefaultTableModel defaultTableModel;
- private AiravataRegistry registry;
+ private AiravataRegistry2 registry;
private boolean newDescription;
private boolean ignoreTableChanges=false;
private JCheckBox chkForceFileStagingToWorkDir;
@@ -111,18 +111,18 @@ public class ServiceDescriptionDialog ex
}
}
- public ServiceDescriptionDialog(AiravataRegistry registry) {
+ public ServiceDescriptionDialog(AiravataRegistry2 registry) {
this(registry,true,null);
}
- public ServiceDescriptionDialog(AiravataRegistry registry, boolean newDescription, ServiceDescription serviceDescription) {
+ public ServiceDescriptionDialog(AiravataRegistry2 registry, boolean newDescription, ServiceDescription serviceDescription) {
this(registry, newDescription, serviceDescription, true, null);
}
/**
* Create the dialog.
*/
- public ServiceDescriptionDialog(AiravataRegistry registry, boolean newDescription, ServiceDescription serviceDescription, boolean serviceDescriptionMode, String suggestedNamePrefix) {
+ public ServiceDescriptionDialog(AiravataRegistry2 registry, boolean newDescription, ServiceDescription serviceDescription, boolean serviceDescriptionMode, String suggestedNamePrefix) {
setNewDescription(newDescription);
this.setOrginalServiceDescription(serviceDescription);
setServiceDescriptionMode(serviceDescriptionMode);
@@ -147,7 +147,7 @@ public class ServiceDescriptionDialog ex
defaultName = baseName;
}
try {
- while (getRegistry().getServiceDescription(defaultName) != null) {
+ while (getRegistry().isServiceDescriptorExists(defaultName)) {
defaultName = baseName + (++i);
}
} catch (Exception e) {
@@ -559,7 +559,7 @@ public class ServiceDescriptionDialog ex
ServiceDescription serviceDescription2 = null;
try {
- serviceDescription2 = getRegistry().getServiceDescription(getServiceName());
+ serviceDescription2 = getRegistry().getServiceDescriptor(getServiceName());
} catch (RegistryException e) {
if (e.getCause() instanceof PathNotFoundException) {
// non-existant name. just want we want
@@ -606,8 +606,12 @@ public class ServiceDescriptionDialog ex
getServiceDescriptionType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[] {}));
try {
- getRegistry().saveServiceDescription(getServiceDescription());
- setServiceCreated(true);
+ if (getRegistry().isServiceDescriptorExists(getServiceDescription().getType().getName())) {
+ getRegistry().updateServiceDescriptor(getServiceDescription());
+ }else{
+ getRegistry().addServiceDescriptor(getServiceDescription());
+ }
+ setServiceCreated(true);
} catch (RegistryException e) {
e.printStackTrace();
setError(e.getMessage());
@@ -653,11 +657,11 @@ public class ServiceDescriptionDialog ex
}
}
- public AiravataRegistry getRegistry() {
+ public AiravataRegistry2 getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry registry) {
+ public void setRegistry(AiravataRegistry2 registry) {
this.registry = registry;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java Mon Sep 10 06:32:08 2012
@@ -122,15 +122,11 @@ public class DynamicWorkflowRunnerWindow
*/
public void show() {
this.workflow = this.engine.getGUI().getWorkflow();
- List<String> urlList=null;
- try {
- urlList = this.engine.getConfiguration().getJcrComponentRegistry().getRegistry().getGFacDescriptorList();
- } catch (RegistryException e) {
- engine.getGUI().getErrorWindow().error(e);
- }
+ List<URI> urlList=null;
+ urlList = this.engine.getConfiguration().getJcrComponentRegistry().getRegistry().getGFacURIs();
// When run xbaya continously urls can be repeating, so first remove everything and then add
this.gfacUrlListField.removeAllItems();
- for (String gfacUrl : urlList) {
+ for (URI gfacUrl : urlList) {
if (XBayaUtil.isURLExists(gfacUrl + "?wsdl")) {
this.gfacUrlListField.addItem(gfacUrl);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java Mon Sep 10 06:32:08 2012
@@ -99,7 +99,7 @@ public class JCRRegistryWindow {
}
JCRComponentRegistry registry = null;
try {
- registry = new JCRComponentRegistry(url, username, password);
+ registry = new JCRComponentRegistry(username, password);
} catch (Exception e) {
this.engine.getGUI().getErrorWindow().error(e.getMessage());
return;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistryLoaderWindow.java Mon Sep 10 06:32:08 2012
@@ -28,18 +28,16 @@ import java.util.Map;
import java.util.Set;
import java.util.Vector;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
import javax.swing.AbstractAction;
import javax.swing.JButton;
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.common.registry.api.exception.RegistryException;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.graph.GraphException;
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.registry.RegistryAccesser;
@@ -108,17 +106,13 @@ public class RegistryLoaderWindow {
String val = null;
for (String key : keys) {
val = resultList.get(key);
- results.add(new RegistrySearchResult(val));
- }
- Session session = null;
- try {
- session = val.getSession();
- } catch (RepositoryException e) {
- RegistryLoaderWindow.this.engine.getGUI().getErrorWindow().error(
- ErrorMessages.UNEXPECTED_ERROR, e);
- }
- if (session != null && session.isLive()) {
- session.logout();
+ try {
+ results.add(new RegistrySearchResult(new Workflow(val)));
+ } catch (GraphException e) {
+ e.printStackTrace();
+ } catch (ComponentException e) {
+ e.printStackTrace();
+ }
}
RegistryLoaderWindow.this.list.setListData(results);
RegistryLoaderWindow.this.list.setEnabled(true);