Author: chathuri
Date: Mon Nov 19 22:31:01 2012
New Revision: 1411462
URL: http://svn.apache.org/viewvc?rev=1411462&view=rev
Log:
adding all client methods to a single class
Added:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1411462&r1=1411461&r2=1411462&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
Mon Nov 19 22:31:01 2012
@@ -236,7 +236,7 @@ public class AiravataClient implements A
if (clientConfiguration.getJcrURL() != null
&& clientConfiguration.getGfacURL() == null) {
try {
-
clientConfiguration.setGfacURL(getConfigurationResourceClient().getGFacURIs()
+
clientConfiguration.setGfacURL(getRegistryClient().getGFacURIs()
.get(0).toURL());
configuration.put(GFAC,
clientConfiguration.getGfacURL()
.toString());
@@ -411,15 +411,15 @@ public class AiravataClient implements A
private void runPreWorkflowExecutionTasks(String topic, String user,
String metadata, String experimentName) throws
RegistryException {
if (user != null) {
-
getProvenanceResouceClient().updateExperimentExecutionUser(topic, user);
+
getRegistryClient().updateExperimentExecutionUser(topic, user);
}
if (metadata != null) {
-
getProvenanceResouceClient().updateExperimentMetadata(topic, metadata);
+ getRegistryClient().updateExperimentMetadata(topic, metadata);
}
if (experimentName == null) {
experimentName = topic;
}
- getProvenanceResouceClient().updateExperimentName(topic,
experimentName);
+ getRegistryClient().updateExperimentName(topic, experimentName);
}
public String runWorkflow(String topic, NameValue[] inputs)
@@ -468,15 +468,17 @@ public class AiravataClient implements A
}).start();
int timeout = 0;
try {
- while
(!getExperimentResourceClient().isExperimentExists(topic)
+ while
(!getRegistryClient().isExperimentExists(topic)
&& timeout < MAX_TIMEOUT) {
Thread.sleep(TIMEOUT_STEP);
timeout += MAX_TIMEOUT;
}
} catch (InterruptedException e) {
throw new AiravataAPIInvocationException(e);
- }
- } else {
+ } catch (RegistryException e) {
+ throw new AiravataAPIInvocationException(e);
+ }
+ } else {
launchWorkflow(topic, inputs, builder);
}
return topic;
@@ -484,12 +486,12 @@ public class AiravataClient implements A
public List<ExperimentData> getWorkflowExecutionDataByUser(String user)
throws RegistryException {
- return getProvenanceResouceClient().getExperimentByUser(user);
+ return getRegistryClient().getExperimentByUser(user);
}
public ExperimentData getWorkflowExecutionData(String topic)
throws RegistryException {
- return getProvenanceResouceClient().getExperiment(topic);
+ return getRegistryClient().getExperiment(topic);
}
public List<ExperimentData> getWorkflowExecutionData(String user,
@@ -506,45 +508,11 @@ public class AiravataClient implements A
AiravataClient.workflow = workflow;
}
- public ConfigurationResourceClient getConfigurationResourceClient (){
- ConfigurationResourceClient configurationResourceClient = new
ConfigurationResourceClient(getCurrentUser(), getCallBack());
- return configurationResourceClient;
- }
-
- public DescriptorResourceClient getDescriptorResourceClient (){
- DescriptorResourceClient descriptorResourceClient = new
DescriptorResourceClient(getCurrentUser(), getCallBack());
- return descriptorResourceClient;
- }
-
- public ExperimentResourceClient getExperimentResourceClient (){
- ExperimentResourceClient experimentResourceClient = new
ExperimentResourceClient(getCurrentUser(), getCallBack());
- return experimentResourceClient;
- }
-
- public ProvenanceResourceClient getProvenanceResouceClient (){
- ProvenanceResourceClient provenanceResourceClient = new
ProvenanceResourceClient(getCurrentUser(), getCallBack());
- return provenanceResourceClient;
+ public RegistryClient getRegistryClient(){
+ RegistryClient registryClient = new RegistryClient(getCurrentUser(),
getCallBack());
+ return registryClient;
}
- public ProjectResourceClient getProjectResourceClient (){
- ProjectResourceClient projectResourceClient = new
ProjectResourceClient(getCurrentUser(), getCallBack());
- return projectResourceClient;
- }
-
- public PublishedWorkflowResourceClient getPublishedWFResourceClient (){
- PublishedWorkflowResourceClient publishedWorkflowResourceClient = new
PublishedWorkflowResourceClient(getCurrentUser(), getCallBack());
- return publishedWorkflowResourceClient;
- }
-
- public UserWorkflowResourceClient getUserWFResourceClient () {
- UserWorkflowResourceClient userWorkflowResourceClient = new
UserWorkflowResourceClient(getCurrentUser(), getCallBack());
- return userWorkflowResourceClient;
- }
-
- public BasicRegistryResourceClient getBasicResourceClient (){
- BasicRegistryResourceClient basicRegistryResourceClient = new
BasicRegistryResourceClient(getCurrentUser(), getCallBack());
- return basicRegistryResourceClient;
- }
// public AiravataRegistry2 getRegistry() throws RegistryException {
// if (registry == null) {
@@ -612,7 +580,7 @@ public class AiravataClient implements A
List<String> workflowList = new ArrayList<String>();
Map<String, String> workflows;
try {
- workflows = getUserWFResourceClient().getWorkflows();
+ workflows = getRegistryClient().getWorkflows();
for (String name : workflows.keySet()) {
workflowList.add(name);
}
@@ -625,7 +593,7 @@ public class AiravataClient implements A
public String runWorkflow(String workflowTemplateId,
List<WorkflowInput> inputs) throws Exception {
- return runWorkflow(workflowTemplateId, inputs,
getBasicResourceClient().getUser()
+ return runWorkflow(workflowTemplateId, inputs,
getRegistryClient().getUser()
.getUserName(), null, workflowTemplateId + "_"
+ Calendar.getInstance().getTime().toString());
}
@@ -633,7 +601,7 @@ public class AiravataClient implements A
public String runWorkflow(String workflowTemplateId,
List<WorkflowInput> inputs, String workflowInstanceName)
throws Exception {
- return runWorkflow(workflowTemplateId, inputs,
getBasicResourceClient().getUser()
+ return runWorkflow(workflowTemplateId, inputs,
getRegistryClient().getUser()
.getUserName(), null, workflowInstanceName);
}
@@ -695,7 +663,7 @@ public class AiravataClient implements A
}
workflow = workflowString;
String topic = workflowObj.getName() + "_" +
UUID.randomUUID();
-
getProvenanceResouceClient().setWorkflowInstanceTemplateName(topic,
+ getRegistryClient().setWorkflowInstanceTemplateName(topic,
workflowObj.getName());
return runWorkflow(topic, inputValues.toArray(new
NameValue[] {}),
user, metadata, workflowInstanceName,
builder);
@@ -739,7 +707,7 @@ public class AiravataClient implements A
if (experimentID == null || experimentID.isEmpty()) {
experimentID = workflowObj.getName() + "_" +
UUID.randomUUID();
}
-
getProvenanceResouceClient().setWorkflowInstanceTemplateName(experimentID,
+ getRegistryClient().setWorkflowInstanceTemplateName(experimentID,
workflowObj.getName());
return runWorkflow(experimentID,
inputValues.toArray(new NameValue[]
{}), user, metadata,
@@ -784,7 +752,7 @@ public class AiravataClient implements A
public String getWorkflowAsString(String workflowTemplateId)
throws AiravataAPIInvocationException {
try {
- Map<String, String> workflows =
getUserWFResourceClient().getWorkflows();
+ Map<String, String> workflows =
getRegistryClient().getWorkflows();
for (String name : workflows.keySet()) {
if (name.equals(workflowTemplateId)) {
return workflows.get(name);
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java?rev=1411462&r1=1411461&r2=1411462&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
Mon Nov 19 22:31:01 2012
@@ -42,7 +42,7 @@ public class AiravataManagerImpl impleme
public List<URI> getGFaCURLs() throws AiravataAPIInvocationException{
List<URI> list=new ArrayList<URI>();
try {
- List<URI> gFacDescriptorList =
getClient().getConfigurationResourceClient().getGFacURIs();
+ List<URI> gFacDescriptorList =
getClient().getRegistryClient().getGFacURIs();
for (URI url : gFacDescriptorList) {
list.add(url);
}
@@ -72,7 +72,7 @@ public class AiravataManagerImpl impleme
@Override
public List<URI> getWorkflowInterpreterServiceURLs() throws
AiravataAPIInvocationException{
try {
- return
getClient().getConfigurationResourceClient().getWorkflowInterpreterURIs();
+ return
getClient().getRegistryClient().getWorkflowInterpreterURIs();
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -113,7 +113,7 @@ public class AiravataManagerImpl impleme
public List<URI> getMessageBoxServiceURLs()
throws AiravataAPIInvocationException {
try {
- return new
ArrayList<URI>(){{add(getClient().getConfigurationResourceClient().getMsgBoxURI());}};
+ return new
ArrayList<URI>(){{add(getClient().getRegistryClient().getMessageBoxURI());}};
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -142,7 +142,7 @@ public class AiravataManagerImpl impleme
public List<URI> getEventingServiceURLs()
throws AiravataAPIInvocationException {
try {
- return new
ArrayList<URI>(){{add(getClient().getConfigurationResourceClient().getEventingURI());}};
+ return new
ArrayList<URI>(){{add(getClient().getRegistryClient().getEventingServiceURI());}};
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java?rev=1411462&r1=1411461&r2=1411462&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
Mon Nov 19 22:31:01 2012
@@ -46,7 +46,7 @@ public class ApplicationManagerImpl impl
public ServiceDescription getServiceDescription(String serviceId)
throws AiravataAPIInvocationException {
try {
- ServiceDescription desc =
getClient().getDescriptorResourceClient().getServiceDescriptor(serviceId);
+ ServiceDescription desc =
getClient().getRegistryClient().getServiceDescriptor(serviceId);
if(desc!=null){
return desc;
}
@@ -60,7 +60,7 @@ public class ApplicationManagerImpl impl
public List<ServiceDescription> getAllServiceDescriptions()
throws AiravataAPIInvocationException {
try {
- return
getClient().getDescriptorResourceClient().getServiceDescriptors();
+ return
getClient().getRegistryClient().getServiceDescriptors();
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -70,10 +70,10 @@ public class ApplicationManagerImpl impl
public String saveServiceDescription(ServiceDescription service)
throws AiravataAPIInvocationException {
try {
- if
(getClient().getDescriptorResourceClient().isServiceDescriptorExists(service.getType().getName()))
{
-
getClient().getDescriptorResourceClient().updateServiceDescriptor(service);
+ if
(getClient().getRegistryClient().isServiceDescriptorExists(service.getType().getName()))
{
+
getClient().getRegistryClient().updateServiceDescriptor(service);
}else{
-
getClient().getDescriptorResourceClient().addServiceDescriptor(service);
+
getClient().getRegistryClient().addServiceDescriptor(service);
}
return service.getType().getName();
} catch (Exception e) {
@@ -85,7 +85,7 @@ public class ApplicationManagerImpl impl
public void deleteServiceDescription(String serviceId)
throws AiravataAPIInvocationException {
try {
-
getClient().getDescriptorResourceClient().removeServiceDescriptor(serviceId);
+
getClient().getRegistryClient().removeServiceDescriptor(serviceId);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -103,7 +103,7 @@ public class ApplicationManagerImpl impl
String serviceId, String hostId)
throws AiravataAPIInvocationException {
try {
- return
getClient().getDescriptorResourceClient().getApplicationDescriptors(serviceId,
hostId);
+ return
getClient().getRegistryClient().getApplicationDescriptors(serviceId, hostId);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -114,10 +114,10 @@ public class ApplicationManagerImpl impl
ApplicationDeploymentDescription app)
throws AiravataAPIInvocationException {
try {
- if
(getClient().getDescriptorResourceClient().isApplicationDescriptorExists(serviceId,
hostId, app.getType().getApplicationName().getStringValue())) {
-
getClient().getDescriptorResourceClient().updateApplicationDescriptor(serviceId,
hostId, app);
+ if
(getClient().getRegistryClient().isApplicationDescriptorExists(serviceId,
hostId, app.getType().getApplicationName().getStringValue())) {
+
getClient().getRegistryClient().updateApplicationDescriptor(serviceId, hostId,
app);
}else{
-
getClient().getDescriptorResourceClient().addApplicationDescriptor(serviceId,
hostId, app);
+
getClient().getRegistryClient().addApplicationDescriptor(serviceId, hostId,
app);
}
return
app.getType().getApplicationName().getStringValue();
} catch (Exception e) {
@@ -136,7 +136,7 @@ public class ApplicationManagerImpl impl
public Map<String[], ApplicationDeploymentDescription>
getAllDeploymentDescriptions()
throws AiravataAPIInvocationException {
try {
- return
getClient().getDescriptorResourceClient().getApplicationDescriptors();
+ return
getClient().getRegistryClient().getApplicationDescriptors();
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -154,11 +154,11 @@ public class ApplicationManagerImpl impl
String serviceName) throws
AiravataAPIInvocationException {
try {
Map<HostDescription,
List<ApplicationDeploymentDescription>> map=new HashMap<HostDescription,
List<ApplicationDeploymentDescription>>();
- Map<String, ApplicationDeploymentDescription>
applicationDescriptors =
getClient().getDescriptorResourceClient().getApplicationDescriptors(serviceName);
+ Map<String, ApplicationDeploymentDescription>
applicationDescriptors =
getClient().getRegistryClient().getApplicationDescriptors(serviceName);
for (String hostName : applicationDescriptors.keySet())
{
ArrayList<ApplicationDeploymentDescription>
list = new ArrayList<ApplicationDeploymentDescription>();
list.add(applicationDescriptors.get(hostName));
-
map.put(getClient().getDescriptorResourceClient().getHostDescriptor(hostName),list);
+
map.put(getClient().getRegistryClient().getHostDescriptor(hostName),list);
}
return map;
} catch (Exception e) {
@@ -171,7 +171,7 @@ public class ApplicationManagerImpl impl
String hostName, String applicationName)
throws AiravataAPIInvocationException {
try {
-
getClient().getDescriptorResourceClient().removeApplicationDescriptor(serviceName,
hostName, applicationName);
+
getClient().getRegistryClient().removeApplicationDescriptor(serviceName,
hostName, applicationName);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -181,7 +181,7 @@ public class ApplicationManagerImpl impl
public HostDescription getHostDescription(String hostId)
throws AiravataAPIInvocationException {
try {
- return
getClient().getDescriptorResourceClient().getHostDescriptor(hostId);
+ return
getClient().getRegistryClient().getHostDescriptor(hostId);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -191,7 +191,7 @@ public class ApplicationManagerImpl impl
public List<HostDescription> getAllHostDescriptions()
throws AiravataAPIInvocationException {
try {
- return
getClient().getDescriptorResourceClient().getHostDescriptors();
+ return
getClient().getRegistryClient().getHostDescriptors();
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -201,10 +201,10 @@ public class ApplicationManagerImpl impl
public String saveHostDescription(HostDescription host)
throws AiravataAPIInvocationException {
try {
- if
(getClient().getDescriptorResourceClient().isHostDescriptorExists(host.getType().getHostName()))
{
-
getClient().getDescriptorResourceClient().updateHostDescriptor(host);
+ if
(getClient().getRegistryClient().isHostDescriptorExists(host.getType().getHostName()))
{
+
getClient().getRegistryClient().updateHostDescriptor(host);
}else{
-
getClient().getDescriptorResourceClient().addHostDescriptor(host);
+
getClient().getRegistryClient().addHostDescriptor(host);
}
return host.getType().getHostName();
} catch (Exception e) {
@@ -222,7 +222,7 @@ public class ApplicationManagerImpl impl
public void deleteHostDescription(String hostId)
throws AiravataAPIInvocationException {
try {
-
getClient().getDescriptorResourceClient().removeHostDescriptor(hostId);
+
getClient().getRegistryClient().removeHostDescriptor(hostId);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java?rev=1411462&r1=1411461&r2=1411462&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
Mon Nov 19 22:31:01 2012
@@ -53,7 +53,7 @@ public class ProvenanceManagerImpl imple
public void setWorkflowInstanceNodeInput(WorkflowInstanceNode node,
String data)
throws AiravataAPIInvocationException {
try {
-
getClient().getProvenanceResouceClient().updateWorkflowNodeInput(node, data);
+
getClient().getRegistryClient().updateWorkflowNodeInput(node, data);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -70,7 +70,7 @@ public class ProvenanceManagerImpl imple
public void setWorkflowInstanceNodeOutput(WorkflowInstanceNode node,
String data)
throws AiravataAPIInvocationException {
try {
-
getClient().getProvenanceResouceClient().updateWorkflowNodeOutput(node, data);
+
getClient().getRegistryClient().updateWorkflowNodeOutput(node, data);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -87,7 +87,7 @@ public class ProvenanceManagerImpl imple
@Override
public String getWorkflowInstanceNodeInput(WorkflowInstanceNode node)
throws AiravataAPIInvocationException {
try {
- return
getClient().getProvenanceResouceClient().getWorkflowInstanceNodeData(node.getWorkflowInstance().getWorkflowInstanceId(),
node.getNodeId()).getInput();
+ return
getClient().getRegistryClient().getWorkflowInstanceNodeData(node.getWorkflowInstance().getWorkflowInstanceId(),
node.getNodeId()).getInput();
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -102,7 +102,7 @@ public class ProvenanceManagerImpl imple
@Override
public Map<WorkflowInstanceNode,String>
getWorkflowInstanceNodeInput(String workflowName, String nodeId) throws
AiravataAPIInvocationException{
try {
- List<WorkflowNodeIOData> list =
getClient().getProvenanceResouceClient().searchWorkflowInstanceNodeInput(".*",
workflowName, nodeId);
+ List<WorkflowNodeIOData> list =
getClient().getRegistryClient().searchWorkflowInstanceNodeInput(".*",
workflowName, nodeId);
return groupNodePortData(list);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
@@ -120,7 +120,7 @@ public class ProvenanceManagerImpl imple
@Override
public String getWorkflowInstanceNodeOutput(WorkflowInstanceNode node)
throws AiravataAPIInvocationException {
try {
- return
getClient().getProvenanceResouceClient().getWorkflowInstanceNodeData(node.getWorkflowInstance().getWorkflowInstanceId(),
node.getNodeId()).getOutput();
+ return
getClient().getRegistryClient().getWorkflowInstanceNodeData(node.getWorkflowInstance().getWorkflowInstanceId(),
node.getNodeId()).getOutput();
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -136,7 +136,7 @@ public class ProvenanceManagerImpl imple
@Override
public Map<WorkflowInstanceNode,String>
getWorkflowInstanceNodeOutput(String workflowName, String nodeId) throws
AiravataAPIInvocationException{
try {
- List<WorkflowNodeIOData> list =
getClient().getProvenanceResouceClient().searchWorkflowInstanceNodeOutput(".*",
workflowName, nodeId);
+ List<WorkflowNodeIOData> list =
getClient().getRegistryClient().searchWorkflowInstanceNodeOutput(".*",
workflowName, nodeId);
return groupNodePortData(list);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
@@ -153,7 +153,7 @@ public class ProvenanceManagerImpl imple
public void setWorkflowInstanceStatus(WorkflowInstanceStatus status)
throws AiravataAPIInvocationException {
try {
-
getClient().getProvenanceResouceClient().updateWorkflowInstanceStatus(status);
+
getClient().getRegistryClient().updateWorkflowInstanceStatus(status);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -165,7 +165,7 @@ public class ProvenanceManagerImpl imple
String experimentId, String workflowInstanceId)
throws AiravataAPIInvocationException {
try {
- return
getClient().getProvenanceResouceClient().getWorkflowInstanceStatus(experimentId);
+ return
getClient().getRegistryClient().getWorkflowInstanceStatus(experimentId);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -181,7 +181,7 @@ public class ProvenanceManagerImpl imple
@Override
public void setExperimentUser(String experimentId, String user) throws
AiravataAPIInvocationException {
try {
-
getClient().getProvenanceResouceClient().updateExperimentExecutionUser(experimentId,
user);
+
getClient().getRegistryClient().updateExperimentExecutionUser(experimentId,
user);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -196,7 +196,7 @@ public class ProvenanceManagerImpl imple
@Override
public ExperimentUser getExperimentUser(String experimentId)throws
AiravataAPIInvocationException {
try {
- return new
ExperimentUser(experimentId,getClient().getProvenanceResouceClient().getExperimentExecutionUser(experimentId));
+ return new
ExperimentUser(experimentId,getClient().getRegistryClient().getExperimentExecutionUser(experimentId));
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -206,7 +206,7 @@ public class ProvenanceManagerImpl imple
public void setExperimentMetadata(String experimentId, String metadata)
throws AiravataAPIInvocationException {
try {
-
getClient().getProvenanceResouceClient().updateExperimentMetadata(experimentId,
metadata);
+
getClient().getRegistryClient().updateExperimentMetadata(experimentId,
metadata);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -222,7 +222,7 @@ public class ProvenanceManagerImpl imple
@Override
public ExperimentMetadata getExperimentMetadata(String
experimentId)throws AiravataAPIInvocationException {
try {
- return new ExperimentMetadata(experimentId,
getClient().getProvenanceResouceClient().getExperimentMetadata(experimentId));
+ return new ExperimentMetadata(experimentId,
getClient().getRegistryClient().getExperimentMetadata(experimentId));
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -231,7 +231,7 @@ public class ProvenanceManagerImpl imple
@Override
public boolean isExperimentNameExist(String experimentName) throws
AiravataAPIInvocationException {
try {
- return
getClient().getProvenanceResouceClient().isExperimentNameExist(experimentName);
+ return
getClient().getRegistryClient().isExperimentNameExist(experimentName);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -240,7 +240,7 @@ public class ProvenanceManagerImpl imple
@Override
public List<String> getExperimentIdList(String owner) throws
AiravataAPIInvocationException{
try {
- return
getClient().getProvenanceResouceClient().getExperimentIdByUser(owner);
+ return
getClient().getRegistryClient().getExperimentIdByUser(owner);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -261,7 +261,7 @@ public class ProvenanceManagerImpl imple
public List<ExperimentData> getWorkflowExperimentDataList(String user)
throws AiravataAPIInvocationException {
try {
- return
getClient().getProvenanceResouceClient().getExperimentByUser(user);
+ return
getClient().getRegistryClient().getExperimentByUser(user);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -271,7 +271,7 @@ public class ProvenanceManagerImpl imple
public List<ExperimentData> getWorkflowExperimentData(String user,
int pageSize, int pageNo) throws
AiravataAPIInvocationException {
try {
- return
getClient().getProvenanceResouceClient().getExperimentByUser(user, pageSize,
pageNo);
+ return
getClient().getRegistryClient().getExperimentByUser(user, pageSize, pageNo);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -281,7 +281,7 @@ public class ProvenanceManagerImpl imple
public WorkflowInstanceData getWorkflowInstanceData(String experimentId,
String workflowInstanceId) throws
AiravataAPIInvocationException {
try {
- return
getClient().getProvenanceResouceClient().getWorkflowInstanceData(workflowInstanceId);
+ return
getClient().getRegistryClient().getWorkflowInstanceData(workflowInstanceId);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -311,7 +311,7 @@ public class ProvenanceManagerImpl imple
public void setExperimentName(String experimentId, String
experimentName)
throws AiravataAPIInvocationException {
try {
-
getClient().getProvenanceResouceClient().updateExperimentName(experimentId,
experimentName);
+
getClient().getRegistryClient().updateExperimentName(experimentId,
experimentName);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -327,7 +327,7 @@ public class ProvenanceManagerImpl imple
public ExperimentName getExperimentName(String experimentId)
throws AiravataAPIInvocationException {
try {
- return new ExperimentName(experimentId,
getClient().getProvenanceResouceClient().getExperimentName(experimentId));
+ return new ExperimentName(experimentId,
getClient().getRegistryClient().getExperimentName(experimentId));
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -337,7 +337,7 @@ public class ProvenanceManagerImpl imple
public ExperimentData getWorkflowExperimentData(String experimentId)
throws AiravataAPIInvocationException {
try {
- return
getClient().getProvenanceResouceClient().getExperiment(experimentId);
+ return
getClient().getRegistryClient().getExperiment(experimentId);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -348,7 +348,7 @@ public class ProvenanceManagerImpl imple
String workflowInstaceId, String nodeId,
ExecutionStatus status)
throws AiravataAPIInvocationException {
try {
-
getClient().getProvenanceResouceClient().updateWorkflowNodeStatus(workflowInstaceId,
nodeId, status);
+
getClient().getRegistryClient().updateWorkflowNodeStatus(workflowInstaceId,
nodeId, status);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -359,7 +359,7 @@ public class ProvenanceManagerImpl imple
public void setWorkflowInstanceNodeStatus(WorkflowInstanceNodeStatus
status)
throws AiravataAPIInvocationException {
try {
-
getClient().getProvenanceResouceClient().updateWorkflowNodeStatus(status);
+
getClient().getRegistryClient().updateWorkflowNodeStatus(status);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -376,7 +376,7 @@ public class ProvenanceManagerImpl imple
public WorkflowInstanceNodeStatus getWorkflowInstanceNodeStatus(
WorkflowInstanceNode node) throws
AiravataAPIInvocationException {
try {
- return
getClient().getProvenanceResouceClient().getWorkflowNodeStatus(node);
+ return
getClient().getRegistryClient().getWorkflowNodeStatus(node);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -388,8 +388,8 @@ public class ProvenanceManagerImpl imple
try {
AiravataExperiment experiment = new
AiravataExperiment();
experiment.setExperimentId(experimentId);
-
getClient().getExperimentResourceClient().addExperiment(projectName,
experiment);
-
getClient().getProvenanceResouceClient().updateExperimentName(experimentId,
experimentName);
+
getClient().getRegistryClient().addExperiment(projectName, experiment);
+
getClient().getRegistryClient().updateExperimentName(experimentId,
experimentName);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -400,7 +400,7 @@ public class ProvenanceManagerImpl imple
WorkflowInstance workflowInstance)
throws AiravataAPIInvocationException {
try {
-
getClient().getProvenanceResouceClient().addWorkflowInstance(experimentId,
workflowInstance.getWorkflowInstanceId(),workflowInstance.getTemplateName());
+
getClient().getRegistryClient().addWorkflowInstance(experimentId,
workflowInstance.getWorkflowInstanceId(),workflowInstance.getTemplateName());
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -411,7 +411,7 @@ public class ProvenanceManagerImpl imple
public ExperimentData getExperimentMetaInformation(String experimentId)
throws AiravataAPIInvocationException {
try {
- return
getClient().getProvenanceResouceClient().getExperimentMetaInformation(experimentId);
+ return
getClient().getRegistryClient().getExperimentMetaInformation(experimentId);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -421,7 +421,7 @@ public class ProvenanceManagerImpl imple
public List<ExperimentData> getAllExperimentMetaInformation(String user)
throws AiravataAPIInvocationException {
try {
- return
getClient().getProvenanceResouceClient().getAllExperimentMetaInformation(user);
+ return
getClient().getRegistryClient().getAllExperimentMetaInformation(user);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java?rev=1411462&r1=1411461&r2=1411462&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowManagerImpl.java
Mon Nov 19 22:31:01 2012
@@ -66,13 +66,13 @@ public class WorkflowManagerImpl impleme
throws AiravataAPIInvocationException {
try {
- if
(getClient().getUserWFResourceClient().isWorkflowExists(workflow.getName())) {
-
getClient().getUserWFResourceClient().updateWorkflow(workflow.getName(),workflowAsString);
+ if
(getClient().getRegistryClient().isWorkflowExists(workflow.getName())) {
+
getClient().getRegistryClient().updateWorkflow(workflow.getName(),workflowAsString);
}else{
-
getClient().getUserWFResourceClient().addWorkflow(workflow.getName(),workflowAsString);
+
getClient().getRegistryClient().addWorkflow(workflow.getName(),workflowAsString);
}
if (owner==null){
-
getClient().getPublishedWFResourceClient().publishWorkflow(workflow.getName());
+
getClient().getRegistryClient().publishWorkflow(workflow.getName());
}
return true;
} catch (Exception e) {
@@ -85,7 +85,7 @@ public class WorkflowManagerImpl impleme
throws AiravataAPIInvocationException {
try {
List<Workflow> workflows=new ArrayList<Workflow>();
- Map<String, String> workflowMap =
getClient().getUserWFResourceClient().getWorkflows();
+ Map<String, String> workflowMap =
getClient().getRegistryClient().getWorkflows();
for(String workflowStr:workflowMap.values()){
workflows.add(getWorkflowFromString(workflowStr));
}
@@ -101,7 +101,7 @@ public class WorkflowManagerImpl impleme
try {
List<String> workflowList = new ArrayList<String>();
Map<String, String> workflows;
- workflows =
getClient().getUserWFResourceClient().getWorkflows();
+ workflows =
getClient().getRegistryClient().getWorkflows();
for (String name : workflows.keySet()) {
workflowList.add(name);
}
@@ -121,7 +121,7 @@ public class WorkflowManagerImpl impleme
public String getWorkflowAsString(String workflowName, String owner)
throws AiravataAPIInvocationException {
try {
- return
getClient().getUserWFResourceClient().getWorkflowGraphXML(workflowName);
+ return
getClient().getRegistryClient().getWorkflowGraphXML(workflowName);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -131,7 +131,7 @@ public class WorkflowManagerImpl impleme
public boolean deleteWorkflow(String workflowName, String owner)
throws AiravataAPIInvocationException {
try {
-
getClient().getUserWFResourceClient().removeWorkflow(workflowName);
+
getClient().getRegistryClient().removeWorkflow(workflowName);
return true;
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
@@ -220,7 +220,7 @@ public class WorkflowManagerImpl impleme
public boolean isPublishedWorkflowExists(String workflowName)
throws AiravataAPIInvocationException {
try {
- return
getClient().getPublishedWFResourceClient().isPublishedWorkflowExists(workflowName);
+ return
getClient().getRegistryClient().isPublishedWorkflowExists(workflowName);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -230,7 +230,7 @@ public class WorkflowManagerImpl impleme
public void publishWorkflow(String workflowName, String
publishWorkflowName)
throws AiravataAPIInvocationException {
try {
-
getClient().getPublishedWFResourceClient().publishWorkflow(workflowName,
publishWorkflowName);
+
getClient().getRegistryClient().publishWorkflow(workflowName,
publishWorkflowName);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -240,7 +240,7 @@ public class WorkflowManagerImpl impleme
public void publishWorkflow(String workflowName)
throws AiravataAPIInvocationException {
try {
-
getClient().getPublishedWFResourceClient().publishWorkflow(workflowName);
+
getClient().getRegistryClient().publishWorkflow(workflowName);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -250,7 +250,7 @@ public class WorkflowManagerImpl impleme
public String getPublishedWorkflowGraphXML(String workflowName)
throws AiravataAPIInvocationException {
try {
- return
getClient().getPublishedWFResourceClient().getPublishedWorkflowGraphXML(workflowName);
+ return
getClient().getRegistryClient().getPublishedWorkflowGraphXML(workflowName);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -266,7 +266,7 @@ public class WorkflowManagerImpl impleme
public List<String> getPublishedWorkflowNames()
throws AiravataAPIInvocationException {
try {
- return
getClient().getPublishedWFResourceClient().getPublishedWorkflowNames();
+ return
getClient().getRegistryClient().getPublishedWorkflowNames();
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -277,7 +277,7 @@ public class WorkflowManagerImpl impleme
throws AiravataAPIInvocationException {
try {
Map<String, Workflow> workflows=new HashMap<String,
Workflow>();
- Map<String, String> publishedWorkflows =
getClient().getPublishedWFResourceClient().getPublishedWorkflows();
+ Map<String, String> publishedWorkflows =
getClient().getRegistryClient().getPublishedWorkflows();
for (String name : publishedWorkflows.keySet()) {
workflows.put(name,
getWorkflowFromString(publishedWorkflows.get(name)));
}
@@ -291,7 +291,7 @@ public class WorkflowManagerImpl impleme
public void removePublishedWorkflow(String workflowName)
throws AiravataAPIInvocationException {
try {
-
getClient().getPublishedWFResourceClient().removePublishedWorkflow(workflowName);
+
getClient().getRegistryClient().removePublishedWorkflow(workflowName);
} catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -305,7 +305,7 @@ public class WorkflowManagerImpl impleme
@Override
public List<WorkflowInput> getWorkflowInputs(WorkflowData workflowData)
throws AiravataAPIInvocationException, Exception {
if (workflowData.isPublished()){
- return
getWorkflowFromString(getClient().getPublishedWFResourceClient().getPublishedWorkflowGraphXML(workflowData.getName())).getWorkflowInputs();
+ return
getWorkflowFromString(getClient().getRegistryClient().getPublishedWorkflowGraphXML(workflowData.getName())).getWorkflowInputs();
}else{
return getWorkflowInputs(workflowData.getName());
}
@@ -319,7 +319,7 @@ public class WorkflowManagerImpl impleme
for (String id : workflowTemplateIds) {
list.add(new WorkflowData(id,null,false));
}
- List<String> publishedWorkflowNames =
getClient().getPublishedWFResourceClient().getPublishedWorkflowNames();
+ List<String> publishedWorkflowNames =
getClient().getRegistryClient().getPublishedWorkflowNames();
for (String id : publishedWorkflowNames) {
list.add(new WorkflowData(id,null,false));
}
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java?rev=1411462&r1=1411461&r2=1411462&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
Mon Nov 19 22:31:01 2012
@@ -42,7 +42,11 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriBuilder;
import java.net.URI;
import java.net.URISyntaxException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
public class ConfigurationResourceClient {
@@ -130,12 +134,14 @@ public class ConfigurationResourceClient
return configurationValueList;
}
- public void setConfiguration (String configKey, String configVal, String
date){
+ public void setConfiguration (String configKey, String configVal, Date
date){
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String formattedDate = dateFormat.format(date);
webResource =
getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.SAVE_CONFIGURATION);
MultivaluedMap formData = new MultivaluedMapImpl();
formData.add("key", configKey);
formData.add("value", configVal);
- formData.add("date", date);
+ formData.add("date", formattedDate);
ClientResponse response =
webResource.type(MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class,
formData);
int status = response.getStatus();
@@ -157,12 +163,14 @@ public class ConfigurationResourceClient
}
}
- public void addConfiguration(String configKey, String configVal, String
date){
+ public void addConfiguration(String configKey, String configVal, Date
date){
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String formattedDate = dateFormat.format(date);
webResource =
getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.UPDATE_CONFIGURATION);
MultivaluedMap formData = new MultivaluedMapImpl();
formData.add("key", configKey);
formData.add("value", configVal);
- formData.add("date", date);
+ formData.add("date", formattedDate);
ClientResponse response =
webResource.type(MediaType.APPLICATION_FORM_URLENCODED).post(ClientResponse.class,
formData);
int status = response.getStatus();
@@ -365,10 +373,10 @@ public class ConfigurationResourceClient
}
}
- public void addGFacURI(String uri) {
+ public void addGFacURI(URI uri) {
webResource =
getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.ADD_GFAC_URI);
MultivaluedMap formData = new MultivaluedMapImpl();
- formData.add("uri", uri);
+ formData.add("uri", uri.toString());
ClientResponse response =
webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
@@ -390,10 +398,10 @@ public class ConfigurationResourceClient
}
}
- public void addWFInterpreterURI(String uri) {
+ public void addWFInterpreterURI(URI uri) {
webResource =
getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.ADD_WFINTERPRETER_URI);
MultivaluedMap formData = new MultivaluedMapImpl();
- formData.add("uri", uri);
+ formData.add("uri", uri.toString());
ClientResponse response =
webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
@@ -415,10 +423,10 @@ public class ConfigurationResourceClient
}
}
- public void setEventingURI(String uri) {
+ public void setEventingURI(URI uri) {
webResource =
getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.ADD_EVENTING_URI);
MultivaluedMap formData = new MultivaluedMapImpl();
- formData.add("uri", uri);
+ formData.add("uri", uri.toString());
ClientResponse response =
webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
@@ -440,10 +448,10 @@ public class ConfigurationResourceClient
}
}
- public void setMessageBoxURI(String uri) {
+ public void setMessageBoxURI(URI uri) {
webResource =
getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.ADD_MESSAGE_BOX_URI);
MultivaluedMap formData = new MultivaluedMapImpl();
- formData.add("uri", uri);
+ formData.add("uri", uri.toString());
ClientResponse response =
webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
@@ -465,11 +473,13 @@ public class ConfigurationResourceClient
}
}
- public void addGFacURIByDate(String uri, String date) {
+ public void addGFacURIByDate(URI uri, Date date) {
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String formattedDate = dateFormat.format(date);
webResource =
getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.ADD_GFAC_URI_DATE);
MultivaluedMap formData = new MultivaluedMapImpl();
- formData.add("uri", uri);
- formData.add("date", date);
+ formData.add("uri", uri.toString());
+ formData.add("date", formattedDate);
ClientResponse response =
webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
@@ -491,11 +501,13 @@ public class ConfigurationResourceClient
}
}
- public void addWorkflowInterpreterURI(String uri, String date) {
+ public void addWorkflowInterpreterURI(URI uri, Date date) {
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String formattedDate = dateFormat.format(date);
webResource =
getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.ADD_WFINTERPRETER_URI_DATE);
MultivaluedMap formData = new MultivaluedMapImpl();
- formData.add("uri", uri);
- formData.add("date", date);
+ formData.add("uri", uri.toString());
+ formData.add("date", formattedDate);
ClientResponse response =
webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
@@ -517,11 +529,13 @@ public class ConfigurationResourceClient
}
}
- public void setEventingURIByDate(String uri, String date) {
+ public void setEventingURIByDate(URI uri, Date date) {
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String formattedDate = dateFormat.format(date);
webResource =
getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.ADD_EVENTING_URI_DATE);
MultivaluedMap formData = new MultivaluedMapImpl();
- formData.add("uri", uri);
- formData.add("date", date);
+ formData.add("uri", uri.toString());
+ formData.add("date", formattedDate);
ClientResponse response =
webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
@@ -543,11 +557,13 @@ public class ConfigurationResourceClient
}
}
- public void setMessageBoxURIByDate(String uri, String date) {
+ public void setMessageBoxURIByDate(URI uri, Date date) {
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String formattedDate = dateFormat.format(date);
webResource =
getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.ADD_MSG_BOX_URI_DATE);
MultivaluedMap formData = new MultivaluedMapImpl();
- formData.add("uri", uri);
- formData.add("date", date);
+ formData.add("uri", uri.toString());
+ formData.add("date", formattedDate);
ClientResponse response =
webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formData);
int status = response.getStatus();
@@ -569,10 +585,10 @@ public class ConfigurationResourceClient
}
}
- public void removeGFacURI(String uri){
+ public void removeGFacURI(URI uri){
webResource =
getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.DELETE_GFAC_URI);
MultivaluedMap queryParams = new MultivaluedMapImpl();
- queryParams.add("uri", uri);
+ queryParams.add("uri", uri.toString());
ClientResponse response =
webResource.queryParams(queryParams).delete(ClientResponse.class);
int status = response.getStatus();
@@ -615,10 +631,10 @@ public class ConfigurationResourceClient
}
}
- public void removeWorkflowInterpreterURI(String uri){
+ public void removeWorkflowInterpreterURI(URI uri){
webResource =
getConfigurationBaseResource().path(ResourcePathConstants.ConfigResourcePathConstants.DELETE_WFINTERPRETER_URI);
MultivaluedMap queryParams = new MultivaluedMapImpl();
- queryParams.add("uri", uri);
+ queryParams.add("uri", uri.toString());
ClientResponse response =
webResource.queryParams(queryParams).delete(ClientResponse.class);
int status = response.getStatus();
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java?rev=1411462&r1=1411461&r2=1411462&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
Mon Nov 19 22:31:01 2012
@@ -130,10 +130,10 @@ public class ProjectResourceClient {
}
}
- public void addWorkspaceProject(String projectName){
+ public void addWorkspaceProject(WorkspaceProject project){
webResource =
getProjectRegistryBaseResource().path(ResourcePathConstants.ProjectResourcePathConstants.ADD_PROJECT);
MultivaluedMap formParams = new MultivaluedMapImpl();
- formParams.add("projectName", projectName );
+ formParams.add("projectName", project.getProjectName() );
ClientResponse response =
webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
@@ -154,10 +154,10 @@ public class ProjectResourceClient {
}
}
- public void updateWorkspaceProject(String projectName){
+ public void updateWorkspaceProject(WorkspaceProject project){
webResource =
getProjectRegistryBaseResource().path(ResourcePathConstants.ProjectResourcePathConstants.UPDATE_PROJECT);
MultivaluedMap formParams = new MultivaluedMapImpl();
- formParams.add("projectName", projectName );
+ formParams.add("projectName", project.getProjectName() );
ClientResponse response =
webResource.accept(MediaType.TEXT_PLAIN).post(ClientResponse.class, formParams);
int status = response.getStatus();
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java?rev=1411462&r1=1411461&r2=1411462&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
Mon Nov 19 22:31:01 2012
@@ -1008,6 +1008,38 @@ public class ProvenanceResourceClient {
return null;
}
+ public List<WorkflowNodeIOData> getWorkflowInstanceNodeInput(String
workflowInstanceId, String nodeType){
+ //not implemented in Registry API
+ return null;
+ }
+
+ public List<WorkflowNodeIOData> getWorkflowInstanceNodeOutput(String
workflowInstanceId, String nodeType){
+ //not implemented in Registry API
+ return null;
+ }
+
+ public void saveWorkflowExecutionOutput(String experimentId, String
outputNodeName, String output){
+ //not implemented in Registry API
+ }
+
+ public void saveWorkflowExecutionOutput(String experimentId,
WorkflowIOData data){
+ //not implemented in Registry API
+ }
+
+ public WorkflowIOData getWorkflowExecutionOutput(String experimentId,
String outputNodeName) {
+ //not implemented in Registry API
+ return null;
+ }
+
+ public List<WorkflowIOData> getWorkflowExecutionOutput(String
experimentId) {
+ //not implemented in Registry API
+ return null;
+ }
+
+ public String[] getWorkflowExecutionOutputNames(String exeperimentId){
+ //not implemented in Registry API
+ return null;
+ }
}
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java?rev=1411462&r1=1411461&r2=1411462&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
Mon Nov 19 22:31:01 2012
@@ -28,6 +28,7 @@ import com.sun.jersey.api.client.config.
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.json.JSONConfiguration;
import com.sun.jersey.core.util.MultivaluedMapImpl;
+import org.apache.airavata.registry.api.ResourceMetadata;
import
org.apache.airavata.rest.mappings.resourcemappings.PublishWorkflowNamesList;
import org.apache.airavata.rest.mappings.resourcemappings.Workflow;
import org.apache.airavata.rest.mappings.resourcemappings.WorkflowList;
@@ -255,4 +256,9 @@ public class PublishedWorkflowResourceCl
}
}
+
+ public ResourceMetadata getPublishedWorkflowMetadata(String workflowName){
+ //not implemented in Registry API
+ return null;
+ }
}
