Author: chathuri
Date: Wed Nov 21 15:32:41 2012
New Revision: 1412151
URL: http://svn.apache.org/viewvc?rev=1412151&view=rev
Log:
updating airavata client
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/AiravataClientUtils.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowManager.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/ExecutionManagerImpl.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.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
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=1412151&r1=1412150&r2=1412151&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
Wed Nov 21 15:32:41 2012
@@ -67,10 +67,11 @@ import org.apache.airavata.common.utils.
import org.apache.airavata.common.utils.XMLUtil;
import
org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.registry.api.AiravataRegistryFactory;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.registry.api.workflow.ExperimentData;
import org.apache.airavata.rest.client.RegistryClient;
-import org.apache.airavata.rest.utils.Callback;
+import org.apache.airavata.registry.api.Callback;
import org.apache.airavata.workflow.model.component.ComponentException;
import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
import org.apache.airavata.workflow.model.graph.GraphException;
@@ -512,7 +513,7 @@ public class AiravataClient implements A
AiravataClient.workflow = workflow;
}
- public RegistryClient getRegistryClient(){
+ public AiravataRegistry2 getRegistryClient(){
RegistryClient registryClient = new RegistryClient(getCurrentUser(),
getCallBack());
return registryClient;
}
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java?rev=1412151&r1=1412150&r2=1412151&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClientUtils.java
Wed Nov 21 15:32:41 2012
@@ -29,29 +29,31 @@ import java.util.Map;
import javax.jcr.RepositoryException;
import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.client.impl.PasswordCallBackImpl;
import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.rest.utils.Callback;
+import org.apache.airavata.registry.api.Callback;
public class AiravataClientUtils {
public static AiravataAPI getAPI(URI registryURL, String username,
String password) throws MalformedURLException, RepositoryException,
RegistryException{
return getAPI(registryURL, username, password, username);
}
- public static AiravataAPI getAPI(URI registryURL, String username,
Callback callback) throws MalformedURLException, RepositoryException,
RegistryException{
+ public static AiravataAPI getAPI(URI registryURL, String username, String
alternateUsername, Callback callback) throws MalformedURLException,
RepositoryException, RegistryException{
AiravataClient apiObj = new AiravataClient();
- apiObj.setCurrentUser(username);
+ apiObj.setCurrentUser(alternateUsername);
apiObj.setCallBack(callback);
apiObj.setPassword(callback.getPassword(username));
apiObj.setRegitryURI(registryURL);
return apiObj;
}
+ public static AiravataAPI getAPI(URI registryURL, String username,
Callback callback) throws MalformedURLException, RepositoryException,
RegistryException{
+ return getAPI(registryURL, username, username, callback);
+ }
+
public static AiravataAPI getAPI(URI registryURL, String username,
String password, String alternateUsername) throws MalformedURLException,
RepositoryException, RegistryException{
- AiravataClient apiObj = new AiravataClient();
- apiObj.setCurrentUser(alternateUsername);
- apiObj.setPassword(password);
- apiObj.setRegitryURI(registryURL);
- return apiObj;
+ AiravataAPI airavataAPI = getAPI(registryURL, username, new
PasswordCallBackImpl(username, password));
+ return airavataAPI;
}
@Deprecated
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java?rev=1412151&r1=1412150&r2=1412151&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java
Wed Nov 21 15:32:41 2012
@@ -195,4 +195,11 @@ public interface ApplicationManager {
public void removeApplicationDescriptor(String serviceName, String
hostName, String applicationName) throws AiravataAPIInvocationException;
+ public void updateHostDescriptor(HostDescription descriptor) throws
AiravataAPIInvocationException;
+
+ public void updateServiceDescriptor(ServiceDescription descriptor) throws
AiravataAPIInvocationException;
+
+ public void updateApplicationDescriptor(String serviceName, String
hostName, ApplicationDeploymentDescription descriptor) throws
AiravataAPIInvocationException;
+
+ public ApplicationDeploymentDescription getApplicationDescriptor(String
serviceName, String hostname, String applicationName) throws
AiravataAPIInvocationException;
}
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java?rev=1412151&r1=1412150&r2=1412151&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java
Wed Nov 21 15:32:41 2012
@@ -24,7 +24,6 @@ package org.apache.airavata.client.api;
import java.util.List;
import
org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
-import
org.apache.airavata.core.gfac.context.invocation.impl.DefaultExecutionContext;
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.workflow.model.wf.WorkflowInput;
import org.apache.airavata.ws.monitor.Monitor;
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java?rev=1412151&r1=1412150&r2=1412151&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
Wed Nov 21 15:32:41 2012
@@ -339,4 +339,6 @@ public interface ProvenanceManager {
public void setWorkflowNodeType(WorkflowInstanceNode node,
WorkflowNodeType type) throws AiravataAPIInvocationException;
public void setWorkflowInstanceTemplateName(String
workflowInstanceId,String templateName) throws AiravataAPIInvocationException;
+
+ public void saveWorkflowExecutionOutput(String experimentId, String
outputNodeName, String output) throws AiravataAPIInvocationException;
}
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowManager.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowManager.java?rev=1412151&r1=1412150&r2=1412151&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowManager.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowManager.java
Wed Nov 21 15:32:41 2012
@@ -273,5 +273,11 @@ public interface WorkflowManager {
* @throws AiravataAPIInvocationException
*/
public List<WorkflowData> getAllWorkflows() throws
AiravataAPIInvocationException;
-
+
+ public boolean isWorkflowExists(String workflowName) throws
AiravataAPIInvocationException;
+
+ public void updateWorkflow(String workflowName, String workflowGraphXml)
throws AiravataAPIInvocationException;
+
+ public void removeWorkflow(String workflowName) throws
AiravataAPIInvocationException;
+
}
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=1412151&r1=1412150&r2=1412151&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
Wed Nov 21 15:32:41 2012
@@ -292,6 +292,42 @@ public class ApplicationManagerImpl impl
}
}
+ @Override
+ public void updateHostDescriptor(HostDescription descriptor) throws
AiravataAPIInvocationException {
+ try {
+ getClient().getRegistryClient().updateHostDescriptor(descriptor);
+ } catch (RegistryException e) {
+ throw new AiravataAPIInvocationException(e);
+ }
+ }
+
+ @Override
+ public void updateServiceDescriptor(ServiceDescription descriptor) throws
AiravataAPIInvocationException {
+ try {
+
getClient().getRegistryClient().updateServiceDescriptor(descriptor);
+ } catch (RegistryException e) {
+ throw new AiravataAPIInvocationException(e);
+ }
+ }
+
+ @Override
+ public void updateApplicationDescriptor(String serviceName, String
hostName, ApplicationDeploymentDescription descriptor) throws
AiravataAPIInvocationException {
+ try {
+
getClient().getRegistryClient().updateApplicationDescriptor(serviceName,
hostName, descriptor);
+ } catch (RegistryException e) {
+ throw new AiravataAPIInvocationException(e);
+ }
+ }
+
+ @Override
+ public ApplicationDeploymentDescription getApplicationDescriptor(String
serviceName, String hostname, String applicationName) throws
AiravataAPIInvocationException {
+ try {
+ return
getClient().getRegistryClient().getApplicationDescriptor(serviceName, hostname,
applicationName);
+ } catch (RegistryException e) {
+ throw new AiravataAPIInvocationException(e);
+ }
+ }
+
public AiravataClient getClient() {
return client;
}
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java?rev=1412151&r1=1412150&r2=1412151&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
Wed Nov 21 15:32:41 2012
@@ -21,21 +21,19 @@
package org.apache.airavata.client.impl;
-import java.util.Calendar;
-import java.util.List;
-
import org.apache.airavata.client.AiravataClient;
import org.apache.airavata.client.AiravataClientConfiguration;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.client.api.ExecutionManager;
-import org.apache.airavata.registry.api.exception.RegistryException;
import
org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
-import
org.apache.airavata.core.gfac.context.invocation.impl.DefaultExecutionContext;
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.workflow.model.wf.WorkflowInput;
import org.apache.airavata.ws.monitor.Monitor;
import org.apache.airavata.ws.monitor.MonitorEventListener;
+import java.util.Calendar;
+import java.util.List;
+
public class ExecutionManagerImpl implements ExecutionManager {
private AiravataClient client;
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java?rev=1412151&r1=1412150&r2=1412151&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/PasswordCallBackImpl.java
Wed Nov 21 15:32:41 2012
@@ -21,7 +21,7 @@
package org.apache.airavata.client.impl;
-import org.apache.airavata.rest.utils.Callback;
+import org.apache.airavata.registry.api.Callback;
public class PasswordCallBackImpl implements Callback {
private String username;
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=1412151&r1=1412150&r2=1412151&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
Wed Nov 21 15:32:41 2012
@@ -401,7 +401,7 @@ public class ProvenanceManagerImpl imple
@Override
public List<WorkflowInstance> getExperimentWorkflowInstances(String
experimentId) throws AiravataAPIInvocationException {
try{
- return
getClient().getRegistryClient().getProvenanceResourceClient().getExperimentWorkflowInstances(experimentId);
+ return
getClient().getRegistryClient().getExperimentWorkflowInstances(experimentId);
}catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -410,7 +410,7 @@ public class ProvenanceManagerImpl imple
@Override
public void setWorkflowNodeType(WorkflowInstanceNode node,
WorkflowNodeType type) throws AiravataAPIInvocationException {
try{
-
getClient().getRegistryClient().getProvenanceResourceClient().updateWorkflowNodeType(node,
type);
+ getClient().getRegistryClient().updateWorkflowNodeType(node, type);
}catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
@@ -419,13 +419,22 @@ public class ProvenanceManagerImpl imple
@Override
public void setWorkflowInstanceTemplateName(String workflowInstanceId,
String templateName) throws AiravataAPIInvocationException {
try{
-
getClient().getRegistryClient().getProvenanceResourceClient().setWorkflowInstanceTemplateName(workflowInstanceId,
templateName);
+
getClient().getRegistryClient().setWorkflowInstanceTemplateName(workflowInstanceId,
templateName);
}catch (Exception e) {
throw new AiravataAPIInvocationException(e);
}
}
@Override
+ public void saveWorkflowExecutionOutput(String experimentId, String
outputNodeName, String output) throws AiravataAPIInvocationException {
+ try {
+
getClient().getRegistryClient().saveWorkflowExecutionOutput(experimentId,
outputNodeName, output);
+ } catch (RegistryException e) {
+ throw new AiravataAPIInvocationException(e);
+ }
+ }
+
+ @Override
public ExperimentData getExperimentMetaInformation(String experimentId)
throws AiravataAPIInvocationException {
try {
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=1412151&r1=1412150&r2=1412151&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
Wed Nov 21 15:32:41 2012
@@ -30,6 +30,7 @@ import org.apache.airavata.client.Airava
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.client.api.WorkflowManager;
import org.apache.airavata.common.utils.XMLUtil;
+import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.workflow.model.wf.WorkflowData;
import org.apache.airavata.workflow.model.wf.WorkflowInput;
@@ -328,4 +329,31 @@ public class WorkflowManagerImpl impleme
}
}
+ @Override
+ public boolean isWorkflowExists(String workflowName) throws
AiravataAPIInvocationException {
+ try {
+ return
getClient().getRegistryClient().isWorkflowExists(workflowName);
+ } catch (RegistryException e) {
+ throw new AiravataAPIInvocationException(e);
+ }
+ }
+
+ @Override
+ public void updateWorkflow(String workflowName, String workflowGraphXml)
throws AiravataAPIInvocationException {
+ try {
+ getClient().getRegistryClient().updateWorkflow(workflowName,
workflowGraphXml);
+ } catch (RegistryException e) {
+ throw new AiravataAPIInvocationException(e);
+ }
+ }
+
+ @Override
+ public void removeWorkflow(String workflowName) throws
AiravataAPIInvocationException {
+ try {
+ getClient().getRegistryClient().removeWorkflow(workflowName);
+ } catch (RegistryException e) {
+ throw new AiravataAPIInvocationException(e);
+ }
+ }
+
}
