airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [3/3] git commit: adding more to AIRAVATA-1234
Date Fri, 22 Aug 2014 20:10:24 GMT
adding more to AIRAVATA-1234


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/98f41101
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/98f41101
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/98f41101

Branch: refs/heads/master
Commit: 98f411019bed5a24d9ccf7b6237cb27311a74114
Parents: f72637f
Author: Chathuri Wimalasena <kamalasini@gmail.com>
Authored: Fri Aug 22 16:10:15 2014 -0400
Committer: Chathuri Wimalasena <kamalasini@gmail.com>
Committed: Fri Aug 22 16:10:15 2014 -0400

----------------------------------------------------------------------
 modules/airavata-client/pom.xml                 |    5 -
 .../airavata/client/AiravataAPIFactory.java     |   19 +-
 .../apache/airavata/client/AiravataClient.java  |  170 +--
 .../apache/airavata/client/api/AiravataAPI.java |    5 +-
 .../airavata/client/api/AiravataManager.java    |    6 +-
 .../org/apache/airavata/client/api/BaseAPI.java |    3 +-
 .../client/api/CredentialStoreManager.java      |   22 +-
 .../airavata/client/api/ExecutionManager.java   |  172 ++-
 .../airavata/client/api/ProvenanceManager.java  |  938 +++++++------
 .../client/impl/AiravataManagerImpl.java        |  264 ++--
 .../client/impl/ApplicationManagerImpl.java     |  525 ++++----
 .../client/impl/CredentialStoreManagerImpl.java |   50 +-
 .../client/impl/ExecutionManagerImpl.java       |  366 +++--
 .../client/impl/PasswordCallBackImpl.java       |   78 +-
 .../client/impl/ProvenanceManagerImpl.java      | 1273 +++++++++---------
 .../client/impl/WorkflowManagerImpl.java        |  365 ++---
 .../client/tools/PeriodicExecutorThread.java    |    1 -
 .../airavata/integration/ForEachCaseIT.java     |   12 -
 .../WorkflowIntegrationTestBase.java            |   27 +-
 .../integration/WorkflowSamplesCaseIT.java      |   10 -
 20 files changed, 2100 insertions(+), 2211 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/pom.xml
----------------------------------------------------------------------
diff --git a/modules/airavata-client/pom.xml b/modules/airavata-client/pom.xml
index feb967f..2b2cbdb 100644
--- a/modules/airavata-client/pom.xml
+++ b/modules/airavata-client/pom.xml
@@ -30,11 +30,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-registry-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>app-catalog-cpi</artifactId>
             <version>${project.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java
index 606301c..d2f87c0 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataAPIFactory.java
@@ -22,37 +22,32 @@ package org.apache.airavata.client;
 import org.apache.airavata.client.api.AiravataAPI;
 import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
 import org.apache.airavata.common.utils.SecurityUtil;
-import org.apache.airavata.registry.api.PasswordCallback;
 
 import java.net.URI;
 
 public class AiravataAPIFactory {
 	
-	public static AiravataAPI getAPI(String gateway, String username, String alternativeUser) throws AiravataAPIInvocationException{
-        return getAPI(null, gateway, username, alternativeUser, (PasswordCallback)null);
-    }
-	
 	public static AiravataAPI getAPI(String gateway, String username) throws AiravataAPIInvocationException{
-        return getAPI(null, gateway, username, (PasswordCallback)null);
+        return getAPI(null, gateway, username);
     }
 	
-	public static AiravataAPI getAPI(URI registryURL, String gateway, String username, PasswordCallback callback) throws AiravataAPIInvocationException{
-        return getAPI(registryURL, gateway, username, username, callback);
+	public static AiravataAPI getAPI(URI registryURL, String gateway, String username) throws AiravataAPIInvocationException{
+        return getAPI(registryURL, gateway, username, username);
     }
 
-    public static AiravataAPI getAPI(URI registryURL, String gateway, String username, PasswordCallback callback,
+    public static AiravataAPI getAPI(URI registryURL, String gateway, String username,
                                      String trustStoreFilePath, String trustStorePassword)
             throws AiravataAPIInvocationException{
 
         SecurityUtil.setTrustStoreParameters(trustStoreFilePath, trustStorePassword);
-        return getAPI(registryURL, gateway, username, username, callback);
+        return getAPI(registryURL, gateway, username, username);
     }
     
-    public static AiravataAPI getAPI(URI registryURL, String gateway, String username, String alternateUsername, PasswordCallback callback) throws AiravataAPIInvocationException{
+    public static AiravataAPI getAPI(URI registryURL, String gateway, String username, String alternateUsername) throws AiravataAPIInvocationException{
         try {
 			AiravataAPI apiObj = new AiravataClient();
 			apiObj.setCurrentUser(alternateUsername);
-			apiObj.setCallBack(callback);
+//			apiObj.setCallBack(callback);
 			apiObj.setRegitryURI(registryURL);
 			apiObj.setGateway(gateway);
 			apiObj.initialize();

http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
index 6ee3480..d9bc03e 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
@@ -20,49 +20,26 @@
  */
 package org.apache.airavata.client;
 
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Observable;
-
-import javax.jcr.RepositoryException;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.AiravataManager;
-import org.apache.airavata.client.api.ApplicationManager;
-import org.apache.airavata.client.api.CredentialStoreManager;
-import org.apache.airavata.client.api.ExecutionManager;
-import org.apache.airavata.client.api.ExperimentAdvanceOptions;
-import org.apache.airavata.client.api.ProvenanceManager;
-import org.apache.airavata.client.api.UserManager;
-import org.apache.airavata.client.api.WorkflowManager;
+import org.apache.airavata.client.api.*;
 import org.apache.airavata.client.api.builder.DescriptorBuilder;
 import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.client.impl.AiravataManagerImpl;
-import org.apache.airavata.client.impl.ApplicationManagerImpl;
-import org.apache.airavata.client.impl.CredentialStoreManagerImpl;
-import org.apache.airavata.client.impl.ExecutionManagerImpl;
-import org.apache.airavata.client.impl.PasswordCallBackImpl;
-import org.apache.airavata.client.impl.ProvenanceManagerImpl;
-import org.apache.airavata.client.impl.UserManagerImpl;
-import org.apache.airavata.client.impl.WorkflowManagerImpl;
+import org.apache.airavata.client.impl.*;
 import org.apache.airavata.common.exception.AiravataConfigurationException;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.utils.ServerSettings;
 import org.apache.airavata.common.utils.Version;
-import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.AiravataRegistryFactory;
-import org.apache.airavata.registry.api.AiravataUser;
-import org.apache.airavata.registry.api.Gateway;
-import org.apache.airavata.registry.api.PasswordCallback;
-import org.apache.airavata.registry.api.exception.RegException;
 import org.apache.airavata.workflow.model.wf.WorkflowInput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.jcr.RepositoryException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Observable;
+
 public class AiravataClient extends Observable implements AiravataAPI {
 
 	private static final Logger log = LoggerFactory
@@ -76,15 +53,11 @@ public class AiravataClient extends Observable implements AiravataAPI {
 	private AiravataClientConfiguration clientConfiguration;
 	private String currentUser;
 	private URI regitryURI;
-	private PasswordCallback callBack;
-
-	private AiravataRegistry2 registry;
 
 	private Map<String, String> configuration = new HashMap<String, String>();
 	private AiravataManagerImpl airavataManagerImpl;
 	private ApplicationManagerImpl applicationManagerImpl;
 	private WorkflowManagerImpl workflowManagerImpl;
-	private ProvenanceManagerImpl provenanceManagerImpl;
 	private UserManagerImpl userManagerImpl;
 //	private ExecutionManagerThriftImpl executionManagerImpl;
     private ExecutionManager executionManager;
@@ -107,7 +80,7 @@ public class AiravataClient extends Observable implements AiravataAPI {
 
 	private static HashMap<String, String> createConfig(URI registryUrl, String gateway,
 			String username, String password) throws RepositoryException,
-            RegException, AiravataConfigurationException {
+            AiravataConfigurationException {
 		HashMap<String, String> config = new HashMap<String, String>();
 		if (registryUrl != null) {
 			config.put(AiravataClient.REGISTRY, registryUrl.toString());
@@ -226,57 +199,57 @@ public class AiravataClient extends Observable implements AiravataAPI {
 
     }
 
-	private void updateClientConfiguration(Map<String, String> configuration)
-			throws MalformedURLException {
-		AiravataClientConfiguration clientConfiguration = getClientConfiguration();
-		if (configuration.get(GFAC) != null) {
-			clientConfiguration.setGfacURL(new URL(configuration.get(GFAC)));
-		}
-		if (configuration.get(MSGBOX) != null) {
-			clientConfiguration.setMessageboxURL(new URL(configuration
-					.get(MSGBOX)));
-		}
-		if (configuration.get(BROKER) != null) {
-			clientConfiguration.setMessagebrokerURL(new URL(configuration
-					.get(BROKER)));
-		}
-		if (configuration.get(WORKFLOWSERVICEURL) != null) {
-			clientConfiguration.setXbayaServiceURL(new URL(configuration
-					.get(WORKFLOWSERVICEURL)));
-		}
-		if (configuration.get(MSGBOX) != null) {
-			clientConfiguration.setMessageboxURL(new URL(configuration
-					.get(MSGBOX)));
-		}
-
-		if (clientConfiguration.getRegistryURL() != null
-				&& clientConfiguration.getGfacURL() == null) {
-			try {
-				clientConfiguration.setGfacURL(getRegistryClient()
-						.getGFacURIs().get(0).toURL());
-				configuration.put(GFAC, clientConfiguration.getGfacURL()
-						.toString());
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}
+//	private void updateClientConfiguration(Map<String, String> configuration)
+//			throws MalformedURLException {
+//		AiravataClientConfiguration clientConfiguration = getClientConfiguration();
+//		if (configuration.get(GFAC) != null) {
+//			clientConfiguration.setGfacURL(new URL(configuration.get(GFAC)));
+//		}
+//		if (configuration.get(MSGBOX) != null) {
+//			clientConfiguration.setMessageboxURL(new URL(configuration
+//					.get(MSGBOX)));
+//		}
+//		if (configuration.get(BROKER) != null) {
+//			clientConfiguration.setMessagebrokerURL(new URL(configuration
+//					.get(BROKER)));
+//		}
+//		if (configuration.get(WORKFLOWSERVICEURL) != null) {
+//			clientConfiguration.setXbayaServiceURL(new URL(configuration
+//					.get(WORKFLOWSERVICEURL)));
+//		}
+//		if (configuration.get(MSGBOX) != null) {
+//			clientConfiguration.setMessageboxURL(new URL(configuration
+//					.get(MSGBOX)));
+//		}
+//
+//		if (clientConfiguration.getRegistryURL() != null
+//				&& clientConfiguration.getGfacURL() == null) {
+//			try {
+//				clientConfiguration.setGfacURL(getRegistryClient()
+//						.getGFacURIs().get(0).toURL());
+//				configuration.put(GFAC, clientConfiguration.getGfacURL()
+//						.toString());
+//			} catch (Exception e) {
+//				e.printStackTrace();
+//			}
+//		}
+//	}
 
-	public AiravataRegistry2 getRegistryClient()
-			throws AiravataConfigurationException, RegException {
-		if (registry == null) {
-			registry = getRegistry(getRegitryURI(), getGateway(),
-					getCurrentUser(), getCallBack());
-		}
-		return registry;
-	}
+//	public AiravataRegistry2 getRegistryClient()
+//			throws AiravataConfigurationException, RegException {
+//		if (registry == null) {
+//			registry = getRegistry(getRegitryURI(), getGateway(),
+//					getCurrentUser(), getCallBack());
+//		}
+//		return registry;
+//	}
 
-	public static AiravataRegistry2 getRegistry(URI registryURI,
-			String gateway, String username, PasswordCallback callback)
-			throws RegException, AiravataConfigurationException {
-		return AiravataRegistryFactory.getRegistry(registryURI, new Gateway(
-				gateway), new AiravataUser(username), callback);
-	}
+//	public static AiravataRegistry2 getRegistry(URI registryURI,
+//			String gateway, String username, PasswordCallback callback)
+//			throws RegException, AiravataConfigurationException {
+//		return AiravataRegistryFactory.getRegistry(registryURI, new Gateway(
+//				gateway), new AiravataUser(username), callback);
+//	}
 
 	public AiravataClientConfiguration getClientConfiguration() {
 		if (clientConfiguration == null) {
@@ -306,13 +279,6 @@ public class AiravataClient extends Observable implements AiravataAPI {
 		return workflowManagerImpl;
 	}
 
-	public ProvenanceManager getProvenanceManager() {
-		if (provenanceManagerImpl == null) {
-			provenanceManagerImpl = new ProvenanceManagerImpl(this);
-		}
-		return provenanceManagerImpl;
-	}
-
 	public UserManager getUserManager() {
 		if (userManagerImpl == null) {
 			userManagerImpl = new UserManagerImpl(this);
@@ -363,25 +329,11 @@ public class AiravataClient extends Observable implements AiravataAPI {
 		this.regitryURI = regitryURI;
 	}
 
-	public String getPassword() {
-		if (getCallBack() != null) {
-			return getCallBack().getPassword(getCurrentUser());
-		}
-		return null;
-	}
 
 	public URI getRegitryURI() {
 		return regitryURI;
 	}
 
-	public PasswordCallback getCallBack() {
-		return callBack;
-	}
-
-	public void setCallBack(PasswordCallback callBack) {
-		this.callBack = callBack;
-	}
-
 	public String getGateway() {
 		return gateway;
 	}
@@ -391,7 +343,7 @@ public class AiravataClient extends Observable implements AiravataAPI {
 	}
 
 	public static void main(String[] args) throws Exception {
-		AiravataAPI api = AiravataAPIFactory.getAPI(new URI("http://localhost:8080/airavata/services/registry"), "default", "admin", new PasswordCallBackImpl("admin", "admin"));
+		AiravataAPI api = AiravataAPIFactory.getAPI(new URI("http://localhost:8080/airavata/services/registry"), "default", "admin");
 		ExperimentAdvanceOptions options = api.getExecutionManager().createExperimentAdvanceOptions();
 		options.getCustomWorkflowSchedulingSettings().addNewNodeSettings("data1", "comma_app", 1, 1);
 		String workflow = "Workflow3";

http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java
index 90d48b6..40d827d 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataAPI.java
@@ -26,7 +26,6 @@ import java.net.URI;
 import org.apache.airavata.client.api.builder.DescriptorBuilder;
 import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
 import org.apache.airavata.common.utils.Version;
-import org.apache.airavata.registry.api.PasswordCallback;
 
 
 /**
@@ -56,7 +55,7 @@ public interface AiravataAPI {
      * Returns the ProvenanceManager
      * @return
      */
-	public ProvenanceManager getProvenanceManager();
+//	public ProvenanceManager getProvenanceManager();
 
     /**
      * Returns the UserManager
@@ -97,7 +96,7 @@ public interface AiravataAPI {
 
 	public void setCurrentUser(String alternateUsername);
 
-	public void setCallBack(PasswordCallback callback);
+//	public void setCallBack(PasswordCallback callback);
 
 	public void setRegitryURI(URI registryURL);
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java
index 7aa9321..6805dd2 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/AiravataManager.java
@@ -22,8 +22,6 @@
 package org.apache.airavata.client.api;
 
 import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.AiravataUser;
-import org.apache.airavata.registry.api.Gateway;
 
 import java.net.URI;
 import java.util.Date;
@@ -133,7 +131,7 @@ public interface AiravataManager {
 
     public void unsetMessageBoxURI() throws AiravataAPIInvocationException;
 
-    public Gateway getGateway () throws AiravataAPIInvocationException;
+//    public Gateway getGateway () throws AiravataAPIInvocationException;
 
-    public AiravataUser getUser() throws AiravataAPIInvocationException;
+//    public AiravataUser getUser() throws AiravataAPIInvocationException;
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/api/BaseAPI.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/BaseAPI.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/BaseAPI.java
index 084dc93..05b7bb2 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/BaseAPI.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/BaseAPI.java
@@ -25,7 +25,6 @@ import java.net.URI;
 
 import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
 import org.apache.airavata.common.utils.Version;
-import org.apache.airavata.registry.api.PasswordCallback;
 
 public interface BaseAPI {
 
@@ -43,5 +42,5 @@ public interface BaseAPI {
     public void initialize() throws AiravataAPIInvocationException;
     
 	public URI getServiceURL() throws AiravataAPIInvocationException;
-	public PasswordCallback getPasswordCallback() throws AiravataAPIInvocationException;
+//	public PasswordCallback getPasswordCallback() throws AiravataAPIInvocationException;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/api/CredentialStoreManager.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/CredentialStoreManager.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/CredentialStoreManager.java
index 418c944..f79b8d4 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/CredentialStoreManager.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/CredentialStoreManager.java
@@ -27,40 +27,36 @@ public interface CredentialStoreManager {
 
 	/**
 	 * Checks whether a credential exists in the credential store for given gateway and token
-	 * @param String gatewayId
-	 * @param String tokenId
+	 * @param  gatewayId
+	 * @param  tokenId
 	 * @return a boolean (true is credential exists, false if not)
-	 * @throws org.apache.airavata.registry.api.exception.RegException
 	 */
 	public boolean isCredentialExist(String gatewayId, String tokenId) throws AiravataAPIInvocationException;
 	
 	/**
 	 * Get the public key for a credential in the credential store for given gateway and token
-	 * @param String gatewayId
-	 * @param String tokenId
+	 * @param  gatewayId
+	 * @param  tokenId
 	 * @return String The public key of the credential
-	 * @throws org.apache.airavata.registry.api.exception.RegException
 	 */
 	public String getCredentialPublicKey(String gatewayId, String tokenId) throws AiravataAPIInvocationException;
 	
 	/**
 	 * Creates a new SSH credential for given gateway and token, encrypts it with the given password 
 	 * and stores it in the credential store
-	 * @param String gatewayId
-	 * @param String tokenId
+	 * @param  gatewayId
+	 * @param  tokenId
 	 * @return String The public key of the credential
-	 * @throws org.apache.airavata.registry.api.exception.RegException
 	 */
 	public String createCredential(String gatewayId, String tokenId) throws AiravataAPIInvocationException;
 	
 	/**
 	 * Creates a new SSH credential for given gateway and token, encrypts it with the given password 
 	 * and stores it in the credential store
-	 * @param String gatewayId
-	 * @param String tokenId
-	 * @param String username
+	 * @param  gatewayId
+	 * @param  tokenId
+	 * @param  username
 	 * @return String The public key of the credential
-	 * @throws org.apache.airavata.registry.api.exception.RegException
 	 */
 	public String createCredential(String gatewayId, String tokenId, String username) throws AiravataAPIInvocationException;
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java
index d0be52b..fe7832f 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java
@@ -24,12 +24,6 @@ package org.apache.airavata.client.api;
 import java.util.List;
 
 import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.ExecutionErrors;
-import org.apache.airavata.registry.api.workflow.ExecutionError;
-import org.apache.airavata.registry.api.workflow.ExperimentExecutionError;
-import org.apache.airavata.registry.api.workflow.ApplicationJobExecutionError;
-import org.apache.airavata.registry.api.workflow.NodeExecutionError;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionError;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.workflow.model.wf.WorkflowInput;
 import org.apache.airavata.ws.monitor.EventDataListener;
@@ -126,88 +120,88 @@ public interface ExecutionManager {
      * @return
      * @throws AiravataAPIInvocationException
      */
-    public List<ExperimentExecutionError> getExperimentExecutionErrors(String experimentId) throws AiravataAPIInvocationException;
-    
-    /**
-     * Return errors defined at the workflow level 
-     * @param experimentId
-     * @param workflowInstanceId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-    public List<WorkflowExecutionError> getWorkflowExecutionErrors(String experimentId, String workflowInstanceId) throws AiravataAPIInvocationException;
-
-    /**
-     * Return errors defined at the node level 
-     * @param experimentId
-     * @param workflowInstanceId
-     * @param nodeId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-    public List<NodeExecutionError> getNodeExecutionErrors(String experimentId, String workflowInstanceId, String nodeId) throws AiravataAPIInvocationException;
-    
-    /**
-     * Return errors defined for a Application job 
-     * @param experimentId
-     * @param workflowInstanceId
-     * @param nodeId
-     * @param jobId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-    public List<ApplicationJobExecutionError> getApplicationJobErrors(String experimentId, String workflowInstanceId, String nodeId, String jobId) throws AiravataAPIInvocationException;
-
-    /**
-     * Return errors defined for a Application job 
-     * @param jobId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-    public List<ApplicationJobExecutionError> getApplicationJobErrors(String jobId) throws AiravataAPIInvocationException;
-
-    /**
-     * Return errors filtered by the parameters
-     * @param experimentId 
-     * @param workflowInstanceId
-     * @param nodeId
-     * @param jobId
-     * @param filterBy - what type of source types the results should contain
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-    public List<ExecutionError> getExecutionErrors(String experimentId, String workflowInstanceId, String nodeId, String jobId, ExecutionErrors.Source...filterBy) throws AiravataAPIInvocationException;
-
-    /**
-     * Adds an experiment execution error 
-     * @param error
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-    public int addExperimentError(ExperimentExecutionError error) throws AiravataAPIInvocationException;
-    
-    /**
-     * Adds an workflow execution error 
-     * @param error
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-    public int addWorkflowExecutionError(WorkflowExecutionError error) throws AiravataAPIInvocationException;
-    
-    /**
-     * Adds an node execution error 
-     * @param error
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-    public int addNodeExecutionError(NodeExecutionError error) throws AiravataAPIInvocationException;
-
-    /**
-     * Adds an Application job execution error 
-     * @param error
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-    public int addApplicationJobExecutionError(ApplicationJobExecutionError error) throws AiravataAPIInvocationException;
+//    public List<ExperimentExecutionError> getExperimentExecutionErrors(String experimentId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Return errors defined at the workflow level
+//     * @param experimentId
+//     * @param workflowInstanceId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//    public List<WorkflowExecutionError> getWorkflowExecutionErrors(String experimentId, String workflowInstanceId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Return errors defined at the node level
+//     * @param experimentId
+//     * @param workflowInstanceId
+//     * @param nodeId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//    public List<NodeExecutionError> getNodeExecutionErrors(String experimentId, String workflowInstanceId, String nodeId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Return errors defined for a Application job
+//     * @param experimentId
+//     * @param workflowInstanceId
+//     * @param nodeId
+//     * @param jobId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//    public List<ApplicationJobExecutionError> getApplicationJobErrors(String experimentId, String workflowInstanceId, String nodeId, String jobId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Return errors defined for a Application job
+//     * @param jobId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//    public List<ApplicationJobExecutionError> getApplicationJobErrors(String jobId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Return errors filtered by the parameters
+//     * @param experimentId
+//     * @param workflowInstanceId
+//     * @param nodeId
+//     * @param jobId
+//     * @param filterBy - what type of source types the results should contain
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//    public List<ExecutionError> getExecutionErrors(String experimentId, String workflowInstanceId, String nodeId, String jobId, ExecutionErrors.Source...filterBy) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Adds an experiment execution error
+//     * @param error
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//    public int addExperimentError(ExperimentExecutionError error) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Adds an workflow execution error
+//     * @param error
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//    public int addWorkflowExecutionError(WorkflowExecutionError error) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Adds an node execution error
+//     * @param error
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//    public int addNodeExecutionError(NodeExecutionError error) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Adds an Application job execution error
+//     * @param error
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//    public int addApplicationJobExecutionError(ApplicationJobExecutionError error) throws AiravataAPIInvocationException;
 
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
index 3c0d5ec..5c248ae 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
@@ -1,477 +1,461 @@
-/*
- *
- * 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.client.api;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.workflow.ApplicationJobStatusData;
-import org.apache.airavata.registry.api.workflow.ExperimentData;
-import org.apache.airavata.registry.api.workflow.ExperimentMetadata;
-import org.apache.airavata.registry.api.workflow.ExperimentName;
-import org.apache.airavata.registry.api.workflow.ExperimentUser;
-import org.apache.airavata.registry.api.workflow.ApplicationJob;
-import org.apache.airavata.registry.api.workflow.ApplicationJob.ApplicationJobStatus;
-import org.apache.airavata.registry.api.workflow.NodeExecutionStatus;
-import org.apache.airavata.registry.api.workflow.WorkflowExecution;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionData;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
-import org.apache.airavata.registry.api.workflow.WorkflowNodeGramData;
-import org.apache.airavata.registry.api.workflow.WorkflowNodeType;
-
-/**
- * This interface provide and API to manage all the provenance related methods, get Workflow inputs outputs
- */
-public interface ProvenanceManager {
-
-    /**
-     * Add input port data for a node in a running instance of a Workflow 
-     * @param data
-     * @throws AiravataAPIInvocationException
-     */
-	public void setWorkflowInstanceNodeInput(WorkflowInstanceNode node, String data) throws AiravataAPIInvocationException;
-
-    /**
-     * Add input port data for a node in a running instance of a Workflow
-     * @param experimentId
-     * @param workflowInstanceId
-     * @param nodeId
-     * @param data
-     * @throws AiravataAPIInvocationException
-     */
-	public void setWorkflowInstanceNodeInput(String experimentId, String workflowInstanceId, String nodeId, String data) throws AiravataAPIInvocationException;
-
-    /**
-     * Add output port data for a node in a running instance of a Workflow
-     * @param data
-     * @throws AiravataAPIInvocationException
-     */
-	public void setWorkflowInstanceNodeOutput(WorkflowInstanceNode node, String data) throws AiravataAPIInvocationException;
-
-    /**
-     * Add output port data for a node in a running instance of a Workflow
-     * @param experimentId
-     * @param workflowInstanceId
-     * @param nodeId
-     * @param data
-     * @throws AiravataAPIInvocationException
-     */
-	public void setWorkflowInstanceNodeOutput(String experimentId, String workflowInstanceId, String nodeId, String data) throws AiravataAPIInvocationException;
-
-    /**
-     * Get data of input ports of a node in a running instance of a Workflow
-     * @param node
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public String getWorkflowInstanceNodeInput(WorkflowInstanceNode node) throws AiravataAPIInvocationException;
-
-    /**
-     * Get data of input ports of a node in a running instance of a Workflow
-     * @param experimentId
-     * @param workflowInstanceId
-     * @param nodeId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public String getWorkflowInstanceNodeInput(String experimentId, String workflowInstanceId, String nodeId) throws AiravataAPIInvocationException;
-
-    /**
-     * Get data of input ports of a node in all the running instance of a particular Workflow template
-     * @param workflowTemplateId
-     * @param nodeId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public Map<WorkflowInstanceNode,String> getWorkflowInstanceNodeInput(String workflowTemplateId, String nodeId) throws AiravataAPIInvocationException;
-
-    /**
-     * Get data of output ports of a node in a running instance of a Workflow
-     * @param node
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public String getWorkflowInstanceNodeOutput(WorkflowInstanceNode node) throws AiravataAPIInvocationException;
-
-    /**
-     * Get data of output ports of a node in a running instance of a Workflow
-     * @param experimentId
-     * @param workflowInstanceId
-     * @param nodeId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public String getWorkflowInstanceNodeOutput(String experimentId, String workflowInstanceId, String nodeId) throws AiravataAPIInvocationException;
-
-    /**
-     * Get data of output ports of a node in all the running instance of a particular Workflow template
-     * @param workflowName
-     * @param nodeId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public Map<WorkflowInstanceNode,String> getWorkflowInstanceNodeOutput(String workflowName, String nodeId) throws AiravataAPIInvocationException;
-
-    /**
-     * Update the status of the Workflow instance
-     * @param experimentId
-     * @param workflowInstanceId
-     * @param status
-     * @throws AiravataAPIInvocationException
-     */
-	public void setWorkflowInstanceStatus(String experimentId, String workflowInstanceId, State status) throws AiravataAPIInvocationException;
-
-    /**
-     * Update the status of the Workflow instance
-     * @param status
-     * @throws AiravataAPIInvocationException
-     */
-	public void setWorkflowInstanceStatus(WorkflowExecutionStatus status) throws AiravataAPIInvocationException;
-
-    /**
-     * Retrieve the status of the Workflow instance
-     * @param experimentId
-     * @param workflowInstanceId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public WorkflowExecutionStatus getWorkflowInstanceStatus(String experimentId, String workflowInstanceId) throws AiravataAPIInvocationException;
-
-    /**
-     * Retrieve the status of the Workflow instance
-     * @param workflowInstance
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public WorkflowExecutionStatus getWorkflowInstanceStatus(WorkflowExecution workflowInstance) throws AiravataAPIInvocationException;
-
-    /**
-     * Update the User of the Workflow instance
-     * @param experimentId
-     * @param user
-     * @throws AiravataAPIInvocationException
-     */
-	public void setExperimentUser(String experimentId, String user) throws AiravataAPIInvocationException;
-
-    /**
-     * Update the User of the Workflow instance
-     * @param user
-     * @throws AiravataAPIInvocationException
-     */
-	public void setExperimentUser(ExperimentUser user) throws AiravataAPIInvocationException;
-
-    /**
-     * Retrieve the User of the Workflow instance
-     * @param experimentId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public ExperimentUser getExperimentUser(String experimentId) throws AiravataAPIInvocationException;
-
-    /**
-     * Update the metadata of the Workflow instance
-     * @param experimentId
-     * @param metadata
-     * @throws AiravataAPIInvocationException
-     */
-	public void setExperimentMetadata(String experimentId, String metadata) throws AiravataAPIInvocationException;
-
-    /**
-     * Update the metadata of the Workflow instance
-     * @param experimentMetadata
-     * @throws AiravataAPIInvocationException
-     */
-	public void setExperimentMetadata(ExperimentMetadata experimentMetadata) throws AiravataAPIInvocationException;
-	
-    /**
-     * Retrieve the metadata of the Workflow instance
-     * @param experimentId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public ExperimentMetadata getExperimentMetadata(String experimentId) throws AiravataAPIInvocationException;
-
-    /**
-     * check whether the experiment exists
-     * @param experimentName
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-    public boolean isExperimentNameExist(String experimentName) throws AiravataAPIInvocationException;
-
-	   /**
-     * Update the instance name of the Workflow
-     * @param experimentId
-     * @param instanceName
-     * @throws AiravataAPIInvocationException
-     */
-	public void setExperimentName(String experimentId, String instanceName) throws AiravataAPIInvocationException;
-
-    /**
-     * Update the instance name of the Workflow
-     * @param experimentName
-     * @throws AiravataAPIInvocationException
-     */
-	public void setExperimentName(ExperimentName experimentName) throws AiravataAPIInvocationException;
-
-    /**
-     * Retrieve the metadata of the Workflow instance
-     * @param experimentId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public ExperimentName getExperimentName(String experimentId) throws AiravataAPIInvocationException;
-
-    /**
-     * Retrieve the id's of all the experiments run by the given owner  
-     * @param owner
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public List<String> getExperimentIdList(String owner) throws AiravataAPIInvocationException;
-
-	public ExperimentData getExperimentMetaInformation(String experimentId)throws AiravataAPIInvocationException;
-	
-	public List<ExperimentData> getAllExperimentMetaInformation(String user)throws AiravataAPIInvocationException;
-	
-    /**
-     * Retrieve the id's of all the experiments run by the current user
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public List<String> getExperimentIdList() throws AiravataAPIInvocationException;
-
-    /**
-     * Retrieve all the experiments run by the current user
-     * @deprecated
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public List<ExperimentData> getWorkflowExperimentDataList() throws AiravataAPIInvocationException;
-
-	public List<ExperimentData> getExperimentDataList() throws AiravataAPIInvocationException;
-	
-    /**
-     * Retrieve all the experiments run by the given owner
-     * @deprecated
-     * @param user
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public List<ExperimentData> getWorkflowExperimentDataList(String user) throws AiravataAPIInvocationException;
-	
-	public List<ExperimentData> getExperimentDataList(String user) throws AiravataAPIInvocationException;
-
-    /**
-     * Retrieve all the experiment data run by the given owner with paging
-     * @deprecated
-     * @param user
-     * @param pageSize
-     * @param pageNo
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public List<ExperimentData> getWorkflowExperimentData(String user, int pageSize, int pageNo) throws AiravataAPIInvocationException;
-	
-	public List<ExperimentData> getExperimentData(String user, int pageSize, int pageNo) throws AiravataAPIInvocationException;
-
-	/**
-     * Retrieve all the experiment data run by the given owner with paging
-     * @deprecated
-     * @param experimentId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public ExperimentData getWorkflowExperimentData(String experimentId) throws AiravataAPIInvocationException;
-	
-	public ExperimentData getExperimentData(String experimentId) throws AiravataAPIInvocationException;
-	
-    /**
-     * Retrieve experiment data for a given workflow instance
-     * @param experimentId
-     * @param workflowInstanceId
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public WorkflowExecutionData getWorkflowInstanceData(String experimentId, String workflowInstanceId) throws AiravataAPIInvocationException;
-
-    /**
-     * Retrieve experiment data for a given workflow instance
-     * @param workflowInstance
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public WorkflowExecutionData getWorkflowInstanceData(WorkflowExecution workflowInstance) throws AiravataAPIInvocationException;
-
-    /**
-     * Retrieve output node names of a experiment
-     * @param experimentId
-     * @deprecated
-     * @return
-     * @throws AiravataAPIInvocationException
-     */
-	public String[] getWorkflowExecutionOutputNames(String experimentId) throws AiravataAPIInvocationException;
-	
-	public void setWorkflowInstanceNodeStatus(String experimentId, String workflowInstaceId, String nodeId, State status) throws AiravataAPIInvocationException;
-	
-	public void setWorkflowInstanceNodeStatus(NodeExecutionStatus status) throws AiravataAPIInvocationException;
-	
-	public NodeExecutionStatus getWorkflowInstanceNodeStatus(String experimentId, String workflowInstaceId, String nodeId) throws AiravataAPIInvocationException;
-	
-	public NodeExecutionStatus getWorkflowInstanceNodeStatus(WorkflowInstanceNode node) throws AiravataAPIInvocationException;
-	
-	public void addExperiment(String projectName, String experimentId, String experimentName) throws AiravataAPIInvocationException;
-	
-	public void addWorkflowInstance(String experimentId, WorkflowExecution workflowInstance) throws AiravataAPIInvocationException;
-	
-	//TODO setup node type for the node & gram data for the node
-
-    public List<WorkflowExecution> getExperimentWorkflowInstances(String experimentId) throws AiravataAPIInvocationException;
-
-    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;
-
-    /**
-     * @deprecated - Will be removed from 0.9 release onwards. Use {@see #addApplicationJob #updateApplicationJob(ApplucationJob) etc.} functions instead.
-     * This will store the gram specific data in to repository, this can be called before submitting the workflow in to Grid
-     * @param data
-     * @throws AiravataAPIInvocationException
-     */
-    public void updateWorkflowNodeGramData(WorkflowNodeGramData data) throws AiravataAPIInvocationException;
-     
- 	/*---------------------------------------  Managing Data for Application Jobs ------------------------------------------*/
-
-     /**
-      * Returns <code>true</code> if a Application job data is existing in Airavata
-      * @param jobId
-      * @return
-      * @throws org.apache.airavata.registry.api.exception.RegException
-      */
-     public boolean isApplicationJobExists(String jobId) throws AiravataAPIInvocationException;
-     
-     /**
-      * Adding data related to a new Application job submission
-      * @param job - the <code>jobId</code> cannot be <code>null</code>.
-      * @throws AiravataAPIInvocationException
-      */
-     public void addApplicationJob(ApplicationJob job) throws AiravataAPIInvocationException;
-     
-     /**
-      * Update data related to a existing Application job record in Airavata
-      * @param job - the <code>jobId</code> cannot be <code>null</code> and should already exist in Airavata
-      * @throws AiravataAPIInvocationException
-      */
-     public void updateApplicationJob(ApplicationJob job) throws AiravataAPIInvocationException;
-     
-     /**
-      * Update the status of the job
-      * @param jobId
-      * @param status
-      * @param statusUpdateTime
-      * @throws AiravataAPIInvocationException
-      */
-     public void updateApplicationJobStatus(String jobId, ApplicationJobStatus status, Date statusUpdateTime) throws AiravataAPIInvocationException;
-     
-	 /**
-	 * Update the status of the job for the current server time
-	 * @param jobId
-	 * @param status
-	 * @throws org.apache.airavata.registry.api.exception.RegException
-	 */
-     public void updateApplicationJobStatus(String jobId, ApplicationJobStatus status) throws AiravataAPIInvocationException;
-     
-     /**
-      * Update the job data. GFacProvider implementation should decide the job data. Typically it'll 
-      * be a serialization of the submitted job query (eg: rsl for a GRAM job) 
-      * @param jobId
-      * @param jobdata
-      * @throws AiravataAPIInvocationException
-      */
-     public void updateApplicationJobData(String jobId, String jobdata) throws AiravataAPIInvocationException;
-     
-     /**
-      * Update the time of job submission or job started executing
-      * @param jobId
-      * @param submitted
-      * @throws AiravataAPIInvocationException
-      */
-     public void updateApplicationJobSubmittedTime(String jobId, Date submitted) throws AiravataAPIInvocationException;
-     
-     /**
-      * Update the time of current job status is valid.
-      * @param jobId
-      * @param statusUpdateTime
-      * @throws AiravataAPIInvocationException
-      */
-     public void updateApplicationJobStatusUpdateTime(String jobId, Date statusUpdateTime) throws AiravataAPIInvocationException;
-     
-     /**
-      * Custom data field for users
-      * @param jobId
-      * @param metadata
-      * @throws AiravataAPIInvocationException
-      */
-     public void updateApplicationJobMetadata(String jobId, String metadata) throws AiravataAPIInvocationException;
-     
-     /**
-      * Retrieve the Application Job for the given job id
-      * @param jobId
-      * @return
-      * @throws AiravataAPIInvocationException
-      */
-     public ApplicationJob getApplicationJob(String jobId) throws AiravataAPIInvocationException;
-     
-     /**
-      * Retrieve a list of Application jobs executed for the given descriptors
-      * @param serviceDescriptionId - should be <code>null</code> if user does not care what service description the job corresponds to
-      * @param hostDescriptionId - should be <code>null</code> if user does not care what host description the job corresponds to
-      * @param applicationDescriptionId - should be <code>null</code> if user does not care what application description the job corresponds to
-      * @return
-      * @throws AiravataAPIInvocationException
-      */
-     public List<ApplicationJob> getApplicationJobsForDescriptors(String serviceDescriptionId, String hostDescriptionId, String applicationDescriptionId) throws AiravataAPIInvocationException;
-     
-     /**
-      * Retrieve a list of Application jobs executed for the given experiment credentials
-      * @param experimentId - should be <code>null</code> if user does not care what experiment the job corresponds to
-      * @param workflowExecutionId -  - should be <code>null</code> if user does not care what workflow execution the job corresponds to
-      * @param nodeId  - should be <code>null</code> if user does not care what node id the job corresponds to
-      * @return
-      * @throws AiravataAPIInvocationException
-      */
-     public List<ApplicationJob> getApplicationJobs(String experimentId, String workflowExecutionId, String nodeId) throws AiravataAPIInvocationException;
-     
-     /**
-      * Retrieve the list all the status updates for an application job.
-      * @param jobId - Application job id
-      * @return
-      * @throws AiravataAPIInvocationException
-      */
-     public List<ApplicationJobStatusData> getApplicationJobStatusHistory(String jobId) throws AiravataAPIInvocationException;
-}
+///*
+// *
+// * 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.client.api;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.Map;
+//
+//import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
+//
+///**
+// * This interface provide and API to manage all the provenance related methods, get Workflow inputs outputs
+// */
+//public interface ProvenanceManager {
+//
+//    /**
+//     * Add input port data for a node in a running instance of a Workflow
+//     * @param data
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public void setWorkflowInstanceNodeInput(WorkflowInstanceNode node, String data) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Add input port data for a node in a running instance of a Workflow
+//     * @param experimentId
+//     * @param workflowInstanceId
+//     * @param nodeId
+//     * @param data
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public void setWorkflowInstanceNodeInput(String experimentId, String workflowInstanceId, String nodeId, String data) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Add output port data for a node in a running instance of a Workflow
+//     * @param data
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public void setWorkflowInstanceNodeOutput(WorkflowInstanceNode node, String data) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Add output port data for a node in a running instance of a Workflow
+//     * @param experimentId
+//     * @param workflowInstanceId
+//     * @param nodeId
+//     * @param data
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public void setWorkflowInstanceNodeOutput(String experimentId, String workflowInstanceId, String nodeId, String data) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Get data of input ports of a node in a running instance of a Workflow
+//     * @param node
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public String getWorkflowInstanceNodeInput(WorkflowInstanceNode node) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Get data of input ports of a node in a running instance of a Workflow
+//     * @param experimentId
+//     * @param workflowInstanceId
+//     * @param nodeId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public String getWorkflowInstanceNodeInput(String experimentId, String workflowInstanceId, String nodeId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Get data of input ports of a node in all the running instance of a particular Workflow template
+//     * @param workflowTemplateId
+//     * @param nodeId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public Map<WorkflowInstanceNode,String> getWorkflowInstanceNodeInput(String workflowTemplateId, String nodeId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Get data of output ports of a node in a running instance of a Workflow
+//     * @param node
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public String getWorkflowInstanceNodeOutput(WorkflowInstanceNode node) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Get data of output ports of a node in a running instance of a Workflow
+//     * @param experimentId
+//     * @param workflowInstanceId
+//     * @param nodeId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public String getWorkflowInstanceNodeOutput(String experimentId, String workflowInstanceId, String nodeId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Get data of output ports of a node in all the running instance of a particular Workflow template
+//     * @param workflowName
+//     * @param nodeId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public Map<WorkflowInstanceNode,String> getWorkflowInstanceNodeOutput(String workflowName, String nodeId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Update the status of the Workflow instance
+//     * @param experimentId
+//     * @param workflowInstanceId
+//     * @param status
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public void setWorkflowInstanceStatus(String experimentId, String workflowInstanceId, State status) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Update the status of the Workflow instance
+//     * @param status
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public void setWorkflowInstanceStatus(WorkflowExecutionStatus status) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve the status of the Workflow instance
+//     * @param experimentId
+//     * @param workflowInstanceId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public WorkflowExecutionStatus getWorkflowInstanceStatus(String experimentId, String workflowInstanceId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve the status of the Workflow instance
+//     * @param workflowInstance
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public WorkflowExecutionStatus getWorkflowInstanceStatus(WorkflowExecution workflowInstance) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Update the User of the Workflow instance
+//     * @param experimentId
+//     * @param user
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public void setExperimentUser(String experimentId, String user) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Update the User of the Workflow instance
+//     * @param user
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public void setExperimentUser(ExperimentUser user) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve the User of the Workflow instance
+//     * @param experimentId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public ExperimentUser getExperimentUser(String experimentId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Update the metadata of the Workflow instance
+//     * @param experimentId
+//     * @param metadata
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public void setExperimentMetadata(String experimentId, String metadata) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Update the metadata of the Workflow instance
+//     * @param experimentMetadata
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public void setExperimentMetadata(ExperimentMetadata experimentMetadata) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve the metadata of the Workflow instance
+//     * @param experimentId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public ExperimentMetadata getExperimentMetadata(String experimentId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * check whether the experiment exists
+//     * @param experimentName
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//    public boolean isExperimentNameExist(String experimentName) throws AiravataAPIInvocationException;
+//
+//	   /**
+//     * Update the instance name of the Workflow
+//     * @param experimentId
+//     * @param instanceName
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public void setExperimentName(String experimentId, String instanceName) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Update the instance name of the Workflow
+//     * @param experimentName
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public void setExperimentName(ExperimentName experimentName) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve the metadata of the Workflow instance
+//     * @param experimentId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public ExperimentName getExperimentName(String experimentId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve the id's of all the experiments run by the given owner
+//     * @param owner
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public List<String> getExperimentIdList(String owner) throws AiravataAPIInvocationException;
+//
+//	public ExperimentData getExperimentMetaInformation(String experimentId)throws AiravataAPIInvocationException;
+//
+//	public List<ExperimentData> getAllExperimentMetaInformation(String user)throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve the id's of all the experiments run by the current user
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public List<String> getExperimentIdList() throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve all the experiments run by the current user
+//     * @deprecated
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public List<ExperimentData> getWorkflowExperimentDataList() throws AiravataAPIInvocationException;
+//
+//	public List<ExperimentData> getExperimentDataList() throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve all the experiments run by the given owner
+//     * @deprecated
+//     * @param user
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public List<ExperimentData> getWorkflowExperimentDataList(String user) throws AiravataAPIInvocationException;
+//
+//	public List<ExperimentData> getExperimentDataList(String user) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve all the experiment data run by the given owner with paging
+//     * @deprecated
+//     * @param user
+//     * @param pageSize
+//     * @param pageNo
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public List<ExperimentData> getWorkflowExperimentData(String user, int pageSize, int pageNo) throws AiravataAPIInvocationException;
+//
+//	public List<ExperimentData> getExperimentData(String user, int pageSize, int pageNo) throws AiravataAPIInvocationException;
+//
+//	/**
+//     * Retrieve all the experiment data run by the given owner with paging
+//     * @deprecated
+//     * @param experimentId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public ExperimentData getWorkflowExperimentData(String experimentId) throws AiravataAPIInvocationException;
+//
+//	public ExperimentData getExperimentData(String experimentId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve experiment data for a given workflow instance
+//     * @param experimentId
+//     * @param workflowInstanceId
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public WorkflowExecutionData getWorkflowInstanceData(String experimentId, String workflowInstanceId) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve experiment data for a given workflow instance
+//     * @param workflowInstance
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public WorkflowExecutionData getWorkflowInstanceData(WorkflowExecution workflowInstance) throws AiravataAPIInvocationException;
+//
+//    /**
+//     * Retrieve output node names of a experiment
+//     * @param experimentId
+//     * @deprecated
+//     * @return
+//     * @throws AiravataAPIInvocationException
+//     */
+//	public String[] getWorkflowExecutionOutputNames(String experimentId) throws AiravataAPIInvocationException;
+//
+//	public void setWorkflowInstanceNodeStatus(String experimentId, String workflowInstaceId, String nodeId, State status) throws AiravataAPIInvocationException;
+//
+//	public void setWorkflowInstanceNodeStatus(NodeExecutionStatus status) throws AiravataAPIInvocationException;
+//
+//	public NodeExecutionStatus getWorkflowInstanceNodeStatus(String experimentId, String workflowInstaceId, String nodeId) throws AiravataAPIInvocationException;
+//
+//	public NodeExecutionStatus getWorkflowInstanceNodeStatus(WorkflowInstanceNode node) throws AiravataAPIInvocationException;
+//
+//	public void addExperiment(String projectName, String experimentId, String experimentName) throws AiravataAPIInvocationException;
+//
+//	public void addWorkflowInstance(String experimentId, WorkflowExecution workflowInstance) throws AiravataAPIInvocationException;
+//
+//	//TODO setup node type for the node & gram data for the node
+//
+//    public List<WorkflowExecution> getExperimentWorkflowInstances(String experimentId) throws AiravataAPIInvocationException;
+//
+//    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;
+//
+//    /**
+//     * @deprecated - Will be removed from 0.9 release onwards. Use {@see #addApplicationJob #updateApplicationJob(ApplucationJob) etc.} functions instead.
+//     * This will store the gram specific data in to repository, this can be called before submitting the workflow in to Grid
+//     * @param data
+//     * @throws AiravataAPIInvocationException
+//     */
+//    public void updateWorkflowNodeGramData(WorkflowNodeGramData data) throws AiravataAPIInvocationException;
+//
+// 	/*---------------------------------------  Managing Data for Application Jobs ------------------------------------------*/
+//
+//     /**
+//      * Returns <code>true</code> if a Application job data is existing in Airavata
+//      * @param jobId
+//      * @return
+//      * @throws org.apache.airavata.registry.api.exception.RegException
+//      */
+//     public boolean isApplicationJobExists(String jobId) throws AiravataAPIInvocationException;
+//
+//     /**
+//      * Adding data related to a new Application job submission
+//      * @param job - the <code>jobId</code> cannot be <code>null</code>.
+//      * @throws AiravataAPIInvocationException
+//      */
+//     public void addApplicationJob(ApplicationJob job) throws AiravataAPIInvocationException;
+//
+//     /**
+//      * Update data related to a existing Application job record in Airavata
+//      * @param job - the <code>jobId</code> cannot be <code>null</code> and should already exist in Airavata
+//      * @throws AiravataAPIInvocationException
+//      */
+//     public void updateApplicationJob(ApplicationJob job) throws AiravataAPIInvocationException;
+//
+//     /**
+//      * Update the status of the job
+//      * @param jobId
+//      * @param status
+//      * @param statusUpdateTime
+//      * @throws AiravataAPIInvocationException
+//      */
+//     public void updateApplicationJobStatus(String jobId, ApplicationJobStatus status, Date statusUpdateTime) throws AiravataAPIInvocationException;
+//
+//	 /**
+//	 * Update the status of the job for the current server time
+//	 * @param jobId
+//	 * @param status
+//	 * @throws org.apache.airavata.registry.api.exception.RegException
+//	 */
+//     public void updateApplicationJobStatus(String jobId, ApplicationJobStatus status) throws AiravataAPIInvocationException;
+//
+//     /**
+//      * Update the job data. GFacProvider implementation should decide the job data. Typically it'll
+//      * be a serialization of the submitted job query (eg: rsl for a GRAM job)
+//      * @param jobId
+//      * @param jobdata
+//      * @throws AiravataAPIInvocationException
+//      */
+//     public void updateApplicationJobData(String jobId, String jobdata) throws AiravataAPIInvocationException;
+//
+//     /**
+//      * Update the time of job submission or job started executing
+//      * @param jobId
+//      * @param submitted
+//      * @throws AiravataAPIInvocationException
+//      */
+//     public void updateApplicationJobSubmittedTime(String jobId, Date submitted) throws AiravataAPIInvocationException;
+//
+//     /**
+//      * Update the time of current job status is valid.
+//      * @param jobId
+//      * @param statusUpdateTime
+//      * @throws AiravataAPIInvocationException
+//      */
+//     public void updateApplicationJobStatusUpdateTime(String jobId, Date statusUpdateTime) throws AiravataAPIInvocationException;
+//
+//     /**
+//      * Custom data field for users
+//      * @param jobId
+//      * @param metadata
+//      * @throws AiravataAPIInvocationException
+//      */
+//     public void updateApplicationJobMetadata(String jobId, String metadata) throws AiravataAPIInvocationException;
+//
+//     /**
+//      * Retrieve the Application Job for the given job id
+//      * @param jobId
+//      * @return
+//      * @throws AiravataAPIInvocationException
+//      */
+//     public ApplicationJob getApplicationJob(String jobId) throws AiravataAPIInvocationException;
+//
+//     /**
+//      * Retrieve a list of Application jobs executed for the given descriptors
+//      * @param serviceDescriptionId - should be <code>null</code> if user does not care what service description the job corresponds to
+//      * @param hostDescriptionId - should be <code>null</code> if user does not care what host description the job corresponds to
+//      * @param applicationDescriptionId - should be <code>null</code> if user does not care what application description the job corresponds to
+//      * @return
+//      * @throws AiravataAPIInvocationException
+//      */
+//     public List<ApplicationJob> getApplicationJobsForDescriptors(String serviceDescriptionId, String hostDescriptionId, String applicationDescriptionId) throws AiravataAPIInvocationException;
+//
+//     /**
+//      * Retrieve a list of Application jobs executed for the given experiment credentials
+//      * @param experimentId - should be <code>null</code> if user does not care what experiment the job corresponds to
+//      * @param workflowExecutionId -  - should be <code>null</code> if user does not care what workflow execution the job corresponds to
+//      * @param nodeId  - should be <code>null</code> if user does not care what node id the job corresponds to
+//      * @return
+//      * @throws AiravataAPIInvocationException
+//      */
+//     public List<ApplicationJob> getApplicationJobs(String experimentId, String workflowExecutionId, String nodeId) throws AiravataAPIInvocationException;
+//
+//     /**
+//      * Retrieve the list all the status updates for an application job.
+//      * @param jobId - Application job id
+//      * @return
+//      * @throws AiravataAPIInvocationException
+//      */
+//     public List<ApplicationJobStatusData> getApplicationJobStatusHistory(String jobId) throws AiravataAPIInvocationException;
+//}

http://git-wip-us.apache.org/repos/asf/airavata/blob/98f41101/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
index 640c5e7..8e58148 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/AiravataManagerImpl.java
@@ -21,18 +21,15 @@
 
 package org.apache.airavata.client.impl;
 
+import org.apache.airavata.client.AiravataClient;
+import org.apache.airavata.client.api.AiravataManager;
+import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
+
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.airavata.client.AiravataClient;
-import org.apache.airavata.client.api.AiravataManager;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.AiravataUser;
-import org.apache.airavata.registry.api.Gateway;
-
 public class AiravataManagerImpl implements AiravataManager {
 	private AiravataClient client;
 	
@@ -42,11 +39,12 @@ public class AiravataManagerImpl implements AiravataManager {
 
 	@Override
 	public List<URI> getWorkflowInterpreterServiceURLs()  throws AiravataAPIInvocationException{
-		try {
-			return getClient().getRegistryClient().getWorkflowInterpreterURIs();
-		} catch (Exception e) {
-			throw new AiravataAPIInvocationException(e);
-		}
+//		try {
+//			return getClient().getRegistryClient().getWorkflowInterpreterURIs();
+//		} catch (Exception e) {
+//			throw new AiravataAPIInvocationException(e);
+//		}
+        return null;
 	}
 
 
@@ -83,20 +81,22 @@ public class AiravataManagerImpl implements AiravataManager {
 	@Override
 	public List<URI> getMessageBoxServiceURLs()
 			throws AiravataAPIInvocationException {
-		try {
-			return new ArrayList<URI>(){{add(getClient().getRegistryClient().getMessageBoxURI());}};
-		} catch (Exception e) {
-			throw new AiravataAPIInvocationException(e);
-		}
+//		try {
+//			return new ArrayList<URI>(){{add(getClient().getRegistryClient().getMessageBoxURI());}};
+//		} catch (Exception e) {
+//			throw new AiravataAPIInvocationException(e);
+//		}
+        return null;
 	}
 
 	@Override
 	public URI getMessageBoxServiceURL() throws AiravataAPIInvocationException {
-		try {
-			return getClient().getRegistryClient().getMessageBoxURI();
-		} catch (Exception e) {
-			throw new AiravataAPIInvocationException(e);
-		}
+//		try {
+//			return getClient().getRegistryClient().getMessageBoxURI();
+//		} catch (Exception e) {
+//			throw new AiravataAPIInvocationException(e);
+//		}
+        return null;
 	}
 
 	@Override
@@ -112,20 +112,22 @@ public class AiravataManagerImpl implements AiravataManager {
 	@Override
 	public List<URI> getEventingServiceURLs()
 			throws AiravataAPIInvocationException {
-		try {
-			return new ArrayList<URI>(){{add(getClient().getRegistryClient().getEventingServiceURI());}};
-		} catch (Exception e) {
-			throw new AiravataAPIInvocationException(e);
-		}
+//		try {
+//			return new ArrayList<URI>(){{add(getClient().getRegistryClient().getEventingServiceURI());}};
+//		} catch (Exception e) {
+//			throw new AiravataAPIInvocationException(e);
+//		}
+        return null;
 	}
 
 	@Override
 	public URI getEventingServiceURL() throws AiravataAPIInvocationException {
-		try {
-			return getClient().getRegistryClient().getEventingServiceURI();
-		} catch (Exception e) {
-			throw new AiravataAPIInvocationException(e);
-		}
+//		try {
+//			return getClient().getRegistryClient().getEventingServiceURI();
+//		} catch (Exception e) {
+//			throw new AiravataAPIInvocationException(e);
+//		}
+        return null;
     }
 
 	@Override
@@ -139,166 +141,170 @@ public class AiravataManagerImpl implements AiravataManager {
 
     @Override
     public void setConfiguration(String key, String value, Date expire) throws AiravataAPIInvocationException {
-       try{
-           getClient().getRegistryClient().setConfiguration(key, value, expire);
-       }catch (Exception e){
-           throw new AiravataAPIInvocationException(e);
-       }
+//       try{
+//           getClient().getRegistryClient().setConfiguration(key, value, expire);
+//       }catch (Exception e){
+//           throw new AiravataAPIInvocationException(e);
+//       }
     }
 
     @Override
     public void addConfiguration(String key, String value, Date expire) throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().addConfiguration(key, value, expire);
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            getClient().getRegistryClient().addConfiguration(key, value, expire);
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
     
 	@Override
 	public Object getConfiguration(String key)
 			throws AiravataAPIInvocationException {
-        try{
-            return getClient().getRegistryClient().getConfiguration(key);
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            return getClient().getRegistryClient().getConfiguration(key);
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
+        return null;
 	}
 
 	@Override
 	public List<Object> getConfigurationList(String key)
 			throws AiravataAPIInvocationException {
-        try{
-            return getClient().getRegistryClient().getConfigurationList(key);
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            return getClient().getRegistryClient().getConfigurationList(key);
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
+        return null;
 	}
 
     @Override
     public void removeAllConfiguration(String key) throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().removeAllConfiguration(key);
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            getClient().getRegistryClient().removeAllConfiguration(key);
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
 
     @Override
     public void removeConfiguration(String key, String value) throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().removeConfiguration(key, value);
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            getClient().getRegistryClient().removeConfiguration(key, value);
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
 
     @Override
     public void addWorkflowInterpreterURI(URI uri) throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().addWorkflowInterpreterURI(uri);
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            getClient().getRegistryClient().addWorkflowInterpreterURI(uri);
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
 
     @Override
     public void setEventingURI(URI uri) throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().setEventingURI(uri);
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            getClient().getRegistryClient().setEventingURI(uri);
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
 
     @Override
     public void setMessageBoxURI(URI uri) throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().setMessageBoxURI(uri);
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            getClient().getRegistryClient().setMessageBoxURI(uri);
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
 
     @Override
     public void addWorkflowInterpreterURI(URI uri, Date expire) throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().addWorkflowInterpreterURI(uri, expire);
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            getClient().getRegistryClient().addWorkflowInterpreterURI(uri, expire);
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
 
     @Override
     public void setEventingURI(URI uri, Date expire) throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().setEventingURI(uri, expire);
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            getClient().getRegistryClient().setEventingURI(uri, expire);
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
 
     @Override
     public void setMessageBoxURI(URI uri, Date expire) throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().setMessageBoxURI(uri, expire);
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            getClient().getRegistryClient().setMessageBoxURI(uri, expire);
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
 
     @Override
     public void removeWorkflowInterpreterURI(URI uri) throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().removeWorkflowInterpreterURI(uri);
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            getClient().getRegistryClient().removeWorkflowInterpreterURI(uri);
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
 
     @Override
     public void removeAllWorkflowInterpreterURI() throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().removeAllWorkflowInterpreterURI();
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            getClient().getRegistryClient().removeAllWorkflowInterpreterURI();
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
 
     @Override
     public void unsetEventingURI() throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().unsetEventingURI();
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
+//        try{
+//            getClient().getRegistryClient().unsetEventingURI();
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
 
     @Override
     public void unsetMessageBoxURI() throws AiravataAPIInvocationException {
-        try{
-            getClient().getRegistryClient().unsetMessageBoxURI();
-        }catch (Exception e){
-            throw new AiravataAPIInvocationException(e);
-        }
-    }
-
-    @Override
-    public Gateway getGateway() throws AiravataAPIInvocationException {
-        try {
-			return getClient().getRegistryClient().getGateway();
-		} catch (Exception e) {
-			throw new AiravataAPIInvocationException(e);
-		}
+//        try{
+//            getClient().getRegistryClient().unsetMessageBoxURI();
+//        }catch (Exception e){
+//            throw new AiravataAPIInvocationException(e);
+//        }
     }
 
-    @Override
-    public AiravataUser getUser() throws AiravataAPIInvocationException {
-    	try{
-    		return getClient().getRegistryClient().getUser();
-    	} catch (Exception e) {
-			throw new AiravataAPIInvocationException(e);
-		}
-    }
+//    @Override
+//    public Gateway getGateway() throws AiravataAPIInvocationException {
+//        try {
+//			return getClient().getRegistryClient().getGateway();
+//		} catch (Exception e) {
+//			throw new AiravataAPIInvocationException(e);
+//		}
+//        return null;
+//    }
+
+//    @Override
+//    public AiravataUser getUser() throws AiravataAPIInvocationException {
+//    	try{
+//    		return getClient().getRegistryClient().getUser();
+//    	} catch (Exception e) {
+//			throw new AiravataAPIInvocationException(e);
+//		}
+//        return null;
+//    }
 
 }


Mime
View raw message