You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/11/14 05:01:42 UTC
[4/4] airavata git commit: removing gfac-config from pom and fixing
build issues
removing gfac-config from pom and fixing build issues
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/405d31d8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/405d31d8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/405d31d8
Branch: refs/heads/master
Commit: 405d31d89694369c3fbf5acbe6d3fc95ff921d60
Parents: a0afbd8
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Thu Nov 13 23:01:21 2014 -0500
Committer: chathuri <ka...@gmail.com>
Committed: Thu Nov 13 23:01:21 2014 -0500
----------------------------------------------------------------------
.../apache/airavata/client/AiravataClient.java | 14 +-
.../apache/airavata/client/api/AiravataAPI.java | 2 +-
.../airavata/client/api/ApplicationManager.java | 502 ++---
.../client/api/builder/DescriptorBuilder.java | 170 +-
.../client/impl/ApplicationManagerImpl.java | 994 +++++-----
.../airavata/client/tools/DocumentCreator.java | 1796 +++++++++---------
.../client/tools/DocumentCreatorNew.java | 1612 ++++++++--------
.../client/tools/UltrascanDocumentCreator.java | 888 ++++-----
.../core/utils/OrchestratorUtils.java | 7 -
9 files changed, 2986 insertions(+), 2999 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/405d31d8/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 c5aa996..c5809cc 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
@@ -56,7 +56,7 @@ public class AiravataClient extends Observable implements AiravataAPI {
private Map<String, String> configuration = new HashMap<String, String>();
private AiravataManagerImpl airavataManagerImpl;
- private ApplicationManagerImpl applicationManagerImpl;
+// private ApplicationManagerImpl applicationManagerImpl;
private WorkflowManagerImpl workflowManagerImpl;
private UserManagerImpl userManagerImpl;
// private ExecutionManagerThriftImpl executionManagerImpl;
@@ -264,12 +264,12 @@ public class AiravataClient extends Observable implements AiravataAPI {
return airavataManagerImpl;
}
- public ApplicationManager getApplicationManager() {
- if (applicationManagerImpl == null) {
- applicationManagerImpl = new ApplicationManagerImpl(this);
- }
- return applicationManagerImpl;
- }
+// public ApplicationManager getApplicationManager() {
+// if (applicationManagerImpl == null) {
+// applicationManagerImpl = new ApplicationManagerImpl(this);
+// }
+// return applicationManagerImpl;
+// }
public WorkflowManager getWorkflowManager() {
if (workflowManagerImpl == null) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/405d31d8/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 40d827d..f4d2300 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
@@ -43,7 +43,7 @@ public interface AiravataAPI {
* Returns the ApplicationManager
* @return
*/
- public ApplicationManager getApplicationManager();
+// public ApplicationManager getApplicationManager();
/**
* Returns the WorkflowManager
http://git-wip-us.apache.org/repos/asf/airavata/blob/405d31d8/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java
index 49cad9e..fe00afd 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java
@@ -26,259 +26,259 @@ import java.util.Map;
import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
import org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException;
-import org.apache.airavata.commons.gfac.type.ApplicationDescription;
-import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.commons.gfac.type.ServiceDescription;
+//import org.apache.airavata.commons.gfac.type.ApplicationDescription;
+//import org.apache.airavata.commons.gfac.type.HostDescription;
+//import org.apache.airavata.commons.gfac.type.ServiceDescription;
public interface ApplicationManager {
//Service descriptors
- /**
- * Retrieve registered service description of the given service name
- * @param serviceName
- * @return
- * @throws AiravataAPIInvocationException
- */
- public ServiceDescription getServiceDescription(String serviceName) throws AiravataAPIInvocationException;
-
- /**
- * Retrieve all registered service descriptions
- * @return
- * @throws AiravataAPIInvocationException
- */
- public List<ServiceDescription> getAllServiceDescriptions() throws AiravataAPIInvocationException;
-
- /**
- * Save service description on registry
- * @param service Service description information to update.
- * @return The service descriptor name.
- * @deprecated Deprecated since 0.6 release. User {@see #addServiceDescription} and {@see #updateServiceDescription}
- * methods instead.
- * @throws AiravataAPIInvocationException If an error occurred while updating service descriptor.
- */
- @Deprecated
- public String saveServiceDescription(ServiceDescription service)throws AiravataAPIInvocationException;
-
- /**
- * Adds a new Service descriptor to the system. If service descriptor already exists in the system
- * this will throw {@see DescriptorRecordAlreadyExistsException}. If you want to update an existing
- * service descriptor use {@see #updateServiceDescription}.
- * @param serviceDescription The service descriptor.
- * @throws AiravataAPIInvocationException If an error occurred while adding service description.
- * @throws DescriptorAlreadyExistsException If service descriptor already exists in the system.
- */
- public void addServiceDescription(ServiceDescription serviceDescription)throws AiravataAPIInvocationException,
- DescriptorAlreadyExistsException;
-
- /**
- * Updates the service descriptor.
- * @param serviceDescription Service description information to update.
- * @throws AiravataAPIInvocationException If an error occurred while updating service description.
- */
- public void updateServiceDescription(ServiceDescription serviceDescription)throws AiravataAPIInvocationException;
-
-
-
- /**
- * Delete service description from the registry
- * @param serviceName
- * @throws AiravataAPIInvocationException
- */
- public void deleteServiceDescription(String serviceName) throws AiravataAPIInvocationException;
-
- /**
- * Retrieve a list of registered service descriptions of the given regex service name
- * @param nameRegEx
- * @return
- * @throws AiravataAPIInvocationException
- */
- public List<ServiceDescription> searchServiceDescription(String nameRegEx) throws AiravataAPIInvocationException;
-
- //Application descriptors
-
- /**
- * Retrieve registered application description of the given service name & hostName
- * @param serviceName
- * @param hostName
- * @return
- * @throws AiravataAPIInvocationException
- */
- public ApplicationDescription getApplicationDescription(String serviceName, String hostName)throws AiravataAPIInvocationException;
-
- /**
- * Save deployment description on registry for a given service for a host
- * @param serviceId The service descriptor id.
- * @param hostId The host descriptor id.
- * @param app The application deployment descriptor.
- * @return The application deployment descriptor name.
- * @deprecated Deprecated since 0.6 release. Please use {@see #addApplicationDescription} and
- * {@see #updateApplicationDescription}.
- * @throws AiravataAPIInvocationException If an error occurred while adding application deployment descriptor.
- */
- @Deprecated
- public String saveApplicationDescription(String serviceId, String hostId, ApplicationDescription app)throws AiravataAPIInvocationException;
-
-
- /**
- * Adds a new deployment description associating with given service description and given host description. If
- * an association already exists this will throw {@see DescriptorRecordAlreadyExistsException} exception. If you
- * want to update an existing deployment descriptor use {@see #updateApplicationDescription}.
- * @param serviceDescription The service description to associate. Should be saved before passing to this method.
- * @param hostDescription The host description to associate, should have been saved before calling this method.
- * @param applicationDeploymentDescription The application descriptor to save.
- * @throws AiravataAPIInvocationException If an error occurred while saving application descriptor.
- * @throws DescriptorAlreadyExistsException If deployment descriptor already exists in the system.
- */
- public void addApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
- ApplicationDescription applicationDeploymentDescription)
- throws AiravataAPIInvocationException, DescriptorAlreadyExistsException;
-
- /**
- * Adds a new deployment description associating with given service description and given host description. If
- * an association already exists this will throw {@see DescriptorRecordAlreadyExistsException} exception.
- * @param serviceDescription The service description to associate. Should be saved before passing to this method.
- * @param hostDescription The host description to associate, should have been saved before calling this method.
- * @param applicationDeploymentDescription The application descriptor to save.
- * @throws AiravataAPIInvocationException If an error occurred while saving application descriptor.
- */
- public void updateApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
- ApplicationDescription applicationDeploymentDescription)
- throws AiravataAPIInvocationException;
-
- /**
- * Retrieve list of registered deployment descriptions of the given regex service name & regex host name
- * @param serviceName
- * @param hostName
- * @return
- * @throws AiravataAPIInvocationException
- */
- public List<ApplicationDescription> searchApplicationDescription(String serviceName, String hostName)throws AiravataAPIInvocationException;
-
- /**
- * Retrieve all registered deployment descriptions, The key represents the service name & host name in string array
- * @return
- * @throws AiravataAPIInvocationException
- */
- public Map<String[], ApplicationDescription> getAllApplicationDescriptions() throws AiravataAPIInvocationException;
-
- /**
- * Retrieve list of registered deployment descriptions of the given regex service name, regex host name & regex application name
- * @param serviceName
- * @param hostName
- * @param applicationName
- * @return
- * @throws AiravataAPIInvocationException
- */
- public List<ApplicationDescription> searchApplicationDescription(String serviceName, String hostName, String applicationName) throws AiravataAPIInvocationException;
-
- /**
- * Retrieve registered map of deployment descriptions for their host description of the given service name
- * @param serviceName
- * @return
- * @throws AiravataAPIInvocationException
- */
- public Map<HostDescription, List<ApplicationDescription>> searchApplicationDescription(String serviceName)throws AiravataAPIInvocationException;
-
- /**
- * Delete deployment description from the registry which is exposed as the service name in the host name
- * @param serviceName
- * @param hostName
- * @param applicationName
- * @throws AiravataAPIInvocationException
- */
- public void deleteApplicationDescription(String serviceName, String hostName, String applicationName)throws AiravataAPIInvocationException;
-
- //Host descriptors
-
- /**
- * Retrieve registered host description of the given host name
- * @param hostName
- * @return
- * @throws AiravataAPIInvocationException
- */
- public HostDescription getHostDescription(String hostName) throws AiravataAPIInvocationException;
-
- /**
- * Retrieve all registered host descriptions
- * @return
- * @throws AiravataAPIInvocationException
- */
- public List<HostDescription> getAllHostDescriptions() throws AiravataAPIInvocationException;
-
- /**
- * Save host description on registry
- * @param host The host descriptor object to update in the database.
- * @deprecated Deprecated since 0.6 release. Please use {@see #addHostDescription} and {@see #updateHostDescription}
- * @throws AiravataAPIInvocationException If an error occurred while saving the host description.
- */
- @Deprecated
- public String saveHostDescription(HostDescription host)throws AiravataAPIInvocationException;
-
-
- /**
- * Adds a new host descriptor object. If adding host descriptor already exists in the system this will throw
- * DescriptorRecordAlreadyExistsException. If user wants to update an existing host descriptor use
- * {@see #updateHostDescription(HostDescription host)} method.
- * @param host The host descriptor object to save in the database.
- * @throws AiravataAPIInvocationException If an error occurred while saving the host description.
- * @throws DescriptorAlreadyExistsException If host descriptor object already exists in the system.
- */
- public void addHostDescription (HostDescription host) throws DescriptorAlreadyExistsException,
- AiravataAPIInvocationException;
-
-
- /**
- * Updates an existing host descriptor. If you are not sure whether descriptor already exists try using
- * {@see #addHostDescription} and catch {@see DescriptorRecordAlreadyExistsException}. If caught use this method
- * to update the record.
- * @param host The host descriptor object to update in the database.
- * @throws AiravataAPIInvocationException If an error occurred while saving the host description.
- */
- public void updateHostDescription(HostDescription host)throws AiravataAPIInvocationException;
-
- /**
- * Retrieve a list of registered hsot descriptions of the given regex host name
- * @param regExName
- * @return
- * @throws AiravataAPIInvocationException
- */
- public List<HostDescription> searchHostDescription(String regExName) throws AiravataAPIInvocationException;
-
- /**
- * Delete host description from the registry
- * @param hostId
- * @throws AiravataAPIInvocationException
- */
- public void deleteHostDescription(String hostId) throws AiravataAPIInvocationException;
-
- /**
- * Map services to possible hosts
- * @param serviceName
- * @param hostName
- * @return
- * @throws AiravataAPIInvocationException
- */
- public boolean deployServiceOnHost(String serviceName, String hostName)throws AiravataAPIInvocationException;
-
- public Map<String,ApplicationDescription> getApplicationDescriptors (String serviceName) throws AiravataAPIInvocationException;
-
- public boolean isHostDescriptorExists(String descriptorName) throws AiravataAPIInvocationException;
-
- public void removeHostDescriptor(String hostName) throws AiravataAPIInvocationException;
-
- public boolean isServiceDescriptorExists(String descriptorName) throws AiravataAPIInvocationException;
-
- public boolean isApplicationDescriptorExists(String serviceName, String hostName, String descriptorName)throws AiravataAPIInvocationException;
-
- public void removeServiceDescriptor(String serviceName) throws AiravataAPIInvocationException;
-
- 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, ApplicationDescription descriptor) throws AiravataAPIInvocationException;
-
- public ApplicationDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName) throws AiravataAPIInvocationException;
+// /**
+// * Retrieve registered service description of the given service name
+// * @param serviceName
+// * @return
+// * @throws AiravataAPIInvocationException
+// */
+// public ServiceDescription getServiceDescription(String serviceName) throws AiravataAPIInvocationException;
+//
+// /**
+// * Retrieve all registered service descriptions
+// * @return
+// * @throws AiravataAPIInvocationException
+// */
+// public List<ServiceDescription> getAllServiceDescriptions() throws AiravataAPIInvocationException;
+//
+// /**
+// * Save service description on registry
+// * @param service Service description information to update.
+// * @return The service descriptor name.
+// * @deprecated Deprecated since 0.6 release. User {@see #addServiceDescription} and {@see #updateServiceDescription}
+// * methods instead.
+// * @throws AiravataAPIInvocationException If an error occurred while updating service descriptor.
+// */
+// @Deprecated
+// public String saveServiceDescription(ServiceDescription service)throws AiravataAPIInvocationException;
+//
+// /**
+// * Adds a new Service descriptor to the system. If service descriptor already exists in the system
+// * this will throw {@see DescriptorRecordAlreadyExistsException}. If you want to update an existing
+// * service descriptor use {@see #updateServiceDescription}.
+// * @param serviceDescription The service descriptor.
+// * @throws AiravataAPIInvocationException If an error occurred while adding service description.
+// * @throws DescriptorAlreadyExistsException If service descriptor already exists in the system.
+// */
+// public void addServiceDescription(ServiceDescription serviceDescription)throws AiravataAPIInvocationException,
+// DescriptorAlreadyExistsException;
+//
+// /**
+// * Updates the service descriptor.
+// * @param serviceDescription Service description information to update.
+// * @throws AiravataAPIInvocationException If an error occurred while updating service description.
+// */
+// public void updateServiceDescription(ServiceDescription serviceDescription)throws AiravataAPIInvocationException;
+//
+//
+//
+// /**
+// * Delete service description from the registry
+// * @param serviceName
+// * @throws AiravataAPIInvocationException
+// */
+// public void deleteServiceDescription(String serviceName) throws AiravataAPIInvocationException;
+//
+// /**
+// * Retrieve a list of registered service descriptions of the given regex service name
+// * @param nameRegEx
+// * @return
+// * @throws AiravataAPIInvocationException
+// */
+// public List<ServiceDescription> searchServiceDescription(String nameRegEx) throws AiravataAPIInvocationException;
+//
+// //Application descriptors
+//
+// /**
+// * Retrieve registered application description of the given service name & hostName
+// * @param serviceName
+// * @param hostName
+// * @return
+// * @throws AiravataAPIInvocationException
+// */
+// public ApplicationDescription getApplicationDescription(String serviceName, String hostName)throws AiravataAPIInvocationException;
+//
+// /**
+// * Save deployment description on registry for a given service for a host
+// * @param serviceId The service descriptor id.
+// * @param hostId The host descriptor id.
+// * @param app The application deployment descriptor.
+// * @return The application deployment descriptor name.
+// * @deprecated Deprecated since 0.6 release. Please use {@see #addApplicationDescription} and
+// * {@see #updateApplicationDescription}.
+// * @throws AiravataAPIInvocationException If an error occurred while adding application deployment descriptor.
+// */
+// @Deprecated
+// public String saveApplicationDescription(String serviceId, String hostId, ApplicationDescription app)throws AiravataAPIInvocationException;
+//
+//
+// /**
+// * Adds a new deployment description associating with given service description and given host description. If
+// * an association already exists this will throw {@see DescriptorRecordAlreadyExistsException} exception. If you
+// * want to update an existing deployment descriptor use {@see #updateApplicationDescription}.
+// * @param serviceDescription The service description to associate. Should be saved before passing to this method.
+// * @param hostDescription The host description to associate, should have been saved before calling this method.
+// * @param applicationDeploymentDescription The application descriptor to save.
+// * @throws AiravataAPIInvocationException If an error occurred while saving application descriptor.
+// * @throws DescriptorAlreadyExistsException If deployment descriptor already exists in the system.
+// */
+// public void addApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
+// ApplicationDescription applicationDeploymentDescription)
+// throws AiravataAPIInvocationException, DescriptorAlreadyExistsException;
+//
+// /**
+// * Adds a new deployment description associating with given service description and given host description. If
+// * an association already exists this will throw {@see DescriptorRecordAlreadyExistsException} exception.
+// * @param serviceDescription The service description to associate. Should be saved before passing to this method.
+// * @param hostDescription The host description to associate, should have been saved before calling this method.
+// * @param applicationDeploymentDescription The application descriptor to save.
+// * @throws AiravataAPIInvocationException If an error occurred while saving application descriptor.
+// */
+// public void updateApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
+// ApplicationDescription applicationDeploymentDescription)
+// throws AiravataAPIInvocationException;
+//
+// /**
+// * Retrieve list of registered deployment descriptions of the given regex service name & regex host name
+// * @param serviceName
+// * @param hostName
+// * @return
+// * @throws AiravataAPIInvocationException
+// */
+// public List<ApplicationDescription> searchApplicationDescription(String serviceName, String hostName)throws AiravataAPIInvocationException;
+//
+// /**
+// * Retrieve all registered deployment descriptions, The key represents the service name & host name in string array
+// * @return
+// * @throws AiravataAPIInvocationException
+// */
+// public Map<String[], ApplicationDescription> getAllApplicationDescriptions() throws AiravataAPIInvocationException;
+//
+// /**
+// * Retrieve list of registered deployment descriptions of the given regex service name, regex host name & regex application name
+// * @param serviceName
+// * @param hostName
+// * @param applicationName
+// * @return
+// * @throws AiravataAPIInvocationException
+// */
+// public List<ApplicationDescription> searchApplicationDescription(String serviceName, String hostName, String applicationName) throws AiravataAPIInvocationException;
+//
+// /**
+// * Retrieve registered map of deployment descriptions for their host description of the given service name
+// * @param serviceName
+// * @return
+// * @throws AiravataAPIInvocationException
+// */
+// public Map<HostDescription, List<ApplicationDescription>> searchApplicationDescription(String serviceName)throws AiravataAPIInvocationException;
+//
+// /**
+// * Delete deployment description from the registry which is exposed as the service name in the host name
+// * @param serviceName
+// * @param hostName
+// * @param applicationName
+// * @throws AiravataAPIInvocationException
+// */
+// public void deleteApplicationDescription(String serviceName, String hostName, String applicationName)throws AiravataAPIInvocationException;
+//
+// //Host descriptors
+//
+// /**
+// * Retrieve registered host description of the given host name
+// * @param hostName
+// * @return
+// * @throws AiravataAPIInvocationException
+// */
+// public HostDescription getHostDescription(String hostName) throws AiravataAPIInvocationException;
+//
+// /**
+// * Retrieve all registered host descriptions
+// * @return
+// * @throws AiravataAPIInvocationException
+// */
+// public List<HostDescription> getAllHostDescriptions() throws AiravataAPIInvocationException;
+//
+// /**
+// * Save host description on registry
+// * @param host The host descriptor object to update in the database.
+// * @deprecated Deprecated since 0.6 release. Please use {@see #addHostDescription} and {@see #updateHostDescription}
+// * @throws AiravataAPIInvocationException If an error occurred while saving the host description.
+// */
+// @Deprecated
+// public String saveHostDescription(HostDescription host)throws AiravataAPIInvocationException;
+//
+//
+// /**
+// * Adds a new host descriptor object. If adding host descriptor already exists in the system this will throw
+// * DescriptorRecordAlreadyExistsException. If user wants to update an existing host descriptor use
+// * {@see #updateHostDescription(HostDescription host)} method.
+// * @param host The host descriptor object to save in the database.
+// * @throws AiravataAPIInvocationException If an error occurred while saving the host description.
+// * @throws DescriptorAlreadyExistsException If host descriptor object already exists in the system.
+// */
+// public void addHostDescription (HostDescription host) throws DescriptorAlreadyExistsException,
+// AiravataAPIInvocationException;
+//
+//
+// /**
+// * Updates an existing host descriptor. If you are not sure whether descriptor already exists try using
+// * {@see #addHostDescription} and catch {@see DescriptorRecordAlreadyExistsException}. If caught use this method
+// * to update the record.
+// * @param host The host descriptor object to update in the database.
+// * @throws AiravataAPIInvocationException If an error occurred while saving the host description.
+// */
+// public void updateHostDescription(HostDescription host)throws AiravataAPIInvocationException;
+//
+// /**
+// * Retrieve a list of registered hsot descriptions of the given regex host name
+// * @param regExName
+// * @return
+// * @throws AiravataAPIInvocationException
+// */
+// public List<HostDescription> searchHostDescription(String regExName) throws AiravataAPIInvocationException;
+//
+// /**
+// * Delete host description from the registry
+// * @param hostId
+// * @throws AiravataAPIInvocationException
+// */
+// public void deleteHostDescription(String hostId) throws AiravataAPIInvocationException;
+//
+// /**
+// * Map services to possible hosts
+// * @param serviceName
+// * @param hostName
+// * @return
+// * @throws AiravataAPIInvocationException
+// */
+// public boolean deployServiceOnHost(String serviceName, String hostName)throws AiravataAPIInvocationException;
+//
+// public Map<String,ApplicationDescription> getApplicationDescriptors (String serviceName) throws AiravataAPIInvocationException;
+//
+// public boolean isHostDescriptorExists(String descriptorName) throws AiravataAPIInvocationException;
+//
+// public void removeHostDescriptor(String hostName) throws AiravataAPIInvocationException;
+//
+// public boolean isServiceDescriptorExists(String descriptorName) throws AiravataAPIInvocationException;
+//
+// public boolean isApplicationDescriptorExists(String serviceName, String hostName, String descriptorName)throws AiravataAPIInvocationException;
+//
+// public void removeServiceDescriptor(String serviceName) throws AiravataAPIInvocationException;
+//
+// 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, ApplicationDescription descriptor) throws AiravataAPIInvocationException;
+//
+// public ApplicationDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName) throws AiravataAPIInvocationException;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/405d31d8/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java
index 22e0788..51821b9 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java
@@ -22,13 +22,7 @@
package org.apache.airavata.client.api.builder;
import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.commons.gfac.type.ApplicationDescription;
-import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.schemas.gfac.*;
-import org.apache.xmlbeans.SchemaType;
-import java.util.List;
/**
* This class provides set of utility methods to create descriptors. Following descriptors are included.
@@ -63,12 +57,12 @@ public class DescriptorBuilder {
* @throws AiravataAPIInvocationException
* If provided host address does not comply with IP address format or host name format.
*/
- public HostDescription buildHostDescription(HostDescriptionType type, String hostName, String hostAddress)
- throws AiravataAPIInvocationException {
-
- return buildHostDescription(type.schemaType(), hostName, hostAddress);
-
- }
+// public HostDescription buildHostDescription(HostDescriptionType type, String hostName, String hostAddress)
+// throws AiravataAPIInvocationException {
+//
+// return buildHostDescription(type.schemaType(), hostName, hostAddress);
+//
+// }
/**
* Builds a host descriptor object. Host descriptor gives information about application hosted machine.
@@ -86,21 +80,21 @@ public class DescriptorBuilder {
* @throws AiravataAPIInvocationException
* If provided host address does not comply with IP address format or host name format.
*/
- public HostDescription buildHostDescription(SchemaType schemaType, String hostName, String hostAddress)
- throws AiravataAPIInvocationException {
-
- if (!validateHostAddress(hostAddress)) {
- throw new AiravataAPIInvocationException("Invalid host address. Host address should be "
- + "either an IP address or a valid host name.");
- }
-
- HostDescription hostDescription = new HostDescription(schemaType);
- hostDescription.getType().setHostName(hostName);
- hostDescription.getType().setHostAddress(hostAddress);
-
- return hostDescription;
-
- }
+// public HostDescription buildHostDescription(SchemaType schemaType, String hostName, String hostAddress)
+// throws AiravataAPIInvocationException {
+//
+// if (!validateHostAddress(hostAddress)) {
+// throw new AiravataAPIInvocationException("Invalid host address. Host address should be "
+// + "either an IP address or a valid host name.");
+// }
+//
+// HostDescription hostDescription = new HostDescription(schemaType);
+// hostDescription.getType().setHostName(hostName);
+// hostDescription.getType().setHostAddress(hostAddress);
+//
+// return hostDescription;
+//
+// }
/**
* Create an input parameter.
@@ -115,20 +109,20 @@ public class DescriptorBuilder {
* @see org.apache.airavata.schemas.gfac.DataType.Enum
* @return Encapsulating InputParameterType object.
*/
- public InputParameterType buildInputParameterType(String parameterName, String parameterDescription,
- DataType.Enum parameterDataType) {
-
- InputParameterType parameter = InputParameterType.Factory.newInstance();
- parameter.setParameterName(parameterName);
- parameter.setParameterDescription(parameterDescription);
-
- ParameterType parameterType = parameter.addNewParameterType();
- parameterType.setType(parameterDataType);
- parameterType.setName(parameterDataType.toString());
-
- return parameter;
-
- }
+// public InputParameterType buildInputParameterType(String parameterName, String parameterDescription,
+// DataType.Enum parameterDataType) {
+//
+// InputParameterType parameter = InputParameterType.Factory.newInstance();
+// parameter.setParameterName(parameterName);
+// parameter.setParameterDescription(parameterDescription);
+//
+// ParameterType parameterType = parameter.addNewParameterType();
+// parameterType.setType(parameterDataType);
+// parameterType.setName(parameterDataType.toString());
+//
+// return parameter;
+//
+// }
/**
* Create an input parameter.
@@ -143,20 +137,20 @@ public class DescriptorBuilder {
* @see org.apache.airavata.schemas.gfac.DataType.Enum
* @return Encapsulating InputParameterType object.
*/
- public OutputParameterType buildOutputParameterType(String parameterName, String parameterDescription,
- DataType.Enum parameterDataType) {
-
- OutputParameterType parameter = OutputParameterType.Factory.newInstance();
- parameter.setParameterName(parameterName);
- parameter.setParameterDescription(parameterDescription);
-
- ParameterType parameterType = parameter.addNewParameterType();
- parameterType.setType(parameterDataType);
- parameterType.setName(parameterDataType.toString());
-
- return parameter;
-
- }
+// public OutputParameterType buildOutputParameterType(String parameterName, String parameterDescription,
+// DataType.Enum parameterDataType) {
+//
+// OutputParameterType parameter = OutputParameterType.Factory.newInstance();
+// parameter.setParameterName(parameterName);
+// parameter.setParameterDescription(parameterDescription);
+//
+// ParameterType parameterType = parameter.addNewParameterType();
+// parameterType.setType(parameterDataType);
+// parameterType.setName(parameterDataType.toString());
+//
+// return parameter;
+//
+// }
/**
* Creates a ServiceDescription object. This includes information about the service. Mainly we are focusing on
@@ -178,37 +172,37 @@ public class DescriptorBuilder {
* Output parameter types.
* @return A ServiceDescription object with above information encapsulated.
*/
- public ServiceDescription buildServiceDescription(String serviceName, String description,
- List<InputParameterType> inputParameterTypes, List<OutputParameterType> outputParameterTypes) {
-
- ServiceDescription serviceDescription = new ServiceDescription();
- serviceDescription.getType().setName(serviceName);
- serviceDescription.getType().setDescription(description);
-
- serviceDescription.getType().setInputParametersArray(
- inputParameterTypes.toArray(new InputParameterType[inputParameterTypes.size()]));
- serviceDescription.getType().setOutputParametersArray(
- outputParameterTypes.toArray(new OutputParameterType[outputParameterTypes.size()]));
-
- return serviceDescription;
-
- }
-
- public ApplicationDescription buildApplicationDeploymentDescription(String applicationName, String executablePath,
- String workingDirectory) {
-
- ApplicationDescription applicationDeploymentDescription = new ApplicationDescription();
- ApplicationDeploymentDescriptionType applicationDeploymentDescriptionType = applicationDeploymentDescription
- .getType();
- applicationDeploymentDescriptionType.addNewApplicationName().setStringValue(applicationName);
- applicationDeploymentDescriptionType.setExecutableLocation(executablePath);
- applicationDeploymentDescriptionType.setScratchWorkingDirectory(workingDirectory);
-
- return applicationDeploymentDescription;
-
- }
-
- private boolean validateHostAddress(String hostAddress) {
- return hostAddress.matches(IP_ADDRESS_VALIDATION_STRING) || hostAddress.matches(HOST_NAME_VALIDATION_STRING);
- }
+// public ServiceDescription buildServiceDescription(String serviceName, String description,
+// List<InputParameterType> inputParameterTypes, List<OutputParameterType> outputParameterTypes) {
+//
+// ServiceDescription serviceDescription = new ServiceDescription();
+// serviceDescription.getType().setName(serviceName);
+// serviceDescription.getType().setDescription(description);
+//
+// serviceDescription.getType().setInputParametersArray(
+// inputParameterTypes.toArray(new InputParameterType[inputParameterTypes.size()]));
+// serviceDescription.getType().setOutputParametersArray(
+// outputParameterTypes.toArray(new OutputParameterType[outputParameterTypes.size()]));
+//
+// return serviceDescription;
+//
+// }
+//
+// public ApplicationDescription buildApplicationDeploymentDescription(String applicationName, String executablePath,
+// String workingDirectory) {
+//
+// ApplicationDescription applicationDeploymentDescription = new ApplicationDescription();
+// ApplicationDeploymentDescriptionType applicationDeploymentDescriptionType = applicationDeploymentDescription
+// .getType();
+// applicationDeploymentDescriptionType.addNewApplicationName().setStringValue(applicationName);
+// applicationDeploymentDescriptionType.setExecutableLocation(executablePath);
+// applicationDeploymentDescriptionType.setScratchWorkingDirectory(workingDirectory);
+//
+// return applicationDeploymentDescription;
+//
+// }
+//
+// private boolean validateHostAddress(String hostAddress) {
+// return hostAddress.matches(IP_ADDRESS_VALIDATION_STRING) || hostAddress.matches(HOST_NAME_VALIDATION_STRING);
+// }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/405d31d8/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
index f962bfb..f943174 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
@@ -1,497 +1,497 @@
-/*
- *
- * 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.impl;
-
-import org.apache.airavata.client.AiravataClient;
-import org.apache.airavata.client.api.ApplicationManager;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException;
-import org.apache.airavata.commons.gfac.type.ApplicationDescription;
-import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.commons.gfac.type.ServiceDescription;
-
-import java.util.List;
-import java.util.Map;
-
-public class ApplicationManagerImpl implements ApplicationManager {
- private AiravataClient client;
-
- public ApplicationManagerImpl(AiravataClient client) {
- setClient(client);
- }
-
- @Override
- public ServiceDescription getServiceDescription(String serviceId)
- throws AiravataAPIInvocationException {
-// try {
-// ServiceDescription desc = getClient().getRegistryClient().getServiceDescriptor(serviceId);
-// if(desc!=null){
-// return desc;
-// }
-//// throw new AiravataAPIInvocationException(new Exception("Service Description not found in registry."));
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return null;
- }
-
- @Override
- public List<ServiceDescription> getAllServiceDescriptions()
- throws AiravataAPIInvocationException {
-// try {
-// return getClient().getRegistryClient().getServiceDescriptors();
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return null;
- }
-
- @Override
- public String saveServiceDescription(ServiceDescription service)
- throws AiravataAPIInvocationException {
-// try {
-// if (getClient().getRegistryClient().isServiceDescriptorExists(service.getType().getName())) {
-// getClient().getRegistryClient().updateServiceDescriptor(service);
-// }else{
-// getClient().getRegistryClient().addServiceDescriptor(service);
-// }
-// return service.getType().getName();
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return null;
- }
-
- @Override
- public void addServiceDescription(ServiceDescription serviceDescription) throws DescriptorAlreadyExistsException,
- AiravataAPIInvocationException{
-// try {
-// getClient().getRegistryClient().addServiceDescriptor(serviceDescription);
-// } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) {
-// throw new DescriptorAlreadyExistsException("Service descriptor "
-// + serviceDescription.getType().getName()
-// + " already exists.", e);
-// } catch (RegException e) {
-// throw new AiravataAPIInvocationException("An internal error occurred while trying to add service descriptor"
-// + serviceDescription.getType().getName(),
-// e);
-// } catch (AiravataConfigurationException e) {
-// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
-// "An error occurred while trying to " +
-// "add service descriptor" + serviceDescription.getType().getName(), e);
-// }
- }
-
- @Override
- public void updateServiceDescription(ServiceDescription serviceDescription) throws AiravataAPIInvocationException {
-// try {
-// getClient().getRegistryClient().updateServiceDescriptor(serviceDescription);
-// } catch (RegException e) {
-// throw new AiravataAPIInvocationException("An internal error occurred while trying to add service descriptor"
-// + serviceDescription.getType().getName(),
-// e);
-// } catch (AiravataConfigurationException e) {
-// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
-// "An error occurred while trying to " +
-// "add service descriptor" + serviceDescription.getType().getName(), e);
-// }
- }
-
-
- @Override
- public void deleteServiceDescription(String serviceId)
- throws AiravataAPIInvocationException {
-// try {
-// getClient().getRegistryClient().removeServiceDescriptor(serviceId);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
-
- }
-
- @Override
- public List<ServiceDescription> searchServiceDescription(String nameRegEx)
- throws AiravataAPIInvocationException {
-// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
- return null;
- }
-
- @Override
- public ApplicationDescription getApplicationDescription(
- String serviceId, String hostId)
- throws AiravataAPIInvocationException {
-// try {
-// return getClient().getRegistryClient().getApplicationDescriptors(serviceId, hostId);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return null;
- }
-
- @Override
- public String saveApplicationDescription(String serviceId, String hostId,
- ApplicationDescription app)
- throws AiravataAPIInvocationException {
-// try {
-// if (getClient().getRegistryClient().isApplicationDescriptorExists(serviceId, hostId, app.getType().getApplicationName().getStringValue())) {
-// getClient().getRegistryClient().updateApplicationDescriptor(serviceId, hostId, app);
-// }else{
-// getClient().getRegistryClient().addApplicationDescriptor(serviceId, hostId, app);
-// }
-// return app.getType().getApplicationName().getStringValue();
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return null;
- }
-
-
- @Override
- public void addApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
- ApplicationDescription applicationDeploymentDescription)
- throws DescriptorAlreadyExistsException, AiravataAPIInvocationException{
-
-// try {
-// getClient().getRegistryClient().addApplicationDescriptor(serviceDescription.getType().getName(),
-// hostDescription.getType().getHostName(), applicationDeploymentDescription);
-// } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) {
-// throw new DescriptorAlreadyExistsException("Application descriptor " +
-// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
-// + " already associated to host " + hostDescription.getType().getHostName()
-// + " and service " + serviceDescription.getType().getName(), e);
-// } catch (RegException e) {
-//
-// throw new AiravataAPIInvocationException("An internal error occurred while trying to add " +
-// "application descriptor " +
-// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
-// + " associated to host " + hostDescription.getType().getHostName()
-// + " and service " + serviceDescription.getType().getName(), e);
-//
-// } catch (AiravataConfigurationException e) {
-//
-// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
-// "An error occurred while trying to add application descriptor " +
-// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
-// + " associated to host " + hostDescription.getType().getHostName()
-// + " and service " + serviceDescription.getType().getName(), e);
-// }
-
- }
-
- @Override
- public void updateApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
- ApplicationDescription applicationDeploymentDescription)
- throws AiravataAPIInvocationException {
-// try {
-// getClient().getRegistryClient().updateApplicationDescriptor(serviceDescription.getType().getName(),
-// hostDescription.getType().getHostName(), applicationDeploymentDescription);
-// } catch (RegException e) {
-//
-// throw new AiravataAPIInvocationException("An internal error occurred while trying to add " +
-// "application descriptor " +
-// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
-// + " associated to host " + hostDescription.getType().getHostName()
-// + " and service " + serviceDescription.getType().getName(), e);
-//
-// } catch (AiravataConfigurationException e) {
-//
-// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
-// "An error occurred while trying to add application descriptor " +
-// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
-// + " associated to host " + hostDescription.getType().getHostName()
-// + " and service " + serviceDescription.getType().getName(), e);
-// }
- }
-
-
- @Override
- public List<ApplicationDescription> searchApplicationDescription(
- String serviceName, String hostName)
- throws AiravataAPIInvocationException {
-// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
- return null;
- }
-
- @Override
- public Map<String[], ApplicationDescription> getAllApplicationDescriptions()
- throws AiravataAPIInvocationException {
-// try {
-// return getClient().getRegistryClient().getApplicationDescriptors();
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return null;
- }
-
- @Override
- public List<ApplicationDescription> searchApplicationDescription(
- String serviceName, String hostName, String applicationName)
- throws AiravataAPIInvocationException {
-// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
- return null;
- }
-
- @Override
- public Map<HostDescription, List<ApplicationDescription>> searchApplicationDescription(
- String serviceName) throws AiravataAPIInvocationException {
-// try {
-// Map<HostDescription, List<ApplicationDescription>> map=new HashMap<HostDescription, List<ApplicationDescription>>();
-// Map<String, ApplicationDescription> applicationDescriptors = getClient().getRegistryClient().getApplicationDescriptors(serviceName);
-// for (String hostName : applicationDescriptors.keySet()) {
-// ArrayList<ApplicationDescription> list = new ArrayList<ApplicationDescription>();
-// list.add(applicationDescriptors.get(hostName));
-// map.put(getClient().getRegistryClient().getHostDescriptor(hostName),list);
-// }
-// return map;
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return null;
- }
-
- @Override
- public void deleteApplicationDescription(String serviceName,
- String hostName, String applicationName)
- throws AiravataAPIInvocationException {
-// try {
-// getClient().getRegistryClient().removeApplicationDescriptor(serviceName, hostName, applicationName);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
-
- }
-
- @Override
- public HostDescription getHostDescription(String hostId)
- throws AiravataAPIInvocationException {
-// try {
-// return getClient().getRegistryClient().getHostDescriptor(hostId);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return null;
- }
-
- @Override
- public List<HostDescription> getAllHostDescriptions()
- throws AiravataAPIInvocationException {
-// try {
-// return getClient().getRegistryClient().getHostDescriptors();
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return null;
- }
-
- @Override
- public String saveHostDescription(HostDescription host)
- throws AiravataAPIInvocationException {
-// try {
-// if (getClient().getRegistryClient().isHostDescriptorExists(host.getType().getHostName())) {
-// getClient().getRegistryClient().updateHostDescriptor(host);
-// }else{
-// getClient().getRegistryClient().addHostDescriptor(host);
-// }
-// return host.getType().getHostName();
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return null;
- }
-
- @Override
- public void addHostDescription(HostDescription host) throws DescriptorAlreadyExistsException,
- AiravataAPIInvocationException{
-
-// try {
-// getClient().getRegistryClient().addHostDescriptor(host);
-// } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) {
-// throw new DescriptorAlreadyExistsException("Host descriptor " + host.getType().getHostName()
-// + " already exists.", e);
-// } catch (RegException e) {
-// throw new AiravataAPIInvocationException("An internal error occurred while trying to add host descriptor"
-// + host.getType().getHostName(),
-// e);
-// } catch (AiravataConfigurationException e) {
-// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
-// "An error occurred while trying to " +
-// "add host descriptor" + host.getType().getHostName(), e);
-// }
-
- }
-
- @Override
- public void updateHostDescription(HostDescription host) throws AiravataAPIInvocationException {
-// try {
-// getClient().getRegistryClient().updateHostDescriptor(host);
-// } catch (RegException e) {
-// throw new AiravataAPIInvocationException("An internal error occurred while trying to add host descriptor"
-// + host.getType().getHostName(),
-// e);
-// } catch (AiravataConfigurationException e) {
-// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
-// "An error occurred while trying to " +
-// "add host descriptor" + host.getType().getHostName(), e);
-// }
- }
-
-
- @Override
- public List<HostDescription> searchHostDescription(String regExName)
- throws AiravataAPIInvocationException {
-// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
- return null;
- }
-
- @Override
- public void deleteHostDescription(String hostId)
- throws AiravataAPIInvocationException {
-// try {
-// getClient().getRegistryClient().removeHostDescriptor(hostId);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- }
-
- @Override
- public boolean deployServiceOnHost(String serviceName, String hostName)
- throws AiravataAPIInvocationException {
-// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
- return false;
- }
-
- @Override
- public Map<String, ApplicationDescription> getApplicationDescriptors(String serviceName) throws AiravataAPIInvocationException {
-// try{
-// Map<String, ApplicationDescription> applicationDescriptors = getClient().getRegistryClient().getApplicationDescriptors(serviceName);
-// return applicationDescriptors;
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return null;
- }
-
- @Override
- public boolean isHostDescriptorExists(String descriptorName) throws AiravataAPIInvocationException {
-// try {
-// return getClient().getRegistryClient().isHostDescriptorExists(descriptorName);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return false;
- }
-
- @Override
- public void removeHostDescriptor(String hostName) throws AiravataAPIInvocationException {
-// try {
-// getClient().getRegistryClient().removeHostDescriptor(hostName);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- }
-
- @Override
- public boolean isServiceDescriptorExists(String descriptorName) throws AiravataAPIInvocationException {
-// try {
-// return getClient().getRegistryClient().isServiceDescriptorExists(descriptorName);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return false;
- }
-
- @Override
- public void removeServiceDescriptor(String serviceName) throws AiravataAPIInvocationException {
-// try {
-// getClient().getRegistryClient().removeServiceDescriptor(serviceName);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- }
-
- @Override
- public void removeApplicationDescriptor(String serviceName, String hostName, String applicationName) throws AiravataAPIInvocationException {
-// try {
-// getClient().getRegistryClient().removeApplicationDescriptor(serviceName, hostName, applicationName);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- }
-
- @Override
- public void updateHostDescriptor(HostDescription descriptor) throws AiravataAPIInvocationException {
-// try {
-// getClient().getRegistryClient().updateHostDescriptor(descriptor);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- }
-
- @Override
- public void updateServiceDescriptor(ServiceDescription descriptor) throws AiravataAPIInvocationException {
-// try {
-// getClient().getRegistryClient().updateServiceDescriptor(descriptor);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- }
-
- @Override
- public void updateApplicationDescriptor(String serviceName, String hostName, ApplicationDescription descriptor) throws AiravataAPIInvocationException {
-// try {
-// getClient().getRegistryClient().updateApplicationDescriptor(serviceName, hostName, descriptor);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- }
-
- @Override
- public ApplicationDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName) throws AiravataAPIInvocationException {
-// try {
-// return getClient().getRegistryClient().getApplicationDescriptor(serviceName, hostname, applicationName);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return null;
- }
-
- public AiravataClient getClient() {
- return client;
- }
-
- public void setClient(AiravataClient client) {
- this.client = client;
- }
-
- @Override
- public boolean isApplicationDescriptorExists(String serviceName,
- String hostName, String descriptorName)
- throws AiravataAPIInvocationException {
-// try {
-// return getClient().getRegistryClient().isApplicationDescriptorExists(serviceName, hostName, descriptorName);
-// } catch (Exception e) {
-// throw new AiravataAPIInvocationException(e);
-// }
- return false;
- }
-
-}
+///*
+// *
+// * 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.impl;
+//
+//import org.apache.airavata.client.AiravataClient;
+//import org.apache.airavata.client.api.ApplicationManager;
+//import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
+//import org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException;
+//import org.apache.airavata.commons.gfac.type.ApplicationDescription;
+//import org.apache.airavata.commons.gfac.type.HostDescription;
+//import org.apache.airavata.commons.gfac.type.ServiceDescription;
+//
+//import java.util.List;
+//import java.util.Map;
+//
+//public class ApplicationManagerImpl implements ApplicationManager {
+// private AiravataClient client;
+//
+// public ApplicationManagerImpl(AiravataClient client) {
+// setClient(client);
+// }
+//
+// @Override
+// public ServiceDescription getServiceDescription(String serviceId)
+// throws AiravataAPIInvocationException {
+//// try {
+//// ServiceDescription desc = getClient().getRegistryClient().getServiceDescriptor(serviceId);
+//// if(desc!=null){
+//// return desc;
+//// }
+////// throw new AiravataAPIInvocationException(new Exception("Service Description not found in registry."));
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
+//
+// @Override
+// public List<ServiceDescription> getAllServiceDescriptions()
+// throws AiravataAPIInvocationException {
+//// try {
+//// return getClient().getRegistryClient().getServiceDescriptors();
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
+//
+// @Override
+// public String saveServiceDescription(ServiceDescription service)
+// throws AiravataAPIInvocationException {
+//// try {
+//// if (getClient().getRegistryClient().isServiceDescriptorExists(service.getType().getName())) {
+//// getClient().getRegistryClient().updateServiceDescriptor(service);
+//// }else{
+//// getClient().getRegistryClient().addServiceDescriptor(service);
+//// }
+//// return service.getType().getName();
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
+//
+// @Override
+// public void addServiceDescription(ServiceDescription serviceDescription) throws DescriptorAlreadyExistsException,
+// AiravataAPIInvocationException{
+//// try {
+//// getClient().getRegistryClient().addServiceDescriptor(serviceDescription);
+//// } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) {
+//// throw new DescriptorAlreadyExistsException("Service descriptor "
+//// + serviceDescription.getType().getName()
+//// + " already exists.", e);
+//// } catch (RegException e) {
+//// throw new AiravataAPIInvocationException("An internal error occurred while trying to add service descriptor"
+//// + serviceDescription.getType().getName(),
+//// e);
+//// } catch (AiravataConfigurationException e) {
+//// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
+//// "An error occurred while trying to " +
+//// "add service descriptor" + serviceDescription.getType().getName(), e);
+//// }
+// }
+//
+// @Override
+// public void updateServiceDescription(ServiceDescription serviceDescription) throws AiravataAPIInvocationException {
+//// try {
+//// getClient().getRegistryClient().updateServiceDescriptor(serviceDescription);
+//// } catch (RegException e) {
+//// throw new AiravataAPIInvocationException("An internal error occurred while trying to add service descriptor"
+//// + serviceDescription.getType().getName(),
+//// e);
+//// } catch (AiravataConfigurationException e) {
+//// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
+//// "An error occurred while trying to " +
+//// "add service descriptor" + serviceDescription.getType().getName(), e);
+//// }
+// }
+//
+//
+// @Override
+// public void deleteServiceDescription(String serviceId)
+// throws AiravataAPIInvocationException {
+//// try {
+//// getClient().getRegistryClient().removeServiceDescriptor(serviceId);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+//
+// }
+//
+// @Override
+// public List<ServiceDescription> searchServiceDescription(String nameRegEx)
+// throws AiravataAPIInvocationException {
+//// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+// return null;
+// }
+//
+// @Override
+// public ApplicationDescription getApplicationDescription(
+// String serviceId, String hostId)
+// throws AiravataAPIInvocationException {
+//// try {
+//// return getClient().getRegistryClient().getApplicationDescriptors(serviceId, hostId);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
+//
+// @Override
+// public String saveApplicationDescription(String serviceId, String hostId,
+// ApplicationDescription app)
+// throws AiravataAPIInvocationException {
+//// try {
+//// if (getClient().getRegistryClient().isApplicationDescriptorExists(serviceId, hostId, app.getType().getApplicationName().getStringValue())) {
+//// getClient().getRegistryClient().updateApplicationDescriptor(serviceId, hostId, app);
+//// }else{
+//// getClient().getRegistryClient().addApplicationDescriptor(serviceId, hostId, app);
+//// }
+//// return app.getType().getApplicationName().getStringValue();
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
+//
+//
+// @Override
+// public void addApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
+// ApplicationDescription applicationDeploymentDescription)
+// throws DescriptorAlreadyExistsException, AiravataAPIInvocationException{
+//
+//// try {
+//// getClient().getRegistryClient().addApplicationDescriptor(serviceDescription.getType().getName(),
+//// hostDescription.getType().getHostName(), applicationDeploymentDescription);
+//// } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) {
+//// throw new DescriptorAlreadyExistsException("Application descriptor " +
+//// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
+//// + " already associated to host " + hostDescription.getType().getHostName()
+//// + " and service " + serviceDescription.getType().getName(), e);
+//// } catch (RegException e) {
+////
+//// throw new AiravataAPIInvocationException("An internal error occurred while trying to add " +
+//// "application descriptor " +
+//// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
+//// + " associated to host " + hostDescription.getType().getHostName()
+//// + " and service " + serviceDescription.getType().getName(), e);
+////
+//// } catch (AiravataConfigurationException e) {
+////
+//// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
+//// "An error occurred while trying to add application descriptor " +
+//// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
+//// + " associated to host " + hostDescription.getType().getHostName()
+//// + " and service " + serviceDescription.getType().getName(), e);
+//// }
+//
+// }
+//
+// @Override
+// public void updateApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
+// ApplicationDescription applicationDeploymentDescription)
+// throws AiravataAPIInvocationException {
+//// try {
+//// getClient().getRegistryClient().updateApplicationDescriptor(serviceDescription.getType().getName(),
+//// hostDescription.getType().getHostName(), applicationDeploymentDescription);
+//// } catch (RegException e) {
+////
+//// throw new AiravataAPIInvocationException("An internal error occurred while trying to add " +
+//// "application descriptor " +
+//// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
+//// + " associated to host " + hostDescription.getType().getHostName()
+//// + " and service " + serviceDescription.getType().getName(), e);
+////
+//// } catch (AiravataConfigurationException e) {
+////
+//// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
+//// "An error occurred while trying to add application descriptor " +
+//// applicationDeploymentDescription.getType().getApplicationName().getStringValue()
+//// + " associated to host " + hostDescription.getType().getHostName()
+//// + " and service " + serviceDescription.getType().getName(), e);
+//// }
+// }
+//
+//
+// @Override
+// public List<ApplicationDescription> searchApplicationDescription(
+// String serviceName, String hostName)
+// throws AiravataAPIInvocationException {
+//// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+// return null;
+// }
+//
+// @Override
+// public Map<String[], ApplicationDescription> getAllApplicationDescriptions()
+// throws AiravataAPIInvocationException {
+//// try {
+//// return getClient().getRegistryClient().getApplicationDescriptors();
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
+//
+// @Override
+// public List<ApplicationDescription> searchApplicationDescription(
+// String serviceName, String hostName, String applicationName)
+// throws AiravataAPIInvocationException {
+//// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+// return null;
+// }
+//
+// @Override
+// public Map<HostDescription, List<ApplicationDescription>> searchApplicationDescription(
+// String serviceName) throws AiravataAPIInvocationException {
+//// try {
+//// Map<HostDescription, List<ApplicationDescription>> map=new HashMap<HostDescription, List<ApplicationDescription>>();
+//// Map<String, ApplicationDescription> applicationDescriptors = getClient().getRegistryClient().getApplicationDescriptors(serviceName);
+//// for (String hostName : applicationDescriptors.keySet()) {
+//// ArrayList<ApplicationDescription> list = new ArrayList<ApplicationDescription>();
+//// list.add(applicationDescriptors.get(hostName));
+//// map.put(getClient().getRegistryClient().getHostDescriptor(hostName),list);
+//// }
+//// return map;
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
+//
+// @Override
+// public void deleteApplicationDescription(String serviceName,
+// String hostName, String applicationName)
+// throws AiravataAPIInvocationException {
+//// try {
+//// getClient().getRegistryClient().removeApplicationDescriptor(serviceName, hostName, applicationName);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+//
+// }
+//
+// @Override
+// public HostDescription getHostDescription(String hostId)
+// throws AiravataAPIInvocationException {
+//// try {
+//// return getClient().getRegistryClient().getHostDescriptor(hostId);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
+//
+// @Override
+// public List<HostDescription> getAllHostDescriptions()
+// throws AiravataAPIInvocationException {
+//// try {
+//// return getClient().getRegistryClient().getHostDescriptors();
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
+//
+// @Override
+// public String saveHostDescription(HostDescription host)
+// throws AiravataAPIInvocationException {
+//// try {
+//// if (getClient().getRegistryClient().isHostDescriptorExists(host.getType().getHostName())) {
+//// getClient().getRegistryClient().updateHostDescriptor(host);
+//// }else{
+//// getClient().getRegistryClient().addHostDescriptor(host);
+//// }
+//// return host.getType().getHostName();
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
+//
+// @Override
+// public void addHostDescription(HostDescription host) throws DescriptorAlreadyExistsException,
+// AiravataAPIInvocationException{
+//
+//// try {
+//// getClient().getRegistryClient().addHostDescriptor(host);
+//// } catch (org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException e) {
+//// throw new DescriptorAlreadyExistsException("Host descriptor " + host.getType().getHostName()
+//// + " already exists.", e);
+//// } catch (RegException e) {
+//// throw new AiravataAPIInvocationException("An internal error occurred while trying to add host descriptor"
+//// + host.getType().getHostName(),
+//// e);
+//// } catch (AiravataConfigurationException e) {
+//// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
+//// "An error occurred while trying to " +
+//// "add host descriptor" + host.getType().getHostName(), e);
+//// }
+//
+// }
+//
+// @Override
+// public void updateHostDescription(HostDescription host) throws AiravataAPIInvocationException {
+//// try {
+//// getClient().getRegistryClient().updateHostDescriptor(host);
+//// } catch (RegException e) {
+//// throw new AiravataAPIInvocationException("An internal error occurred while trying to add host descriptor"
+//// + host.getType().getHostName(),
+//// e);
+//// } catch (AiravataConfigurationException e) {
+//// throw new AiravataAPIInvocationException("Error retrieving registry controller. " +
+//// "An error occurred while trying to " +
+//// "add host descriptor" + host.getType().getHostName(), e);
+//// }
+// }
+//
+//
+// @Override
+// public List<HostDescription> searchHostDescription(String regExName)
+// throws AiravataAPIInvocationException {
+//// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+// return null;
+// }
+//
+// @Override
+// public void deleteHostDescription(String hostId)
+// throws AiravataAPIInvocationException {
+//// try {
+//// getClient().getRegistryClient().removeHostDescriptor(hostId);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// }
+//
+// @Override
+// public boolean deployServiceOnHost(String serviceName, String hostName)
+// throws AiravataAPIInvocationException {
+//// throw new AiravataAPIInvocationException(new UnimplementedRegOperationException());
+// return false;
+// }
+//
+// @Override
+// public Map<String, ApplicationDescription> getApplicationDescriptors(String serviceName) throws AiravataAPIInvocationException {
+//// try{
+//// Map<String, ApplicationDescription> applicationDescriptors = getClient().getRegistryClient().getApplicationDescriptors(serviceName);
+//// return applicationDescriptors;
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
+//
+// @Override
+// public boolean isHostDescriptorExists(String descriptorName) throws AiravataAPIInvocationException {
+//// try {
+//// return getClient().getRegistryClient().isHostDescriptorExists(descriptorName);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return false;
+// }
+//
+// @Override
+// public void removeHostDescriptor(String hostName) throws AiravataAPIInvocationException {
+//// try {
+//// getClient().getRegistryClient().removeHostDescriptor(hostName);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// }
+//
+// @Override
+// public boolean isServiceDescriptorExists(String descriptorName) throws AiravataAPIInvocationException {
+//// try {
+//// return getClient().getRegistryClient().isServiceDescriptorExists(descriptorName);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return false;
+// }
+//
+// @Override
+// public void removeServiceDescriptor(String serviceName) throws AiravataAPIInvocationException {
+//// try {
+//// getClient().getRegistryClient().removeServiceDescriptor(serviceName);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// }
+//
+// @Override
+// public void removeApplicationDescriptor(String serviceName, String hostName, String applicationName) throws AiravataAPIInvocationException {
+//// try {
+//// getClient().getRegistryClient().removeApplicationDescriptor(serviceName, hostName, applicationName);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// }
+//
+// @Override
+// public void updateHostDescriptor(HostDescription descriptor) throws AiravataAPIInvocationException {
+//// try {
+//// getClient().getRegistryClient().updateHostDescriptor(descriptor);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// }
+//
+// @Override
+// public void updateServiceDescriptor(ServiceDescription descriptor) throws AiravataAPIInvocationException {
+//// try {
+//// getClient().getRegistryClient().updateServiceDescriptor(descriptor);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// }
+//
+// @Override
+// public void updateApplicationDescriptor(String serviceName, String hostName, ApplicationDescription descriptor) throws AiravataAPIInvocationException {
+//// try {
+//// getClient().getRegistryClient().updateApplicationDescriptor(serviceName, hostName, descriptor);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// }
+//
+// @Override
+// public ApplicationDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName) throws AiravataAPIInvocationException {
+//// try {
+//// return getClient().getRegistryClient().getApplicationDescriptor(serviceName, hostname, applicationName);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return null;
+// }
+//
+// public AiravataClient getClient() {
+// return client;
+// }
+//
+// public void setClient(AiravataClient client) {
+// this.client = client;
+// }
+//
+// @Override
+// public boolean isApplicationDescriptorExists(String serviceName,
+// String hostName, String descriptorName)
+// throws AiravataAPIInvocationException {
+//// try {
+//// return getClient().getRegistryClient().isApplicationDescriptorExists(serviceName, hostName, descriptorName);
+//// } catch (Exception e) {
+//// throw new AiravataAPIInvocationException(e);
+//// }
+// return false;
+// }
+//
+//}