You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/11/21 20:39:59 UTC
svn commit: r1412246 [3/4] - in /airavata/trunk: ./ modules/airavata-client/
modules/airavata-client/src/main/java/org/apache/airavata/client/
modules/airavata-client/src/main/java/org/apache/airavata/client/impl/
modules/distribution/ modules/distribu...
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java Wed Nov 21 19:39:38 2012
@@ -21,31 +21,34 @@
package org.apache.airavata.xbaya.model.registrybrowser;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
+
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class MessageBoxURLs {
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public MessageBoxURLs(AiravataRegistry2 registry) {
- setRegistry(registry);
+ public MessageBoxURLs(AiravataAPI airavataAPI) {
+ setAiravataAPI(airavataAPI);
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
- public List<MessageBoxURL> getURLS() {
+ public List<MessageBoxURL> getURLS() throws AiravataAPIInvocationException {
List<MessageBoxURL> urls = new ArrayList<MessageBoxURL>();
- URI gfacDescriptor = getRegistry().getMessageBoxURI();
- urls.add(new MessageBoxURL(getRegistry(), gfacDescriptor));
+ URI gfacDescriptor = getAiravataAPI().getAiravataManager().getMessageBoxServiceURL();
+ urls.add(new MessageBoxURL(getAiravataAPI(), gfacDescriptor));
return urls;
}
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java Wed Nov 21 19:39:38 2012
@@ -23,26 +23,28 @@ package org.apache.airavata.xbaya.model.
import java.util.List;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class ServiceDescriptions {
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public ServiceDescriptions(AiravataRegistry2 registry) {
- setRegistry(registry);
+ public ServiceDescriptions(AiravataAPI airavataAPI) {
+ setAiravataAPI(airavataAPI);
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
- public List<ServiceDescription> getDescriptions() throws RegistryException {
- return getRegistry().getServiceDescriptors();
+ public List<ServiceDescription> getDescriptions() throws RegistryException, AiravataAPIInvocationException {
+ return getAiravataAPI().getApplicationManager().getAllServiceDescriptions();
}
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java Wed Nov 21 19:39:38 2012
@@ -24,8 +24,10 @@ package org.apache.airavata.xbaya.model.
import java.util.ArrayList;
import java.util.List;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.workflow.WorkflowInstance;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceData;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodeData;
@@ -33,23 +35,23 @@ import org.apache.airavata.registry.api.
public class XBayaWorkflow {
private List<XBayaWorkflowNodeElement> workflowServices;
private WorkflowInstance workflowInstance;
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public XBayaWorkflow(WorkflowInstance workflowInstance, AiravataRegistry2 registry) {
+ public XBayaWorkflow(WorkflowInstance workflowInstance, AiravataAPI airavataAPI) {
setWorkflowInstance(workflowInstance);
- setRegistry(registry);
+ setAiravataAPI(airavataAPI);
}
public List<XBayaWorkflowNodeElement> getWorkflowServices() {
if (workflowServices==null){
workflowServices=new ArrayList<XBayaWorkflowNodeElement>();
try {
- WorkflowInstanceData workflowInstanceData = getRegistry().getWorkflowInstanceData(getWorkflowId());
+ WorkflowInstanceData workflowInstanceData = getAiravataAPI().getProvenanceManager().getWorkflowInstanceData(getWorkflowId(), getWorkflowId());
List<WorkflowInstanceNodeData> nodeDataList = workflowInstanceData.getNodeDataList();
for (WorkflowInstanceNodeData nodeData : nodeDataList) {
workflowServices.add(new XBayaWorkflowNodeElement(nodeData.getWorkflowInstanceNode().getNodeId(), nodeData));
}
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
e.printStackTrace();
}
}
@@ -72,15 +74,15 @@ public class XBayaWorkflow {
return getWorkflowInstance().getWorkflowInstanceId();
}
- public AiravataRegistry2 getRegistry() {
- return registry;
- }
-
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
- }
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
+ }
+
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
+ }
- public WorkflowInstance getWorkflowInstance() {
+ public WorkflowInstance getWorkflowInstance() {
return workflowInstance;
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java Wed Nov 21 19:39:38 2012
@@ -24,32 +24,34 @@ package org.apache.airavata.xbaya.model.
import java.util.ArrayList;
import java.util.List;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.workflow.WorkflowInstance;
public class XBayaWorkflowExperiment {
private List<XBayaWorkflow> workflows;
private String experimentId;
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public XBayaWorkflowExperiment(String experimentId, AiravataRegistry2 registry) {
+ public XBayaWorkflowExperiment(String experimentId, AiravataAPI airavataAPI) {
setExperimentId(experimentId);
- setRegistry(registry);
+ setAiravataAPI(airavataAPI);
}
public List<XBayaWorkflow> getWorkflows() {
if (workflows==null){
workflows=new ArrayList<XBayaWorkflow>();
try {
- List<WorkflowInstance> experimentWorkflowInstances = getRegistry().getExperimentWorkflowInstances(getExperimentId());
+ List<WorkflowInstance> experimentWorkflowInstances = getAiravataAPI().getProvenanceManager().getExperimentWorkflowInstances(getExperimentId());
for (WorkflowInstance workflowInstance : experimentWorkflowInstances) {
- workflows.add(new XBayaWorkflow(workflowInstance, getRegistry()));
+ workflows.add(new XBayaWorkflow(workflowInstance, getAiravataAPI()));
}
- } catch (RegistryException e) {
- e.printStackTrace();
- }
- }
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
+ }
+ }
return workflows;
}
@@ -69,11 +71,11 @@ public class XBayaWorkflowExperiment {
this.experimentId = experimentId;
}
- public AiravataRegistry2 getRegistry() {
- return registry;
- }
-
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
- }
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
+ }
+
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
+ }
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java Wed Nov 21 19:39:38 2012
@@ -26,38 +26,40 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class XBayaWorkflowExperiments {
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public XBayaWorkflowExperiments(AiravataRegistry2 registry) {
- setRegistry(registry);
+ public XBayaWorkflowExperiments(AiravataAPI airavataAPI) {
+ setAiravataAPI(airavataAPI);
}
public List<XBayaWorkflowExperiment> getAllExperiments(){
Map<String, XBayaWorkflowExperiment> experiments=new HashMap<String,XBayaWorkflowExperiment>();
try {
initializeExperimentMap(experiments);
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
e.printStackTrace();
}
return Arrays.asList(experiments.values().toArray(new XBayaWorkflowExperiment[]{}));
}
- public void initializeExperimentMap(Map<String, XBayaWorkflowExperiment> experiments) throws RegistryException{
- List<String> experimentIdByUser = getRegistry().getExperimentIdByUser(null);
+ public void initializeExperimentMap(Map<String, XBayaWorkflowExperiment> experiments) throws AiravataAPIInvocationException {
+ List<String> experimentIdByUser = getAiravataAPI().getProvenanceManager().getExperimentIdList(null);
for (String id : experimentIdByUser) {
- experiments.put(id, new XBayaWorkflowExperiment(id, getRegistry()));
+ experiments.put(id, new XBayaWorkflowExperiment(id, getAiravataAPI()));
}
}
-
- public AiravataRegistry2 getRegistry() {
- return registry;
- }
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
- }
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
+ }
+
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
+ }
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java Wed Nov 21 19:39:38 2012
@@ -25,32 +25,37 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.workflow.model.wf.Workflow;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
public class XBayaWorkflowTemplates {
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public XBayaWorkflowTemplates(AiravataRegistry2 registry) {
- setRegistry(registry);
+ public XBayaWorkflowTemplates(AiravataAPI airavataAPI) {
+ setAiravataAPI(airavataAPI);
}
- public AiravataRegistry2 getRegistry() {
- return registry;
+ public AiravataAPI getAiravataAPI() {
+ return airavataAPI;
}
- public void setRegistry(AiravataRegistry2 registry) {
- this.registry = registry;
+ public void setAiravataAPI(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
public List<XBayaWorkflowTemplate> getWorkflows() {
List<XBayaWorkflowTemplate> workflows = new ArrayList<XBayaWorkflowTemplate>();
try {
- Map<String, String> workflowMap = registry.getWorkflows();
- for (String xBayaWorkflowName : workflowMap.keySet()) {
- workflows.add(new XBayaWorkflowTemplate(xBayaWorkflowName,workflowMap.get(xBayaWorkflowName)));
- }
- } catch (RegistryException e) {
+ List<Workflow> list = getAiravataAPI().getWorkflowManager().getWorkflows();
+
+ for (Workflow workflow : list){
+ String workflowAsString = getAiravataAPI().getWorkflowManager().getWorkflowAsString(workflow.getName());
+ workflows.add(new XBayaWorkflowTemplate(workflow.getName(), workflowAsString));
+ }
+ } catch (AiravataAPIInvocationException e) {
e.printStackTrace();
}
return workflows;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java Wed Nov 21 19:39:38 2012
@@ -22,10 +22,10 @@ package org.apache.airavata.xbaya.proven
import java.util.List;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.registry.api.workflow.ExperimentData;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodeData;
-import org.apache.airavata.registry.api.workflow.WorkflowNodeIOData;
import org.apache.airavata.workflow.model.graph.Node;
public class ProvenanceReader {
@@ -34,19 +34,19 @@ public class ProvenanceReader {
private String experimentId;
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
private Node node;
- public ProvenanceReader(Node node,String experimentId,AiravataRegistry2 registry) {
+ public ProvenanceReader(Node node,String experimentId,AiravataAPI airavataAPI) {
this.experimentId = experimentId;
- this.registry = registry;
+ this.airavataAPI = airavataAPI;
this.node = node;
}
public Object read() throws Exception {
try {
- ExperimentData workflowExecution = registry.getExperiment(experimentId);
+ ExperimentData workflowExecution = airavataAPI.getProvenanceManager().getExperimentData(experimentId);
List<WorkflowInstanceNodeData> nodeDataList = workflowExecution.getWorkflowInstanceData().get(0).getNodeDataList();
if (nodeDataList.size() == 0) {
return null;
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java Wed Nov 21 19:39:38 2012
@@ -24,9 +24,11 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.workflow.WorkflowInstance;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
import org.apache.airavata.workflow.model.exceptions.WorkflowException;
@@ -60,15 +62,15 @@ public final class ProvenanceWrite imple
private String experimentId;
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
public ProvenanceWrite(Node node, String workflowName,
- Map<Node, Invoker> invokerMap, String experimentId,AiravataRegistry2 registry) {
+ Map<Node, Invoker> invokerMap, String experimentId,AiravataAPI airavataAPI) {
this.node = node;
this.workflowName = workflowName;
this.invokerMap = invokerMap;
this.experimentId = experimentId;
- this.registry = registry;
+ this.airavataAPI = airavataAPI;
}
public void run() {
@@ -176,8 +178,8 @@ public final class ProvenanceWrite imple
}
if (inputs!=null) {
try {
- this.registry.updateWorkflowNodeInput(new WorkflowInstanceNode(new WorkflowInstance(experimentId,experimentId),node.getID()),xsul5.XmlConstants.BUILDER.serializeToString(inputs));
- } catch (RegistryException e) {
+ this.airavataAPI.getProvenanceManager().setWorkflowInstanceNodeInput(new WorkflowInstanceNode(new WorkflowInstance(experimentId, experimentId), node.getID()), xsul5.XmlConstants.BUILDER.serializeToString(inputs));
+ } catch (AiravataAPIInvocationException e) {
throw new WorkflowException(e);
}
// deal with the outputs
@@ -206,8 +208,8 @@ public final class ProvenanceWrite imple
}
}
try {
- this.registry.updateWorkflowNodeOutput(new WorkflowInstanceNode(new WorkflowInstance(experimentId,experimentId),node.getID()),xsul5.XmlConstants.BUILDER.serializeToString(outputs));
- } catch (RegistryException e) {
+ this.airavataAPI.getProvenanceManager().setWorkflowInstanceNodeOutput(new WorkflowInstanceNode(new WorkflowInstance(experimentId,experimentId),node.getID()),xsul5.XmlConstants.BUILDER.serializeToString(outputs));
+ } catch (AiravataAPIInvocationException e) {
throw new WorkflowException(e);
}
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java Wed Nov 21 19:39:38 2012
@@ -20,8 +20,9 @@
*/
package org.apache.airavata.xbaya.provenance;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.workflow.WorkflowInstance;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
@@ -32,10 +33,10 @@ import org.slf4j.LoggerFactory;
public class WorkflowNodeStatusUpdater {
private static Logger logger = LoggerFactory.getLogger(WorkflowNodeStatusUpdater.class);
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public WorkflowNodeStatusUpdater(AiravataRegistry2 registry) {
- this.registry = registry;
+ public WorkflowNodeStatusUpdater(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
public boolean workflowStarted(String workflowInstanceID,String nodeID,String inputs,String workflowID){
@@ -44,10 +45,10 @@ public class WorkflowNodeStatusUpdater {
WorkflowNodeType workflowNodeType = new WorkflowNodeType();
workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.SERVICENODE);
WorkflowInstanceNode node = new WorkflowInstanceNode(new WorkflowInstance(workflowInstanceID,workflowInstanceID), nodeID);
- registry.updateWorkflowNodeInput(node,inputs);
- registry.updateWorkflowNodeType(node, workflowNodeType);
- registry.updateWorkflowNodeStatus(workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.STARTED);
- } catch (RegistryException e) {
+ airavataAPI.getProvenanceManager().setWorkflowInstanceNodeInput(node, inputs);
+ airavataAPI.getProvenanceManager().setWorkflowNodeType(node, workflowNodeType);
+ airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.STARTED);
+ } catch (AiravataAPIInvocationException e) {
logger.error("Error updating Wokflow Node status !!");
return false;
}
@@ -56,9 +57,9 @@ public class WorkflowNodeStatusUpdater {
public boolean workflowFailed(String workflowInstanceID,String nodeID){
try {
- registry.updateWorkflowNodeStatus(workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.FAILED);
- registry.updateWorkflowInstanceStatus(workflowInstanceID, WorkflowInstanceStatus.ExecutionStatus.FAILED);
- } catch (RegistryException e) {
+ airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.FAILED);
+ airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(workflowInstanceID, workflowInstanceID, WorkflowInstanceStatus.ExecutionStatus.FAILED);
+ } catch (AiravataAPIInvocationException e) {
logger.error("Error updating Wokflow Node status !!");
return false;
}
@@ -70,10 +71,10 @@ public class WorkflowNodeStatusUpdater {
WorkflowNodeType workflowNodeType = new WorkflowNodeType();
workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.SERVICENODE);
WorkflowInstanceNode node = new WorkflowInstanceNode(new WorkflowInstance(workflowInstanceID,workflowInstanceID), nodeID);
- registry.updateWorkflowNodeOutput(node,inputs);
- registry.updateWorkflowNodeType(node,workflowNodeType);
- registry.updateWorkflowNodeStatus(workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.FINISHED);
- } catch (RegistryException e) {
+ airavataAPI.getProvenanceManager().setWorkflowInstanceNodeOutput(node, inputs);
+ airavataAPI.getProvenanceManager().setWorkflowNodeType(node,workflowNodeType);
+ airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.FINISHED);
+ } catch (AiravataAPIInvocationException e) {
logger.error("Error updating Wokflow Node status !!");
return false;
}
@@ -82,8 +83,8 @@ public class WorkflowNodeStatusUpdater {
public boolean workflowRunning(String workflowInstanceID,String nodeID){
try {
- registry.updateWorkflowNodeStatus(workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.RUNNING);
- } catch (RegistryException e) {
+ airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.RUNNING);
+ } catch (AiravataAPIInvocationException e) {
logger.error("Error updating Wokflow Node status !!");
return false;
}
@@ -92,8 +93,8 @@ public class WorkflowNodeStatusUpdater {
public boolean workflowPaused(String workflowInstanceID,String nodeID){
try {
- registry.updateWorkflowNodeStatus(workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.PAUSED);
- } catch (RegistryException e) {
+ airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowInstanceStatus.ExecutionStatus.PAUSED);
+ } catch (AiravataAPIInvocationException e) {
logger.error("Error updating Wokflow Node status !!");
return false;
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java Wed Nov 21 19:39:38 2012
@@ -22,8 +22,10 @@ package org.apache.airavata.xbaya.proven
import java.sql.Timestamp;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.registry.api.workflow.WorkflowInstance;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
import org.slf4j.Logger;
@@ -32,16 +34,16 @@ import org.slf4j.LoggerFactory;
public class WorkflowStatusUpdater {
private static Logger logger = LoggerFactory.getLogger(WorkflowStatusUpdater.class);
- private AiravataRegistry2 registry;
+ private AiravataAPI airavataAPI;
- public WorkflowStatusUpdater(AiravataRegistry2 registry) {
- this.registry = registry;
+ public WorkflowStatusUpdater(AiravataAPI airavataAPI) {
+ this.airavataAPI = airavataAPI;
}
public boolean workflowStarted(String experimentID){
try {
- registry.updateWorkflowInstanceStatus(experimentID, WorkflowInstanceStatus.ExecutionStatus.STARTED);
- } catch (RegistryException e) {
+ airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowInstanceStatus.ExecutionStatus.STARTED);
+ } catch (AiravataAPIInvocationException e) {
logger.error("Error updating Wokflow Node status !!");
return false;
}
@@ -50,8 +52,8 @@ public class WorkflowStatusUpdater {
public boolean workflowFailed(String experimentID){
try {
- registry.updateWorkflowInstanceStatus(experimentID, WorkflowInstanceStatus.ExecutionStatus.FAILED);
- } catch (RegistryException e) {
+ airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowInstanceStatus.ExecutionStatus.FAILED);
+ } catch (AiravataAPIInvocationException e) {
logger.error("Error updating Wokflow Node status !!");
return false;
}
@@ -60,8 +62,8 @@ public class WorkflowStatusUpdater {
public boolean workflowFinished(String experimentID){
try {
- registry.updateWorkflowInstanceStatus(experimentID, WorkflowInstanceStatus.ExecutionStatus.FINISHED);
- } catch (RegistryException e) {
+ airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowInstanceStatus.ExecutionStatus.FINISHED);
+ } catch (AiravataAPIInvocationException e) {
logger.error("Error updating Wokflow Node status !!");
return false;
}
@@ -70,8 +72,8 @@ public class WorkflowStatusUpdater {
public boolean workflowRunning(String experimentID){
try {
- registry.updateWorkflowInstanceStatus(experimentID, WorkflowInstanceStatus.ExecutionStatus.RUNNING);
- } catch (RegistryException e) {
+ airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowInstanceStatus.ExecutionStatus.RUNNING);
+ } catch (AiravataAPIInvocationException e) {
logger.error("Error updating Wokflow Node status !!");
return false;
}
@@ -80,8 +82,8 @@ public class WorkflowStatusUpdater {
public boolean workflowPaused(String experimentID){
try {
- registry.updateWorkflowInstanceStatus(experimentID, WorkflowInstanceStatus.ExecutionStatus.PAUSED);
- } catch (RegistryException e) {
+ airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowInstanceStatus.ExecutionStatus.PAUSED);
+ } catch (AiravataAPIInvocationException e) {
logger.error("Error updating Wokflow Node status !!");
return false;
}
@@ -91,9 +93,9 @@ public class WorkflowStatusUpdater {
public boolean saveWorkflowData(String experimentID,String workflowInstanceID,String workflowTemplateID) {
Timestamp currentTime = new Timestamp((new java.util.Date()).getTime());
try {
- registry.setWorkflowInstanceTemplateName(workflowInstanceID, workflowTemplateID);
- registry.updateWorkflowInstanceStatus(new WorkflowInstanceStatus(new WorkflowInstance(experimentID, workflowInstanceID), WorkflowInstanceStatus.ExecutionStatus.STARTED,currentTime));
- } catch (RegistryException e) {
+ airavataAPI.getProvenanceManager().setWorkflowInstanceTemplateName(workflowInstanceID, workflowTemplateID);
+ airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(new WorkflowInstanceStatus(new WorkflowInstance(experimentID, workflowInstanceID), WorkflowInstanceStatus.ExecutionStatus.STARTED,currentTime));
+ } catch (AiravataAPIInvocationException e) {
logger.error("Error saving Workflow Data !!");
}
return true;
Added: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/PasswordCallbackImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/PasswordCallbackImpl.java?rev=1412246&view=auto
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/PasswordCallbackImpl.java (added)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/PasswordCallbackImpl.java Wed Nov 21 19:39:38 2012
@@ -0,0 +1,39 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.xbaya.registry;
+
+import org.apache.airavata.registry.api.PasswordCallback;
+
+public class PasswordCallbackImpl implements PasswordCallback {
+ private String username;
+ private String password;
+
+ public PasswordCallbackImpl(String username, String password) {
+ this.username = username;
+ this.password = password;
+ }
+
+ @Override
+ public String getPassword(String username) {
+ return password;
+ }
+}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java Wed Nov 21 19:39:38 2012
@@ -22,15 +22,19 @@
package org.apache.airavata.xbaya.registry;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.jcr.RepositoryException;
import javax.xml.namespace.QName;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.workflow.model.component.ComponentException;
import org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
import org.apache.airavata.workflow.model.graph.GraphException;
@@ -64,9 +68,9 @@ public class RegistryAccesser {
this.engine = engine;
}
- private AiravataRegistry2 connectToRegistry() {
+ private AiravataAPI connectToRegistry() {
JCRComponentRegistry jcrComponentRegistry = this.engine.getConfiguration().getJcrComponentRegistry();
- return jcrComponentRegistry.getRegistry();
+ return jcrComponentRegistry.getAiravataAPI();
}
/**
@@ -74,9 +78,14 @@ public class RegistryAccesser {
* @return
* @throws RepositoryException
*/
- public Map<String, String> getOGCEWorkflowTemplateList() throws RegistryException {
- AiravataRegistry2 registry = connectToRegistry();
- return registry.getWorkflows();
+ public Map<String, String> getOGCEWorkflowTemplateList() throws AiravataAPIInvocationException {
+ AiravataAPI airavataAPI = connectToRegistry();
+ List<Workflow> workflows = airavataAPI.getWorkflowManager().getWorkflows();
+ Map<String, String> workflowMap = new HashMap<String, String>();
+ for(Workflow workflow : workflows){
+ workflowMap.put(workflow.getName(), airavataAPI.getWorkflowManager().getWorkflowAsString(workflow.getName()));
+ }
+ return workflowMap;
}
/**
@@ -90,8 +99,8 @@ public class RegistryAccesser {
*/
public Workflow getOGCEWorkflow(QName workflowTemplateId) throws RepositoryException, GraphException,
ComponentException, Exception {
- AiravataRegistry2 registry = connectToRegistry();
- String xml = registry.getWorkflowGraphXML(workflowTemplateId.getLocalPart());
+ AiravataAPI registry = connectToRegistry();
+ String xml = registry.getWorkflowManager().getWorkflowAsString(workflowTemplateId.getLocalPart());
XmlElement xwf = XMLUtil.stringToXmlElement(xml);
Workflow workflow = new Workflow(xwf);
return workflow;
@@ -132,15 +141,15 @@ public class RegistryAccesser {
String workflowAsString = XMLUtil.xmlElementToString(workflow.toXML());
String owner = this.engine.getConfiguration().getRegistryUserName();
- AiravataRegistry2 registry = this.connectToRegistry();
- if (registry.isWorkflowExists(workflow.getName())){
- registry.updateWorkflow(workflow.getName(), workflowAsString);
+ AiravataAPI registry = this.connectToRegistry();
+ if (registry.getWorkflowManager().isWorkflowExists(workflow.getName())){
+ registry.getWorkflowManager().updateWorkflow(workflow.getName(), workflowAsString);
}else{
- registry.addWorkflow(workflow.getName(), workflowAsString);
+ registry.getWorkflowManager().saveWorkflow(workflowAsString);
}
if (registryPublishingWindow.isMakePublic()){
- registry.publishWorkflow(workflow.getName());
+ registry.getWorkflowManager().publishWorkflow(workflow.getName());
}
registryPublishingWindow.hide();
return true;
@@ -156,10 +165,10 @@ public class RegistryAccesser {
* @param workflowTemplateId
* @throws RepositoryException
*/
- public void deleteOGCEWorkflow(QName workflowTemplateId) throws RegistryException {
+ public void deleteOGCEWorkflow(QName workflowTemplateId) throws AiravataAPIInvocationException {
if (XBayaUtil.acquireJCRRegistry(this.engine)) {
- AiravataRegistry2 registry = connectToRegistry();
- registry.removeWorkflow(workflowTemplateId.getLocalPart());
+ AiravataAPI registry = connectToRegistry();
+ registry.getWorkflowManager().removeWorkflow(workflowTemplateId.getLocalPart());
}
}
@@ -168,9 +177,9 @@ public class RegistryAccesser {
* @param qname
* @return
*/
- public Workflow getWorkflow(QName qname) throws RegistryException {
- AiravataRegistry2 registry = connectToRegistry();
- String xml = registry.getWorkflowGraphXML(qname.getLocalPart());
+ public Workflow getWorkflow(QName qname) throws AiravataAPIInvocationException {
+ AiravataAPI registry = connectToRegistry();
+ String xml = registry.getWorkflowManager().getWorkflowAsString(qname.getLocalPart());
Workflow workflow = null;
try {
XmlElement xwf = XMLUtil.stringToXmlElement(xml);
@@ -189,7 +198,7 @@ public class RegistryAccesser {
* @return
* @throws RegistryException
*/
- public Workflow getWorkflow(String name) throws RegistryException {
+ public Workflow getWorkflow(String name) throws AiravataAPIInvocationException {
return getWorkflow(new QName(XBayaConstants.LEAD_NS, name));
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/AbstractAiravataTreeNode.java Wed Nov 21 19:39:38 2012
@@ -37,7 +37,8 @@ import javax.swing.tree.DefaultTreeModel
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
@@ -192,7 +193,7 @@ public abstract class AbstractAiravataTr
return rootNode;
}
- public AiravataRegistry2 getRegistry() {
+ public AiravataAPI getRegistry() {
TreeNode rootNode = getRootNode();
if (rootNode instanceof RegistryNode) {
return ((RegistryNode) rootNode).getRegistry();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java Wed Nov 21 19:39:38 2012
@@ -28,6 +28,7 @@ import javax.swing.Icon;
import javax.swing.JTree;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptionWrap;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
@@ -96,11 +97,11 @@ public class ApplicationDeploymentDescri
return true;
}
- private boolean deleteApplicationDescription(JTree tree) throws RegistryException {
+ private boolean deleteApplicationDescription(JTree tree) throws AiravataAPIInvocationException {
if (askQuestion("Application description",
"Are you sure that you want to remove the application description \""
+ getApplicationDeploymentDescriptionWrap().getDescription().getType().getApplicationName().getStringValue() + "\"?")) {
- getRegistry().removeApplicationDescriptor(getApplicationDeploymentDescriptionWrap().getService(),
+ getRegistry().getApplicationManager().deleteDeploymentDescription(getApplicationDeploymentDescriptionWrap().getService(),
getApplicationDeploymentDescriptionWrap().getHost(),
getApplicationDeploymentDescriptionWrap().getDescription().getType().getApplicationName().getStringValue());
((AbstractAiravataTreeNode) getParent()).refresh();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionsNode.java Wed Nov 21 19:39:38 2012
@@ -28,8 +28,10 @@ import javax.swing.Icon;
import javax.swing.JTree;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//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;
@@ -51,6 +53,9 @@ public class ApplicationDeploymentDescri
protected List<TreeNode> getChildren() {
try {
return getTreeNodeList(getApplicationDeploymentDescriptions().getDescriptions().toArray(), this);
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
+ return emptyList();
} catch (RegistryException e) {
e.printStackTrace();
return emptyList();
@@ -99,11 +104,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?")) {
- AiravataRegistry2 registry = getRegistry();
+ AiravataAPI airavataAPI = getRegistry();
List<ApplicationDeploymentDescriptionWrap> descriptions = getApplicationDeploymentDescriptions()
.getDescriptions();
for (ApplicationDeploymentDescriptionWrap descriptionWrap : descriptions) {
- registry.removeApplicationDescriptor(descriptionWrap.getService(), descriptionWrap.getHost(),
+ airavataAPI.getApplicationManager().removeApplicationDescriptor(descriptionWrap.getService(), descriptionWrap.getHost(),
descriptionWrap.getDescription().getType().getApplicationName().getStringValue());
}
refresh();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/EventingServiceURLsNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/EventingServiceURLsNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/EventingServiceURLsNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/EventingServiceURLsNode.java Wed Nov 21 19:39:38 2012
@@ -27,6 +27,7 @@ import java.util.List;
import javax.swing.Icon;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.xbaya.model.registrybrowser.EventingServiceURLs;
import org.apache.airavata.xbaya.model.registrybrowser.InterpreterServiceURLs;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
@@ -42,7 +43,12 @@ public class EventingServiceURLsNode ext
@Override
protected List<TreeNode> getChildren() {
- return getTreeNodeList(getEventingServiceURLs().getURLS().toArray(), this);
+ try {
+ return getTreeNodeList(getEventingServiceURLs().getURLS().toArray(), this);
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
+ }
+ return null;
}
@Override
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/GFacURLsNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/GFacURLsNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/GFacURLsNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/GFacURLsNode.java Wed Nov 21 19:39:38 2012
@@ -27,6 +27,7 @@ import java.util.List;
import javax.swing.Icon;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.xbaya.model.registrybrowser.GFacURLs;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
@@ -41,7 +42,12 @@ public class GFacURLsNode extends Abstra
@Override
protected List<TreeNode> getChildren() {
- return getTreeNodeList(getGfacURLs().getURLS().toArray(), this);
+ try {
+ return getTreeNodeList(getGfacURLs().getURLS().toArray(), this);
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
+ }
+ return null;
}
@Override
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java Wed Nov 21 19:39:38 2012
@@ -28,6 +28,7 @@ import javax.swing.Icon;
import javax.swing.JTree;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
@@ -86,7 +87,7 @@ public class HostDescriptionNode extends
}
private boolean editHostDescription(JTree tree) {
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine().getConfiguration().getJcrComponentRegistry().getRegistry(),false,getHostDescription(), null);
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine().getConfiguration().getJcrComponentRegistry().getAiravataAPI(),false,getHostDescription(), null);
hostDescriptionDialog.open();
if (hostDescriptionDialog.isHostCreated()) {
refresh();
@@ -95,10 +96,10 @@ public class HostDescriptionNode extends
return true;
}
- private boolean deleteHostDescription(JTree tree) throws RegistryException {
+ private boolean deleteHostDescription(JTree tree) throws AiravataAPIInvocationException {
if (askQuestion("Host description", "Are you sure that you want to remove the host description \""
+ getHostDescription().getType().getHostName() + "\"?")) {
- getRegistry().removeHostDescriptor(getHostDescription().getType().getHostName());
+ getRegistry().getApplicationManager().deleteHostDescription(getHostDescription().getType().getHostName());
((AbstractAiravataTreeNode) getParent()).refresh();
reloadTreeNode(tree, getParent());
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java Wed Nov 21 19:39:38 2012
@@ -28,9 +28,11 @@ import javax.swing.Icon;
import javax.swing.JTree;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//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;
@@ -50,7 +52,7 @@ public class HostDescriptionsNode extend
protected List<TreeNode> getChildren() {
try {
return getTreeNodeList(getHostDescriptions().getDescriptions().toArray(), this);
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
e.printStackTrace();
return emptyList();
}
@@ -84,7 +86,7 @@ public class HostDescriptionsNode extend
deleteHostDescription(tree);
return true;
} else if (action.equals(AddAction.ID)) {
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine().getConfiguration().getJcrComponentRegistry().getRegistry(), null);
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine().getConfiguration().getJcrComponentRegistry().getAiravataAPI(), null);
hostDescriptionDialog.open();
if (hostDescriptionDialog.isHostCreated()) {
refresh();
@@ -98,10 +100,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?")) {
- AiravataRegistry2 registry = getRegistry();
+ AiravataAPI registry = getRegistry();
List<HostDescription> descriptions = getHostDescriptions().getDescriptions();
for (HostDescription descriptionWrap : descriptions) {
- registry.removeHostDescriptor(descriptionWrap.getType().getHostName());
+ registry.getApplicationManager().removeHostDescriptor(descriptionWrap.getType().getHostName());
}
refresh();
reloadTreeNode(tree, this);
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/InterpreterServiceURLsNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/InterpreterServiceURLsNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/InterpreterServiceURLsNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/InterpreterServiceURLsNode.java Wed Nov 21 19:39:38 2012
@@ -27,6 +27,7 @@ import java.util.List;
import javax.swing.Icon;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.xbaya.model.registrybrowser.InterpreterServiceURLs;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
@@ -41,7 +42,12 @@ public class InterpreterServiceURLsNode
@Override
protected List<TreeNode> getChildren() {
- return getTreeNodeList(getInterpreterServiceURLs().getURLS().toArray(), this);
+ try {
+ return getTreeNodeList(getInterpreterServiceURLs().getURLS().toArray(), this);
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
+ }
+ return null;
}
@Override
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/MessageBoxURLsNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/MessageBoxURLsNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/MessageBoxURLsNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/MessageBoxURLsNode.java Wed Nov 21 19:39:38 2012
@@ -27,6 +27,7 @@ import java.util.List;
import javax.swing.Icon;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.xbaya.model.registrybrowser.MessageBoxURLs;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
@@ -41,7 +42,12 @@ public class MessageBoxURLsNode extends
@Override
protected List<TreeNode> getChildren() {
- return getTreeNodeList(getMessageBoxURLs().getURLS().toArray(), this);
+ try {
+ return getTreeNodeList(getMessageBoxURLs().getURLS().toArray(), this);
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
+ }
+ return null;
}
@Override
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java Wed Nov 21 19:39:38 2012
@@ -28,7 +28,9 @@ import java.util.List;
import javax.swing.Icon;
import javax.swing.tree.TreeNode;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
+//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.HostDescriptions;
@@ -39,12 +41,12 @@ import org.apache.airavata.xbaya.ui.acti
import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
public class RegistryNode extends AbstractAiravataTreeNode {
- private AiravataRegistry2 registry;
+ private AiravataAPI registry;
private XBayaEngine engine;
public RegistryNode(XBayaEngine engine, TreeNode parent) {
super(parent);
- setRegistry(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
+ setRegistry(engine.getConfiguration().getJcrComponentRegistry().getAiravataAPI());
this.engine=engine;
}
@@ -66,17 +68,22 @@ public class RegistryNode extends Abstra
return getTreeNodeList(children.toArray(), this);
}
- public AiravataRegistry2 getRegistry() {
+ public AiravataAPI getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry2 registry) {
+ public void setRegistry(AiravataAPI registry) {
this.registry = registry;
}
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return getRegistry().getGateway().getGatewayName() + " - " + getRegistry().getUser().getUserName();
+ try {
+ return getRegistry().getAiravataManager().getGateway().getGatewayName() + " - " + getRegistry().getAiravataManager().getUser().getUserName();
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
+ }
+ return null;
}
@Override
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java Wed Nov 21 19:39:38 2012
@@ -29,6 +29,7 @@ import javax.swing.Icon;
import javax.swing.JTree;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptions;
@@ -104,10 +105,10 @@ public class ServiceDescriptionNode exte
return true;
}
- private boolean deleteServiceDescription(JTree tree) throws RegistryException {
+ private boolean deleteServiceDescription(JTree tree) throws AiravataAPIInvocationException {
if (askQuestion("Application", "Are you sure that you want to remove the applications associated with \""
+ getServiceDescription().getType().getName() + "\"?")) {
- getRegistry().removeServiceDescriptor(getServiceDescription().getType().getName());
+ getRegistry().getApplicationManager().deleteServiceDescription(getServiceDescription().getType().getName());
((AbstractAiravataTreeNode) getParent()).refresh();
reloadTreeNode(tree, getParent());
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java Wed Nov 21 19:39:38 2012
@@ -28,9 +28,11 @@ import javax.swing.Icon;
import javax.swing.JTree;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//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;
@@ -50,6 +52,9 @@ public class ServiceDescriptionsNode ext
protected List<TreeNode> getChildren() {
try {
return getTreeNodeList(getServiceDescriptions().getDescriptions().toArray(), this);
+ } catch (AiravataAPIInvocationException e) {
+ e.printStackTrace();
+ return emptyList();
} catch (RegistryException e) {
e.printStackTrace();
return emptyList();
@@ -100,10 +105,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?")) {
- AiravataRegistry2 registry = getRegistry();
+ AiravataAPI registry = getRegistry();
List<ServiceDescription> descriptions = getServiceDescriptions().getDescriptions();
for (ServiceDescription descriptionWrap : descriptions) {
- registry.removeServiceDescriptor(descriptionWrap.getType().getName());
+ registry.getApplicationManager().deleteServiceDescription(descriptionWrap.getType().getName());
}
refresh();
reloadTreeNode(tree, this);
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java Wed Nov 21 19:39:38 2012
@@ -28,6 +28,7 @@ import javax.swing.Icon;
import javax.swing.JTree;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus;
import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowExperiment;
@@ -51,8 +52,8 @@ public class XBayaWorkflowExperimentNode
public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
if (workflowExecutionName==null) {
try {
- workflowExecutionName = getRegistry().getExperimentName(getExperiment().getExperimentId());
- } catch (RegistryException e) {
+ workflowExecutionName = getRegistry().getProvenanceManager().getExperimentName(getExperiment().getExperimentId()).getInstanceName();
+ } catch (AiravataAPIInvocationException e) {
e.printStackTrace();
}
if (workflowExecutionName==null){
@@ -61,14 +62,14 @@ public class XBayaWorkflowExperimentNode
}
String caption=workflowExecutionName;
try {
- WorkflowInstanceStatus workflowExecutionStatus = getRegistry().getWorkflowInstanceStatus(getExperiment().getExperimentId());
+ WorkflowInstanceStatus workflowExecutionStatus = getRegistry().getProvenanceManager().getWorkflowInstanceStatus(getExperiment().getExperimentId(), getExperiment().getExperimentId());
if (workflowExecutionStatus!=null && workflowExecutionStatus.getExecutionStatus()!=null){
caption += " - <i>" + workflowExecutionStatus.getExecutionStatus().toString()+"</i>";
if (workflowExecutionStatus.getStatusUpdateTime()!=null) {
caption += "<i> as of " + workflowExecutionStatus.getStatusUpdateTime().toString() + "</i>";
}
}
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
e.printStackTrace();
}
return wrapAsHtml(caption);
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java Wed Nov 21 19:39:38 2012
@@ -29,6 +29,7 @@ import javax.swing.Icon;
import javax.swing.JTree;
import javax.swing.tree.TreeNode;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.registry.api.exception.ServiceDescriptionRetrieveException;
import org.apache.airavata.workflow.model.wf.Workflow;
@@ -93,10 +94,10 @@ public class XBayaWorkflowTemplateNode e
if (askQuestion("XBaya Workflow", "Are you sure that you want to remove the workflow \""
+ getXbayaWorkflow().getWorkflowName() + "\"?")) {
try {
- getRegistry().removeWorkflow(getXbayaWorkflow().getWorkflowName());
+ getRegistry().getWorkflowManager().removeWorkflow(getXbayaWorkflow().getWorkflowName());
((AbstractAiravataTreeNode) getParent()).refresh();
reloadTreeNode(tree, getParent());
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
e.printStackTrace();
}
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/XBayaGUI.java Wed Nov 21 19:39:38 2012
@@ -48,6 +48,7 @@ import javax.swing.WindowConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.common.utils.XMLUtil;
@@ -831,11 +832,11 @@ public class XBayaGUI implements EventLi
this.newGraphCanvas(true, false);
JCRComponentRegistry jcrComponentRegistry = this.engine.getConfiguration().getJcrComponentRegistry();
try {
- String xml = jcrComponentRegistry.getRegistry().getWorkflowGraphXML(this.engine.getConfiguration().getWorkflow());
+ String xml = jcrComponentRegistry.getAiravataAPI().getWorkflowManager().getWorkflowAsString(this.engine.getConfiguration().getWorkflow());
XmlElement xwf = XMLUtil.stringToXmlElement(xml);
Workflow workflow = new Workflow(xwf);
setWorkflow(workflow);
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
getErrorWindow().error(ErrorMessages.REPOSITORY_CONFIGURATION_IS_WRONG_FAILED_TO_LOAD_THE_WORKFLOW, e);
} catch (GraphException e) {
getErrorWindow().error(ErrorMessages.WORKFLOW_IS_WRONG, e);
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java Wed Nov 21 19:39:38 2012
@@ -42,9 +42,10 @@ import javax.swing.event.TableModelEvent
import javax.swing.event.TableModelListener;
import javax.swing.table.DefaultTableModel;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.NameValuePairType;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
@@ -64,7 +65,7 @@ public class ApplicationDescriptionAdvan
private boolean tableModelChanging = false;
private JButton btnDeleteVariable;
private JButton okButton;
- private AiravataRegistry2 registry;
+ private AiravataAPI registry;
private XBayaTextField txtWorkingDir;
/**
@@ -84,7 +85,7 @@ public class ApplicationDescriptionAdvan
/**
* Create the dialog.
*/
- public ApplicationDescriptionAdvancedOptionDialog(AiravataRegistry2 registry, ApplicationDeploymentDescription descriptor) {
+ public ApplicationDescriptionAdvancedOptionDialog(AiravataAPI registry, ApplicationDeploymentDescription descriptor) {
addWindowListener(new WindowAdapter() {
@Override
public void windowOpened(WindowEvent arg0) {
@@ -345,11 +346,11 @@ public class ApplicationDescriptionAdvan
- public AiravataRegistry2 getRegistry() {
+ public AiravataAPI getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry2 registry) {
+ public void setRegistry(AiravataAPI registry) {
this.registry = registry;
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java Wed Nov 21 19:39:38 2012
@@ -48,12 +48,14 @@ import javax.swing.JTextField;
import javax.swing.ProgressMonitor;
import javax.swing.SwingConstants;
+import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.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.AiravataRegistry2;
import org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.GlobusHostType;
@@ -75,7 +77,7 @@ public class ApplicationDescriptionDialo
private XBayaTextField txtAppName;
private XBayaTextField txtTempDir;
- private AiravataRegistry2 registry;
+ private AiravataAPI registry;
private ApplicationDeploymentDescription shellApplicationDescription;
private JLabel lblError;
private boolean applcationDescCreated = false;
@@ -119,7 +121,7 @@ public class ApplicationDescriptionDialo
setOriginalDeploymentDescription(originalDeploymentDescription);
setOriginalHost(originalHost);
setOriginalService(originalService);
- setRegistry(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
+ setRegistry(engine.getConfiguration().getJcrComponentRegistry().getAiravataAPI());
addWindowListener(new WindowAdapter() {
@Override
public void windowOpened(WindowEvent arg0) {
@@ -129,7 +131,7 @@ public class ApplicationDescriptionDialo
String defaultName = baseName + i;
try {
ApplicationDeploymentDescription applicationDeploymentDescription = getRegistry()
- .getApplicationDescriptors(getServiceName(),
+ .getApplicationManager().getDeploymentDescription(getServiceName(),
getHostName());
while (true) {
boolean notFound = true;
@@ -156,12 +158,12 @@ public class ApplicationDescriptionDialo
iniGUI();
if (originalService!=null){
try {
- ServiceDescription disc = getRegistry().getServiceDescriptor(originalService);
+ ServiceDescription disc = getRegistry().getApplicationManager().getServiceDescription(originalService);
if(disc!=null){
setServiceDescription(disc);
}
- throw new RegistryException(new Exception("Service Description not found in registry."));
- } catch (RegistryException e) {
+ throw new AiravataAPIInvocationException(new Exception("Service Description not found in registry."));
+ } catch (AiravataAPIInvocationException e) {
e.printStackTrace();
}
}
@@ -354,7 +356,7 @@ public class ApplicationDescriptionDialo
lnkNewHost.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
try {
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry(), null);
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getAiravataAPI(), null);
hostDescriptionDialog.setLocationRelativeTo(getContentPane());
hostDescriptionDialog.open();
@@ -519,7 +521,7 @@ public class ApplicationDescriptionDialo
cmbHostName.removeAllItems();
setHostName(null);
try {
- List<HostDescription> hostDescriptions = getRegistry().getHostDescriptors();
+ List<HostDescription> hostDescriptions = getRegistry().getApplicationManager().getAllHostDescriptions();
for (HostDescription hostDescription : hostDescriptions) {
if (hostDescription.getType().getHostName() == null) {
cmbHostName.addItem(hostDescription.getType().getHostName());
@@ -605,21 +607,21 @@ public class ApplicationDescriptionDialo
public void saveApplicationDescription() {
try {
try {
- getRegistry().addApplicationDescriptor(getServiceName(), getHostName(), getShellApplicationDescription());
- } catch (DescriptorAlreadyExistsException e) {
- getRegistry().updateApplicationDescriptor(getServiceName(), getHostName(), getShellApplicationDescription());
+ getRegistry().getApplicationManager().saveDeploymentDescription(getServiceName(), getHostName(), getShellApplicationDescription());
+ } catch (AiravataAPIInvocationException e) {
+ getRegistry().getApplicationManager().updateApplicationDescriptor(getServiceName(), getHostName(), getShellApplicationDescription());
}
if (!isNewDescritor() && (!getServiceName().equals(getOriginalService()) || !getHostName().equals(getOriginalHost()))) {
try {
- getRegistry().removeApplicationDescriptor(getOriginalService(),
+ getRegistry().getApplicationManager().deleteDeploymentDescription(getOriginalService(),
getOriginalHost(),getOriginalDeploymentDescription().getType()
.getApplicationName().getStringValue());
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
engine.getGUI().getErrorWindow().error(e);
}
}
setApplicationDescCreated(true);
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
engine.getGUI().getErrorWindow().error(e);
}
}
@@ -658,9 +660,9 @@ public class ApplicationDescriptionDialo
ApplicationDeploymentDescription deploymentDescriptions = null;
try {
- deploymentDescriptions = getRegistry().getApplicationDescriptor(getServiceName(), getHostName(),
+ deploymentDescriptions = getRegistry().getApplicationManager().getApplicationDescriptor(getServiceName(), getHostName(),
getApplicationName());
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
throw e;
}
if (deploymentDescriptions!=null && (isNewDescritor() || (!getServiceName().equals(getOriginalService()) || !getHostName().equals(getOriginalHost())))) {
@@ -703,7 +705,7 @@ public class ApplicationDescriptionDialo
if (hostName!=null) {
HostDescription hostDescription;
try {
- hostDescription = registry.getHostDescriptor(hostName);
+ hostDescription = registry.getApplicationManager().getHostDescription(hostName);
if (hostDescription.getType() instanceof GlobusHostType) {
getShellApplicationDescription().getType().changeType(
GramApplicationDeploymentType.type);
@@ -717,7 +719,7 @@ public class ApplicationDescriptionDialo
btnExecBrowse.setVisible(isLocal);
btnTmpDirBrowse.setVisible(isLocal);
- } catch (RegistryException e) {
+ } catch (AiravataAPIInvocationException e) {
//not there - ouch
}
}
@@ -761,11 +763,11 @@ public class ApplicationDescriptionDialo
}
}
- public AiravataRegistry2 getRegistry() {
+ public AiravataAPI getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry2 registry) {
+ public void setRegistry(AiravataAPI registry) {
this.registry = registry;
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java?rev=1412246&r1=1412245&r2=1412246&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java Wed Nov 21 19:39:38 2012
@@ -21,9 +21,10 @@
package org.apache.airavata.xbaya.ui.dialogs.descriptors;
+import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.registry.api.AiravataRegistry2;
+//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
import org.apache.airavata.schemas.gfac.JobTypeType;
import org.apache.airavata.schemas.gfac.JobTypeType.Enum;
@@ -55,7 +56,7 @@ public class ApplicationDescriptionHostA
private XBayaTextField txtNodeCount = new XBayaTextField();
private XBayaTextField txtProcessorsPerNode = new XBayaTextField();
private JButton okButton;
- private AiravataRegistry2 registry;
+ private AiravataAPI registry;
private ApplicationDeploymentDescription descriptor;
private XBayaLabel lblCpuCount;
private XBayaLabel lblProcessorPerNode;
@@ -64,7 +65,7 @@ public class ApplicationDescriptionHostA
/**
* Create the dialog.
*/
- public ApplicationDescriptionHostAdvancedOptionDialog(AiravataRegistry2 registry, ApplicationDeploymentDescription descriptor) {
+ public ApplicationDescriptionHostAdvancedOptionDialog(AiravataAPI registry, ApplicationDeploymentDescription descriptor) {
addWindowListener(new WindowAdapter() {
@Override
public void windowOpened(WindowEvent arg0) {
@@ -322,11 +323,11 @@ public class ApplicationDescriptionHostA
txtQueueType.setText(queueName.getQueueName()==null?"":queueName.getQueueName());
}
- public AiravataRegistry2 getRegistry() {
+ public AiravataAPI getRegistry() {
return registry;
}
- public void setRegistry(AiravataRegistry2 registry) {
+ public void setRegistry(AiravataAPI registry) {
this.registry = registry;
}