airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1425953 [1/2] - in /airavata/trunk/modules: airavata-client/src/main/java/org/apache/airavata/client/api/ airavata-client/src/main/java/org/apache/airavata/client/api/builder/ airavata-client/src/main/java/org/apache/airavata/client/impl/ ...
Date Wed, 26 Dec 2012 15:32:52 GMT
Author: chathuri
Date: Wed Dec 26 15:32:51 2012
New Revision: 1425953

URL: http://svn.apache.org/viewvc?rev=1425953&view=rev
Log:
change ApplicationDeploymentDescription to ApplicationDescription and change method signatures

Added:
    airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDescription.java
      - copied, changed from r1425075, airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDeploymentDescription.java
Removed:
    airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDeploymentDescription.java
Modified:
    airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java
    airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java
    airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
    airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/ExecutionDescription.java
    airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionDescription.java
    airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/data/RegistryDataService.java
    airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/Provider.java
    airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
    airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
    airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
    airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/DescriptorRegistry.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
    airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java
    airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/FileBreedGramTest.java
    airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java
    airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java
    airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java
    airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
    airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java

Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ApplicationManager.java Wed Dec 26 15:32:51 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.client.api;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.commons.gfac.type.ApplicationDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
 
@@ -101,7 +101,7 @@ public interface ApplicationManager {
      * @return
      * @throws AiravataAPIInvocationException
      */
-    public ApplicationDeploymentDescription getDeploymentDescription(String serviceName, String hostName)throws AiravataAPIInvocationException;
+    public ApplicationDescription getApplicationDescription(String serviceName, String hostName)throws AiravataAPIInvocationException;
 
     /**
      * Save deployment description on registry for a given service for a host
@@ -109,26 +109,26 @@ public interface ApplicationManager {
      * @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 #addDeploymentDescription} and
-     *              {@see #updateDeploymentDescription}.
+     * @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 saveDeploymentDescription(String serviceId, String hostId, ApplicationDeploymentDescription app)throws AiravataAPIInvocationException;
+    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 #updateDeploymentDescription}.
+     * 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 DescriptorRecordAlreadyExistsException If deployment descriptor already exists in the system.
      */
-    public void addDeploymentDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
-                                         ApplicationDeploymentDescription applicationDeploymentDescription)
+    public void addApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
+                                          ApplicationDescription applicationDeploymentDescription)
         throws AiravataAPIInvocationException, DescriptorRecordAlreadyExistsException;
 
     /**
@@ -139,8 +139,8 @@ public interface ApplicationManager {
      * @param applicationDeploymentDescription The application descriptor to save.
      * @throws AiravataAPIInvocationException If an error occurred while saving application descriptor.
      */
-    public void updateDeploymentDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
-                                         ApplicationDeploymentDescription applicationDeploymentDescription)
+    public void updateApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
+                                             ApplicationDescription applicationDeploymentDescription)
             throws AiravataAPIInvocationException;
 
     /**
@@ -150,14 +150,14 @@ public interface ApplicationManager {
      * @return
      * @throws AiravataAPIInvocationException
      */
-    public List<ApplicationDeploymentDescription> searchDeploymentDescription(String serviceName, String hostName)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[], ApplicationDeploymentDescription> getAllDeploymentDescriptions() 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 
@@ -167,7 +167,7 @@ public interface ApplicationManager {
      * @return
      * @throws AiravataAPIInvocationException
      */
-    public List<ApplicationDeploymentDescription> searchDeploymentDescription(String serviceName, String hostName,String applicationName) 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
@@ -175,7 +175,7 @@ public interface ApplicationManager {
      * @return
      * @throws AiravataAPIInvocationException
      */
-    public Map<HostDescription, List<ApplicationDeploymentDescription>> searchDeploymentDescription(String serviceName)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 
@@ -184,7 +184,7 @@ public interface ApplicationManager {
      * @param applicationName
      * @throws AiravataAPIInvocationException
      */
-    public void deleteDeploymentDescription(String serviceName, String hostName, String applicationName)throws AiravataAPIInvocationException;
+    public void deleteApplicationDescription(String serviceName, String hostName, String applicationName)throws AiravataAPIInvocationException;
     
     //Host descriptors
 
@@ -258,7 +258,7 @@ public interface ApplicationManager {
      */
     public boolean deployServiceOnHost(String serviceName, String hostName)throws AiravataAPIInvocationException;
 
-    public Map<String,ApplicationDeploymentDescription> getApplicationDescriptors (String serviceName) throws AiravataAPIInvocationException;
+    public Map<String,ApplicationDescription> getApplicationDescriptors (String serviceName) throws AiravataAPIInvocationException;
 
     public boolean isHostDescriptorExists(String descriptorName) throws AiravataAPIInvocationException;
 
@@ -266,7 +266,7 @@ public interface ApplicationManager {
 
     public boolean isServiceDescriptorExists(String descriptorName) throws AiravataAPIInvocationException;
     
-    public boolean isDeploymentDescriptorExists(String serviceName, String hostName, String descriptorName)throws AiravataAPIInvocationException;
+    public boolean isApplicationDescriptorExists(String serviceName, String hostName, String descriptorName)throws AiravataAPIInvocationException;
 
     public void removeServiceDescriptor(String serviceName) throws AiravataAPIInvocationException;
 
@@ -276,7 +276,7 @@ public interface ApplicationManager {
 
     public void updateServiceDescriptor(ServiceDescription descriptor) throws AiravataAPIInvocationException;
 
-    public void updateApplicationDescriptor(String serviceName, String hostName, ApplicationDeploymentDescription descriptor) throws AiravataAPIInvocationException;
+    public void updateApplicationDescriptor(String serviceName, String hostName, ApplicationDescription descriptor) throws AiravataAPIInvocationException;
 
-    public ApplicationDeploymentDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName) throws AiravataAPIInvocationException;
+    public ApplicationDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName) throws AiravataAPIInvocationException;
 }

Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/builder/DescriptorBuilder.java Wed Dec 26 15:32:51 2012
@@ -1,7 +1,7 @@
 package org.apache.airavata.client.api.builder;
 
 import org.apache.airavata.client.api.AiravataAPIInvocationException;
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+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.*;
@@ -164,11 +164,11 @@ public class DescriptorBuilder {
 
     }
 
-    public ApplicationDeploymentDescription buildApplicationDeploymentDescription (String applicationName,
+    public ApplicationDescription buildApplicationDeploymentDescription (String applicationName,
                                                                                    String executablePath,
                                                                                    String workingDirectory) {
 
-        ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription();
+        ApplicationDescription applicationDeploymentDescription = new ApplicationDescription();
         ApplicationDeploymentDescriptionType applicationDeploymentDescriptionType
                 = applicationDeploymentDescription.getType();
         applicationDeploymentDescriptionType.addNewApplicationName().setStringValue(applicationName);

Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationManagerImpl.java Wed Dec 26 15:32:51 2012
@@ -31,7 +31,7 @@ import org.apache.airavata.client.api.Ai
 import org.apache.airavata.client.api.ApplicationManager;
 import org.apache.airavata.client.api.DescriptorRecordAlreadyExistsException;
 import org.apache.airavata.common.exception.AiravataConfigurationException;
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+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.registry.api.exception.RegistryException;
@@ -139,8 +139,8 @@ public class ApplicationManagerImpl impl
 	}
 
 	@Override
-	public ApplicationDeploymentDescription getDeploymentDescription(
-			String serviceId, String hostId)
+	public ApplicationDescription getApplicationDescription(
+            String serviceId, String hostId)
 			throws AiravataAPIInvocationException {
 		try {
 			return getClient().getRegistryClient().getApplicationDescriptors(serviceId, hostId);
@@ -150,8 +150,8 @@ public class ApplicationManagerImpl impl
 	}
 
 	@Override
-	public String saveDeploymentDescription(String serviceId, String hostId,
-			ApplicationDeploymentDescription app)
+	public String saveApplicationDescription(String serviceId, String hostId,
+                                             ApplicationDescription app)
 			throws AiravataAPIInvocationException {
 		try {
 			if (getClient().getRegistryClient().isApplicationDescriptorExists(serviceId, hostId, app.getType().getApplicationName().getStringValue())) {
@@ -167,8 +167,8 @@ public class ApplicationManagerImpl impl
 
 
     @Override
-    public void addDeploymentDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
-                                         ApplicationDeploymentDescription applicationDeploymentDescription)
+    public void addApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
+                                          ApplicationDescription applicationDeploymentDescription)
             throws AiravataAPIInvocationException, DescriptorRecordAlreadyExistsException {
 
         try {
@@ -199,8 +199,8 @@ public class ApplicationManagerImpl impl
     }
 
     @Override
-    public void updateDeploymentDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
-                                            ApplicationDeploymentDescription applicationDeploymentDescription)
+    public void updateApplicationDescription(ServiceDescription serviceDescription, HostDescription hostDescription,
+                                             ApplicationDescription applicationDeploymentDescription)
             throws AiravataAPIInvocationException {
         try {
             getClient().getRegistryClient().updateApplicationDescriptor(serviceDescription.getType().getName(),
@@ -225,14 +225,14 @@ public class ApplicationManagerImpl impl
 
 
     @Override
-	public List<ApplicationDeploymentDescription> searchDeploymentDescription(
-			String serviceName, String hostName)
+	public List<ApplicationDescription> searchApplicationDescription(
+            String serviceName, String hostName)
 			throws AiravataAPIInvocationException {
 		throw new AiravataAPIInvocationException(new UnimplementedRegistryOperationException());
 	}
 
 	@Override
-	public Map<String[], ApplicationDeploymentDescription> getAllDeploymentDescriptions()
+	public Map<String[], ApplicationDescription> getAllApplicationDescriptions()
 			throws AiravataAPIInvocationException {
 		try {
 			return getClient().getRegistryClient().getApplicationDescriptors();
@@ -242,20 +242,20 @@ public class ApplicationManagerImpl impl
 	}
 
 	@Override
-	public List<ApplicationDeploymentDescription> searchDeploymentDescription(
-			String serviceName, String hostName, String applicationName)
+	public List<ApplicationDescription> searchApplicationDescription(
+            String serviceName, String hostName, String applicationName)
 			throws AiravataAPIInvocationException {
 		throw new AiravataAPIInvocationException(new UnimplementedRegistryOperationException());
 	}
 
 	@Override
-	public Map<HostDescription, List<ApplicationDeploymentDescription>> searchDeploymentDescription(
-			String serviceName) throws AiravataAPIInvocationException {
+	public Map<HostDescription, List<ApplicationDescription>> searchApplicationDescription(
+            String serviceName) throws AiravataAPIInvocationException {
 		try {
-			Map<HostDescription, List<ApplicationDeploymentDescription>> map=new HashMap<HostDescription, List<ApplicationDeploymentDescription>>();
-			Map<String, ApplicationDeploymentDescription> applicationDescriptors = getClient().getRegistryClient().getApplicationDescriptors(serviceName);
+			Map<HostDescription, List<ApplicationDescription>> map=new HashMap<HostDescription, List<ApplicationDescription>>();
+			Map<String, ApplicationDescription> applicationDescriptors = getClient().getRegistryClient().getApplicationDescriptors(serviceName);
 			for (String hostName : applicationDescriptors.keySet()) {
-				ArrayList<ApplicationDeploymentDescription> list = new ArrayList<ApplicationDeploymentDescription>();
+				ArrayList<ApplicationDescription> list = new ArrayList<ApplicationDescription>();
 				list.add(applicationDescriptors.get(hostName));
 				map.put(getClient().getRegistryClient().getHostDescriptor(hostName),list);
 			}
@@ -266,8 +266,8 @@ public class ApplicationManagerImpl impl
 	}
 
 	@Override
-	public void deleteDeploymentDescription(String serviceName,
-			String hostName, String applicationName)
+	public void deleteApplicationDescription(String serviceName,
+                                             String hostName, String applicationName)
 			throws AiravataAPIInvocationException {
 		try {
 			getClient().getRegistryClient().removeApplicationDescriptor(serviceName, hostName, applicationName);
@@ -371,9 +371,9 @@ public class ApplicationManagerImpl impl
 	}
 
     @Override
-    public Map<String, ApplicationDeploymentDescription> getApplicationDescriptors(String serviceName) throws AiravataAPIInvocationException {
+    public Map<String, ApplicationDescription> getApplicationDescriptors(String serviceName) throws AiravataAPIInvocationException {
         try{
-            Map<String, ApplicationDeploymentDescription> applicationDescriptors = getClient().getRegistryClient().getApplicationDescriptors(serviceName);
+            Map<String, ApplicationDescription> applicationDescriptors = getClient().getRegistryClient().getApplicationDescriptors(serviceName);
             return applicationDescriptors;
         } catch (Exception e) {
             throw new AiravataAPIInvocationException(e);
@@ -444,7 +444,7 @@ public class ApplicationManagerImpl impl
     }
 
     @Override
-    public void updateApplicationDescriptor(String serviceName, String hostName, ApplicationDeploymentDescription descriptor) throws AiravataAPIInvocationException {
+    public void updateApplicationDescriptor(String serviceName, String hostName, ApplicationDescription descriptor) throws AiravataAPIInvocationException {
         try {
             getClient().getRegistryClient().updateApplicationDescriptor(serviceName, hostName, descriptor);
         } catch (Exception e) {
@@ -453,7 +453,7 @@ public class ApplicationManagerImpl impl
     }
 
     @Override
-    public ApplicationDeploymentDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName) throws AiravataAPIInvocationException {
+    public ApplicationDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName) throws AiravataAPIInvocationException {
         try {
             return getClient().getRegistryClient().getApplicationDescriptor(serviceName, hostname, applicationName);
         } catch (Exception e) {
@@ -470,8 +470,8 @@ public class ApplicationManagerImpl impl
 	}
 
 	@Override
-	public boolean isDeploymentDescriptorExists(String serviceName,
-			String hostName, String descriptorName)
+	public boolean isApplicationDescriptorExists(String serviceName,
+                                                 String hostName, String descriptorName)
 			throws AiravataAPIInvocationException {
         try {
             return getClient().getRegistryClient().isApplicationDescriptorExists(serviceName, hostName, descriptorName);

Copied: airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDescription.java (from r1425075, airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDeploymentDescription.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDescription.java?p2=airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDescription.java&p1=airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDeploymentDescription.java&r1=1425075&r2=1425953&rev=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDeploymentDescription.java (original)
+++ airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDescription.java Wed Dec 26 15:32:51 2012
@@ -26,17 +26,17 @@ import org.apache.airavata.schemas.gfac.
 import org.apache.xmlbeans.SchemaType;
 import org.apache.xmlbeans.XmlException;
 
-public class ApplicationDeploymentDescription implements Type {
+public class ApplicationDescription implements Type {
 
 	private ApplicationDeploymentDescriptionDocument appDocument;
 
-	public ApplicationDeploymentDescription() {
+	public ApplicationDescription() {
 		this.appDocument = ApplicationDeploymentDescriptionDocument.Factory
 				.newInstance();
 		this.appDocument.addNewApplicationDeploymentDescription();
 	}
 
-	public ApplicationDeploymentDescription(SchemaType type) {
+	public ApplicationDescription(SchemaType type) {
 		this();
 		this.appDocument.getApplicationDeploymentDescription().changeType(type);
 	}
@@ -49,9 +49,9 @@ public class ApplicationDeploymentDescri
 		return appDocument.xmlText();
 	}
 
-	public static ApplicationDeploymentDescription fromXML(String xml)
+	public static ApplicationDescription fromXML(String xml)
 			throws XmlException {
-		ApplicationDeploymentDescription app = new ApplicationDeploymentDescription();
+		ApplicationDescription app = new ApplicationDescription();
 		app.appDocument = ApplicationDeploymentDescriptionDocument.Factory
 				.parse(xml);
 		return app;

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/ExecutionDescription.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/ExecutionDescription.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/ExecutionDescription.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/ExecutionDescription.java Wed Dec 26 15:32:51 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.core.gfac.context.invocation;
 
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.commons.gfac.type.ApplicationDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
 
@@ -51,14 +51,14 @@ public interface ExecutionDescription {
      * 
      * @return ApplicationDeploymentDescription
      */
-    ApplicationDeploymentDescription getApp();
+    ApplicationDescription getApp();
 
     /**
      * Set ApplicationDeploymentDescription
      * 
      * @param app
      */
-    <T extends ApplicationDeploymentDescription> void setApp(T app);
+    <T extends ApplicationDescription> void setApp(T app);
 
     /**
      * Get ServiceDescription

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionDescription.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionDescription.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionDescription.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionDescription.java Wed Dec 26 15:32:51 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.core.gfac.context.invocation.impl;
 
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+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.core.gfac.context.invocation.ExecutionDescription;
@@ -32,7 +32,7 @@ import org.apache.airavata.core.gfac.con
  */
 public class DefaultExecutionDescription implements ExecutionDescription {
     private HostDescription host;
-    private ApplicationDeploymentDescription app;
+    private ApplicationDescription app;
     private ServiceDescription service;
 
     public HostDescription getHost() {
@@ -43,11 +43,11 @@ public class DefaultExecutionDescription
         this.host = host;
     }
 
-    public ApplicationDeploymentDescription getApp() {
+    public ApplicationDescription getApp() {
         return app;
     }
 
-    public void setApp(ApplicationDeploymentDescription app) {
+    public void setApp(ApplicationDescription app) {
         this.app = app;
     }
 

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/data/RegistryDataService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/data/RegistryDataService.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/data/RegistryDataService.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/data/RegistryDataService.java Wed Dec 26 15:32:51 2012
@@ -25,7 +25,6 @@ import java.io.File;
 import java.util.Date;
 import java.util.UUID;
 
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
 import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
@@ -34,7 +33,7 @@ import org.apache.airavata.core.gfac.ext
 import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
 
 /**
- * This plugin fills out all information that is missing in {@link ApplicationDeploymentDescription} based on Unix
+ * This plugin fills out all information that is missing in {@link org.apache.airavata.commons.gfac.type.ApplicationDescription} based on Unix
  * system. For instance, it will use "/tmp" as default temporary directory.
  * 
  */

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/Provider.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/Provider.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/Provider.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/Provider.java Wed Dec 26 15:32:51 2012
@@ -23,13 +23,12 @@ package org.apache.airavata.core.gfac.pr
 
 import java.util.Map;
 
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
 import org.apache.airavata.core.gfac.exception.GfacException;
 import org.apache.airavata.core.gfac.exception.ProviderException;
 
 /**
- * Main component in GFAC. It executes an application according to {@link ApplicationDeploymentDescription}.
+ * Main component in GFAC. It executes an application according to {@link org.apache.airavata.commons.gfac.type.ApplicationDescription}.
  */
 public interface Provider {
 

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java Wed Dec 26 15:32:51 2012
@@ -29,9 +29,8 @@ import javax.xml.stream.XMLStreamExcepti
 
 import org.apache.airavata.client.api.AiravataAPI;
 import org.apache.airavata.client.api.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.commons.gfac.type.ApplicationDescription;
 import org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
 import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
@@ -91,10 +90,10 @@ public class SchedulerImpl implements Sc
         /*
          * Load app
          */
-        ApplicationDeploymentDescription app = null;
+        ApplicationDescription app = null;
         try {
-            app = registryService.getApplicationManager().getDeploymentDescription(context.getServiceName(),
-                    getRegisteredHost(registryService,context.getServiceName()).getType().getHostName());
+            app = registryService.getApplicationManager().getApplicationDescription(context.getServiceName(),
+                    getRegisteredHost(registryService, context.getServiceName()).getType().getHostName());
         } catch (AiravataAPIInvocationException e2) {
             e2.printStackTrace();
         }
@@ -173,7 +172,7 @@ public class SchedulerImpl implements Sc
         }
         log.info("Searching registry for some deployed application hosts");
         HostDescription result = null;
-        Map<HostDescription, List<ApplicationDeploymentDescription>> deploymentDescription = null;
+        Map<HostDescription, List<ApplicationDescription>> deploymentDescription = null;
         result = getRegisteredHost(regService, serviceName);
         // if user specify the host in the workflowcontext header we pick that host instead of picking the last hostName
         if(hostName != null){
@@ -210,7 +209,7 @@ public class SchedulerImpl implements Sc
     private HostDescription getRegisteredHost(AiravataAPI regService, String serviceName) {
         HostDescription result = null;
         try {
-            Map<String, ApplicationDeploymentDescription> applicationDescriptors = regService.getApplicationManager().getApplicationDescriptors(serviceName);
+            Map<String, ApplicationDescription> applicationDescriptors = regService.getApplicationManager().getApplicationDescriptors(serviceName);
             for (String hostDescName : applicationDescriptors.keySet()) {
                 HostDescription hostDescriptor = regService.getApplicationManager().getHostDescription(hostDescName);
                 result = hostDescriptor;

Modified: airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java (original)
+++ airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java Wed Dec 26 15:32:51 2012
@@ -106,7 +106,7 @@ public class PropertiesBasedServiceImplT
 //		 * Save to registry
 //		 */
 //		jcrRegistry.saveHostDescription(host);
-//		jcrRegistry.saveDeploymentDescription(serv.getType().getName(), host
+//		jcrRegistry.saveApplicationDescription(serv.getType().getName(), host
 //				.getType().getHostName(), appDesc);
 //		jcrRegistry.saveServiceDescription(serv);
 //		jcrRegistry.deployServiceOnHost(serv.getType().getName(), host

Modified: airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java (original)
+++ airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java Wed Dec 26 15:32:51 2012
@@ -16,7 +16,7 @@ import org.apache.airavata.client.api.Ai
 import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.client.api.builder.DescriptorBuilder;
 import org.apache.airavata.common.utils.Version;
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+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.registry.api.PasswordCallback;
@@ -243,14 +243,14 @@ public class BaseCaseIT {
                 getType().getName()));
 
         // Deployment descriptor
-        ApplicationDeploymentDescription applicationDeploymentDescription
+        ApplicationDescription applicationDeploymentDescription
                 = descriptorBuilder.buildApplicationDeploymentDescription("EchoApplication", "/bin/echo", "/tmp");
 
         log("Adding deployment description ...");
-        airavataAPI.getApplicationManager().addDeploymentDescription(serviceDescription,
+        airavataAPI.getApplicationManager().addApplicationDescription(serviceDescription,
                 hostDescription, applicationDeploymentDescription);
 
-        Assert.assertTrue(airavataAPI.getApplicationManager().isDeploymentDescriptorExists(serviceDescription.getType().
+        Assert.assertTrue(airavataAPI.getApplicationManager().isApplicationDescriptorExists(serviceDescription.getType().
                 getName(), hostDescription.getType().getHostName(),
                 applicationDeploymentDescription.getType().getApplicationName().getStringValue()));
 

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java Wed Dec 26 15:32:51 2012
@@ -32,7 +32,7 @@ import java.util.Map;
 import java.util.regex.Pattern;
 
 import org.apache.airavata.common.utils.Version;
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+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.persistance.registry.jpa.JPAResourceAccessor;
@@ -401,11 +401,11 @@ public class AiravataJPARegistry extends
  		return jpa.getGateway().isApplicationDescriptorExists(createAppName(serviceName, hostName, descriptorName));
     }
 
-    public void addApplicationDescriptor(ServiceDescription serviceDescription, HostDescription hostDescriptor, ApplicationDeploymentDescription descriptor) throws RegistryException {
+    public void addApplicationDescriptor(ServiceDescription serviceDescription, HostDescription hostDescriptor, ApplicationDescription descriptor) throws RegistryException {
         addApplicationDescriptor(serviceDescription.getType().getName(), hostDescriptor.getType().getHostName(), descriptor);
     }
 
-    public void addApplicationDescriptor(String serviceName, String hostName, ApplicationDeploymentDescription descriptor) throws RegistryException {
+    public void addApplicationDescriptor(String serviceName, String hostName, ApplicationDescription descriptor) throws RegistryException {
     	if (serviceName==null || hostName==null){
     		throw new InsufficientDataException("Service name or Host name cannot be null");
     	}
@@ -424,11 +424,11 @@ public class AiravataJPARegistry extends
         applicationDescriptorResource.save();
     }
 
-    public void udpateApplicationDescriptor(ServiceDescription serviceDescription, HostDescription hostDescriptor, ApplicationDeploymentDescription descriptor) throws RegistryException {
+    public void udpateApplicationDescriptor(ServiceDescription serviceDescription, HostDescription hostDescriptor, ApplicationDescription descriptor) throws RegistryException {
     	updateApplicationDescriptor(serviceDescription.getType().getName(),hostDescriptor.getType().getHostName(),descriptor);
     }
 
-    public void updateApplicationDescriptor(String serviceName, String hostName, ApplicationDeploymentDescription descriptor) throws RegistryException {
+    public void updateApplicationDescriptor(String serviceName, String hostName, ApplicationDescription descriptor) throws RegistryException {
     	if (serviceName==null || hostName==null){
     		throw new InsufficientDataException("Service name or Host name cannot be null");
     	}
@@ -442,17 +442,17 @@ public class AiravataJPARegistry extends
         serviceDescriptorResource.setContent(descriptor.toXML());
         serviceDescriptorResource.save();
     }
-    private ApplicationDeploymentDescription createApplicationDescriptor(
+    private ApplicationDescription createApplicationDescriptor(
 			ApplicationDescriptorResource applicationDescriptorResource)
 			throws MalformedDescriptorException {
 		try {
-            return ApplicationDeploymentDescription.fromXML(applicationDescriptorResource.getContent());
+            return ApplicationDescription.fromXML(applicationDescriptorResource.getContent());
         } catch (XmlException e) {
             throw new MalformedDescriptorException(applicationDescriptorResource.getName(),e);
         }
 	}
 
-    public ApplicationDeploymentDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName)throws DescriptorDoesNotExistsException, MalformedDescriptorException, RegistryException{
+    public ApplicationDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName)throws DescriptorDoesNotExistsException, MalformedDescriptorException, RegistryException{
     	if (serviceName==null || hostname==null){
     		throw new InsufficientDataException("Service name or Host name cannot be null");
     	}
@@ -463,7 +463,7 @@ public class AiravataJPARegistry extends
         return createApplicationDescriptor(gateway.getApplicationDescriptorResource(createAppName(serviceName, hostname, applicationName)));
     }
 
-    public ApplicationDeploymentDescription getApplicationDescriptors(String serviceName, String hostname) throws MalformedDescriptorException {
+    public ApplicationDescription getApplicationDescriptors(String serviceName, String hostname) throws MalformedDescriptorException {
     	GatewayResource gateway = jpa.getGateway();
 		List<ApplicationDescriptorResource> applicationDescriptorResources = gateway.getApplicationDescriptorResources(serviceName, hostname);
 		if (applicationDescriptorResources.size()>0){
@@ -472,9 +472,9 @@ public class AiravataJPARegistry extends
 		return null;
     }
 
-    public Map<String, ApplicationDeploymentDescription> getApplicationDescriptors(String serviceName) throws MalformedDescriptorException {
+    public Map<String, ApplicationDescription> getApplicationDescriptors(String serviceName) throws MalformedDescriptorException {
     	GatewayResource gateway = jpa.getGateway();
-		Map<String, ApplicationDeploymentDescription> map=new HashMap<String,ApplicationDeploymentDescription>();
+		Map<String, ApplicationDescription> map=new HashMap<String,ApplicationDescription>();
 		List<ApplicationDescriptorResource> applicationDescriptorResources = gateway.getApplicationDescriptorResources(serviceName, null);
 		for (ApplicationDescriptorResource resource : applicationDescriptorResources) {
 			map.put(resource.getHostDescName(),createApplicationDescriptor(resource));
@@ -482,9 +482,9 @@ public class AiravataJPARegistry extends
 		return map;
     }
 
-    public Map<String[],ApplicationDeploymentDescription> getApplicationDescriptors()throws MalformedDescriptorException, RegistryException{
+    public Map<String[],ApplicationDescription> getApplicationDescriptors()throws MalformedDescriptorException, RegistryException{
     	GatewayResource gateway = jpa.getGateway();
-		Map<String[], ApplicationDeploymentDescription> map=new HashMap<String[],ApplicationDeploymentDescription>();
+		Map<String[], ApplicationDescription> map=new HashMap<String[],ApplicationDescription>();
 		List<ApplicationDescriptorResource> applicationDescriptorResources = gateway.getApplicationDescriptorResources();
 		for (ApplicationDescriptorResource resource : applicationDescriptorResources) {
 			map.put(new String[]{resource.getServiceDescName(),resource.getHostDescName()},createApplicationDescriptor(resource));

Modified: airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-test/src/test/java/org/apache/airavata/registry/api/test/AiravataRegistryAPITest.java Wed Dec 26 15:32:51 2012
@@ -22,7 +22,7 @@
 package org.apache.airavata.registry.api.test;
 
 import junit.framework.TestCase;
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+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.persistance.registry.jpa.ResourceUtils;
@@ -561,28 +561,28 @@ public class AiravataRegistryAPITest ext
 
 
     public void testIsApplicationDescriptorExists() throws Exception {
-        ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription(ApplicationDeploymentDescriptionType.type);
-        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDeploymentDescription.getType().addNewApplicationName();
+        ApplicationDescription applicationDescription = new ApplicationDescription(ApplicationDeploymentDescriptionType.type);
+        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDescription.getType().addNewApplicationName();
         applicationName.setStringValue("testApplication");
-        applicationDeploymentDescription.getType().setApplicationName(applicationName);
-        applicationDeploymentDescription.getType().setInputDataDirectory("/bin");
-        applicationDeploymentDescription.getType().setExecutableLocation("/bin/echo");
-        applicationDeploymentDescription.getType().setOutputDataDirectory("/tmp");
+        applicationDescription.getType().setApplicationName(applicationName);
+        applicationDescription.getType().setInputDataDirectory("/bin");
+        applicationDescription.getType().setExecutableLocation("/bin/echo");
+        applicationDescription.getType().setOutputDataDirectory("/tmp");
 
-        registry.addApplicationDescriptor("testService", "testHost", applicationDeploymentDescription);
+        registry.addApplicationDescriptor("testService", "testHost", applicationDescription);
         assertTrue("application descriptor exists", registry.isApplicationDescriptorExists("testService", "testHost", "testApplication"));
         registry.removeApplicationDescriptor("testService", "testHost", "testApplication");
     }
 
 
     public void testAddApplicationDescriptorWithOtherDescriptors() throws Exception {
-        ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription(ApplicationDeploymentDescriptionType.type);
-        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDeploymentDescription.getType().addNewApplicationName();
+        ApplicationDescription applicationDescription = new ApplicationDescription(ApplicationDeploymentDescriptionType.type);
+        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDescription.getType().addNewApplicationName();
         applicationName.setStringValue("testApplication");
-        applicationDeploymentDescription.getType().setApplicationName(applicationName);
-        applicationDeploymentDescription.getType().setInputDataDirectory("/bin");
-        applicationDeploymentDescription.getType().setExecutableLocation("/bin/echo");
-        applicationDeploymentDescription.getType().setOutputDataDirectory("/tmp");
+        applicationDescription.getType().setApplicationName(applicationName);
+        applicationDescription.getType().setInputDataDirectory("/bin");
+        applicationDescription.getType().setExecutableLocation("/bin/echo");
+        applicationDescription.getType().setOutputDataDirectory("/tmp");
 
         HostDescription hostDescription = new HostDescription(GlobusHostType.type);
         hostDescription.getType().setHostName("testHost");
@@ -611,35 +611,35 @@ public class AiravataRegistryAPITest ext
         serviceDescription.getType().setInputParametersArray(inputParameters.toArray(new InputParameterType[]{}));
         serviceDescription.getType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[]{}));
 
-        registry.addApplicationDescriptor(serviceDescription, hostDescription, applicationDeploymentDescription);
+        registry.addApplicationDescriptor(serviceDescription, hostDescription, applicationDescription);
         assertTrue("application hostDescription added successfully", registry.isApplicationDescriptorExists("testServiceDesc", "testHost", "testApplication"));
         registry.removeApplicationDescriptor("testServiceDesc", "testHost", "testApplication");
     }
 
 
     public void testAddApplicationDescriptor() throws Exception {
-        ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription(ApplicationDeploymentDescriptionType.type);
-        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDeploymentDescription.getType().addNewApplicationName();
+        ApplicationDescription applicationDescription = new ApplicationDescription(ApplicationDeploymentDescriptionType.type);
+        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDescription.getType().addNewApplicationName();
         applicationName.setStringValue("testApplication");
-        applicationDeploymentDescription.getType().setApplicationName(applicationName);
-        applicationDeploymentDescription.getType().setInputDataDirectory("/bin");
-        applicationDeploymentDescription.getType().setExecutableLocation("/bin/echo");
-        applicationDeploymentDescription.getType().setOutputDataDirectory("/tmp");
+        applicationDescription.getType().setApplicationName(applicationName);
+        applicationDescription.getType().setInputDataDirectory("/bin");
+        applicationDescription.getType().setExecutableLocation("/bin/echo");
+        applicationDescription.getType().setOutputDataDirectory("/tmp");
 
-        registry.addApplicationDescriptor("testService", "testHost", applicationDeploymentDescription);
+        registry.addApplicationDescriptor("testService", "testHost", applicationDescription);
         assertTrue("application descriptor added successfully", registry.isApplicationDescriptorExists("testService", "testHost", "testApplication"));
         registry.removeApplicationDescriptor("testService", "testHost", "testApplication");
     }
 
 
     public void testUpdateApplicationDescriptorWithOtherDescriptors() throws Exception {
-        ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription(ApplicationDeploymentDescriptionType.type);
-        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDeploymentDescription.getType().addNewApplicationName();
+        ApplicationDescription applicationDescription = new ApplicationDescription(ApplicationDeploymentDescriptionType.type);
+        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDescription.getType().addNewApplicationName();
         applicationName.setStringValue("testApplication");
-        applicationDeploymentDescription.getType().setApplicationName(applicationName);
-        applicationDeploymentDescription.getType().setInputDataDirectory("/bin");
-        applicationDeploymentDescription.getType().setExecutableLocation("/bin/echo");
-        applicationDeploymentDescription.getType().setOutputDataDirectory("/tmp");
+        applicationDescription.getType().setApplicationName(applicationName);
+        applicationDescription.getType().setInputDataDirectory("/bin");
+        applicationDescription.getType().setExecutableLocation("/bin/echo");
+        applicationDescription.getType().setOutputDataDirectory("/tmp");
 
         HostDescription hostDescription = new HostDescription(GlobusHostType.type);
         hostDescription.getType().setHostName("testHost");
@@ -668,14 +668,14 @@ public class AiravataRegistryAPITest ext
         serviceDescription.getType().setInputParametersArray(inputParameters.toArray(new InputParameterType[]{}));
         serviceDescription.getType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[]{}));
 
-        registry.addApplicationDescriptor(serviceDescription, hostDescription, applicationDeploymentDescription);
+        registry.addApplicationDescriptor(serviceDescription, hostDescription, applicationDescription);
 
-        ApplicationDeploymentDescription applicationDescriptor = registry.getApplicationDescriptor("testServiceDesc", "testHost", "testApplication");
+        ApplicationDescription applicationDescriptor = registry.getApplicationDescriptor("testServiceDesc", "testHost", "testApplication");
         applicationDescriptor.getType().setExecutableLocation("/bin/echo1");
 
         registry.udpateApplicationDescriptor(serviceDescription, hostDescription, applicationDescriptor);
 
-        ApplicationDeploymentDescription descriptor = registry.getApplicationDescriptor("testServiceDesc", "testHost", "testApplication");
+        ApplicationDescription descriptor = registry.getApplicationDescriptor("testServiceDesc", "testHost", "testApplication");
         String executableLocation = descriptor.getType().getExecutableLocation();
 
         assertTrue("application descriptor updated successfully", executableLocation.equals("/bin/echo1"));
@@ -684,20 +684,20 @@ public class AiravataRegistryAPITest ext
     }
 
     public void testUpdateApplicationDescriptor() throws Exception {
-        ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription(ApplicationDeploymentDescriptionType.type);
-        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDeploymentDescription.getType().addNewApplicationName();
+        ApplicationDescription applicationDescription = new ApplicationDescription(ApplicationDeploymentDescriptionType.type);
+        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDescription.getType().addNewApplicationName();
         applicationName.setStringValue("testApplication");
-        applicationDeploymentDescription.getType().setApplicationName(applicationName);
-        applicationDeploymentDescription.getType().setInputDataDirectory("/bin");
-        applicationDeploymentDescription.getType().setExecutableLocation("/bin/echo");
-        applicationDeploymentDescription.getType().setOutputDataDirectory("/tmp");
+        applicationDescription.getType().setApplicationName(applicationName);
+        applicationDescription.getType().setInputDataDirectory("/bin");
+        applicationDescription.getType().setExecutableLocation("/bin/echo");
+        applicationDescription.getType().setOutputDataDirectory("/tmp");
 
-        registry.addApplicationDescriptor("testService", "testHost", applicationDeploymentDescription);
-        ApplicationDeploymentDescription applicationDescriptor = registry.getApplicationDescriptor("testService", "testHost", "testApplication");
+        registry.addApplicationDescriptor("testService", "testHost", applicationDescription);
+        ApplicationDescription applicationDescriptor = registry.getApplicationDescriptor("testService", "testHost", "testApplication");
         applicationDescriptor.getType().setExecutableLocation("/bin/echo1");
         registry.updateApplicationDescriptor("testService", "testHost", applicationDescriptor);
 
-        ApplicationDeploymentDescription descriptor = registry.getApplicationDescriptor("testService", "testHost", "testApplication");
+        ApplicationDescription descriptor = registry.getApplicationDescriptor("testService", "testHost", "testApplication");
         String executableLocation = descriptor.getType().getExecutableLocation();
 
         assertTrue("application descriptor updated successfully", executableLocation.equals("/bin/echo1"));
@@ -707,54 +707,54 @@ public class AiravataRegistryAPITest ext
 
 
     public void testGetApplicationDescriptor() throws Exception {
-        ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription(ApplicationDeploymentDescriptionType.type);
-        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDeploymentDescription.getType().addNewApplicationName();
+        ApplicationDescription applicationDescription = new ApplicationDescription(ApplicationDeploymentDescriptionType.type);
+        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDescription.getType().addNewApplicationName();
         applicationName.setStringValue("testApplication");
-        applicationDeploymentDescription.getType().setApplicationName(applicationName);
-        applicationDeploymentDescription.getType().setInputDataDirectory("/bin");
-        applicationDeploymentDescription.getType().setExecutableLocation("/bin/echo");
-        applicationDeploymentDescription.getType().setOutputDataDirectory("/tmp");
+        applicationDescription.getType().setApplicationName(applicationName);
+        applicationDescription.getType().setInputDataDirectory("/bin");
+        applicationDescription.getType().setExecutableLocation("/bin/echo");
+        applicationDescription.getType().setOutputDataDirectory("/tmp");
 
-        registry.addApplicationDescriptor("testService", "testHost", applicationDeploymentDescription);
-        ApplicationDeploymentDescription applicationDescriptor = registry.getApplicationDescriptor("testService", "testHost", "testApplication");
+        registry.addApplicationDescriptor("testService", "testHost", applicationDescription);
+        ApplicationDescription applicationDescriptor = registry.getApplicationDescriptor("testService", "testHost", "testApplication");
         applicationDescriptor.getType().setExecutableLocation("/bin/echo1");
         registry.updateApplicationDescriptor("testService", "testHost", applicationDescriptor);
 
-        ApplicationDeploymentDescription descriptor = registry.getApplicationDescriptor("testService", "testHost", "testApplication");
+        ApplicationDescription descriptor = registry.getApplicationDescriptor("testService", "testHost", "testApplication");
         assertNotNull("application descriptor retrieved successfully", descriptor);
         registry.removeApplicationDescriptor("testService", "testHost", "testApplication");
     }
 
 
     public void testGetApplicationDescriptorsForServiceAndHost() throws Exception {
-        ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription(ApplicationDeploymentDescriptionType.type);
-        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDeploymentDescription.getType().addNewApplicationName();
+        ApplicationDescription applicationDescription = new ApplicationDescription(ApplicationDeploymentDescriptionType.type);
+        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDescription.getType().addNewApplicationName();
         applicationName.setStringValue("testApplication");
-        applicationDeploymentDescription.getType().setApplicationName(applicationName);
-        applicationDeploymentDescription.getType().setInputDataDirectory("/bin");
-        applicationDeploymentDescription.getType().setExecutableLocation("/bin/echo");
-        applicationDeploymentDescription.getType().setOutputDataDirectory("/tmp");
+        applicationDescription.getType().setApplicationName(applicationName);
+        applicationDescription.getType().setInputDataDirectory("/bin");
+        applicationDescription.getType().setExecutableLocation("/bin/echo");
+        applicationDescription.getType().setOutputDataDirectory("/tmp");
 
-        registry.addApplicationDescriptor("testService", "testHost", applicationDeploymentDescription);
+        registry.addApplicationDescriptor("testService", "testHost", applicationDescription);
 
-        ApplicationDeploymentDescription description = registry.getApplicationDescriptors("testService", "testHost");
+        ApplicationDescription description = registry.getApplicationDescriptors("testService", "testHost");
         assertNotNull("application descriptor retrieved successfully", description);
         registry.removeApplicationDescriptor("testService", "testHost", "testApplication");
     }
 
     public void testGetApplicationDescriptorsForService() throws Exception {
-        ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription(ApplicationDeploymentDescriptionType.type);
-        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDeploymentDescription.getType().addNewApplicationName();
+        ApplicationDescription applicationDescription = new ApplicationDescription(ApplicationDeploymentDescriptionType.type);
+        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDescription.getType().addNewApplicationName();
         applicationName.setStringValue("testApplication");
-        applicationDeploymentDescription.getType().setApplicationName(applicationName);
-        applicationDeploymentDescription.getType().setInputDataDirectory("/bin");
-        applicationDeploymentDescription.getType().setExecutableLocation("/bin/echo");
-        applicationDeploymentDescription.getType().setOutputDataDirectory("/tmp");
+        applicationDescription.getType().setApplicationName(applicationName);
+        applicationDescription.getType().setInputDataDirectory("/bin");
+        applicationDescription.getType().setExecutableLocation("/bin/echo");
+        applicationDescription.getType().setOutputDataDirectory("/tmp");
 
-        registry.addApplicationDescriptor("testService", "testHost1", applicationDeploymentDescription);
-        registry.addApplicationDescriptor("testService", "testHost2", applicationDeploymentDescription);
+        registry.addApplicationDescriptor("testService", "testHost1", applicationDescription);
+        registry.addApplicationDescriptor("testService", "testHost2", applicationDescription);
 
-        Map<String,ApplicationDeploymentDescription> applicationDescriptors = registry.getApplicationDescriptors("testService");
+        Map<String,ApplicationDescription> applicationDescriptors = registry.getApplicationDescriptors("testService");
         assertTrue("application retrieved successfully", applicationDescriptors.size()==2);
 
         registry.removeApplicationDescriptor("testService", "testHost1", "testApplication");
@@ -763,18 +763,18 @@ public class AiravataRegistryAPITest ext
 
 
     public void testGetApplicationDescriptors() throws Exception {
-        ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription(ApplicationDeploymentDescriptionType.type);
-        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDeploymentDescription.getType().addNewApplicationName();
+        ApplicationDescription applicationDescription = new ApplicationDescription(ApplicationDeploymentDescriptionType.type);
+        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDescription.getType().addNewApplicationName();
         applicationName.setStringValue("testApplication");
-        applicationDeploymentDescription.getType().setApplicationName(applicationName);
-        applicationDeploymentDescription.getType().setInputDataDirectory("/bin");
-        applicationDeploymentDescription.getType().setExecutableLocation("/bin/echo");
-        applicationDeploymentDescription.getType().setOutputDataDirectory("/tmp");
+        applicationDescription.getType().setApplicationName(applicationName);
+        applicationDescription.getType().setInputDataDirectory("/bin");
+        applicationDescription.getType().setExecutableLocation("/bin/echo");
+        applicationDescription.getType().setOutputDataDirectory("/tmp");
 
-        registry.addApplicationDescriptor("testService", "testHost1", applicationDeploymentDescription);
-        registry.addApplicationDescriptor("testService", "testHost2", applicationDeploymentDescription);
+        registry.addApplicationDescriptor("testService", "testHost1", applicationDescription);
+        registry.addApplicationDescriptor("testService", "testHost2", applicationDescription);
 
-        Map<String[], ApplicationDeploymentDescription> applicationDescriptors = registry.getApplicationDescriptors();
+        Map<String[], ApplicationDescription> applicationDescriptors = registry.getApplicationDescriptors();
         assertTrue("application retrieved successfully", applicationDescriptors.size()==2);
 
         registry.removeApplicationDescriptor("testService", "testHost1", "testApplication");
@@ -784,15 +784,15 @@ public class AiravataRegistryAPITest ext
 
 
     public void testRemoveApplicationDescriptor() throws Exception {
-        ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription(ApplicationDeploymentDescriptionType.type);
-        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDeploymentDescription.getType().addNewApplicationName();
+        ApplicationDescription applicationDescription = new ApplicationDescription(ApplicationDeploymentDescriptionType.type);
+        ApplicationDeploymentDescriptionType.ApplicationName applicationName = applicationDescription.getType().addNewApplicationName();
         applicationName.setStringValue("testApplication");
-        applicationDeploymentDescription.getType().setApplicationName(applicationName);
-        applicationDeploymentDescription.getType().setInputDataDirectory("/bin");
-        applicationDeploymentDescription.getType().setExecutableLocation("/bin/echo");
-        applicationDeploymentDescription.getType().setOutputDataDirectory("/tmp");
+        applicationDescription.getType().setApplicationName(applicationName);
+        applicationDescription.getType().setInputDataDirectory("/bin");
+        applicationDescription.getType().setExecutableLocation("/bin/echo");
+        applicationDescription.getType().setOutputDataDirectory("/tmp");
 
-        registry.addApplicationDescriptor("testService", "testHost", applicationDeploymentDescription);
+        registry.addApplicationDescriptor("testService", "testHost", applicationDescription);
         registry.removeApplicationDescriptor("testService", "testHost", "testApplication");
 
         assertFalse("application descriptor removed successfully", registry.isApplicationDescriptorExists("testService", "testHost", "testApplication"));

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/DescriptorRegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/DescriptorRegistry.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/DescriptorRegistry.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/DescriptorRegistry.java Wed Dec 26 15:32:51 2012
@@ -24,8 +24,8 @@ package org.apache.airavata.registry.api
 import java.util.List;
 import java.util.Map;
 
+import org.apache.airavata.commons.gfac.type.ApplicationDescription;
 import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
 import org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException;
@@ -58,14 +58,14 @@ public interface DescriptorRegistry exte
 	
 	//---------Application Descriptor data------------
 	public boolean isApplicationDescriptorExists(String serviceName, String hostName, String descriptorName)throws RegistryException;
-	public void addApplicationDescriptor(ServiceDescription serviceDescription, HostDescription hostDescriptor, ApplicationDeploymentDescription descriptor)throws DescriptorAlreadyExistsException, RegistryException;
-	public void addApplicationDescriptor(String serviceName, String hostName, ApplicationDeploymentDescription descriptor)throws DescriptorAlreadyExistsException, RegistryException;
-	public void udpateApplicationDescriptor(ServiceDescription serviceDescription, HostDescription hostDescriptor, ApplicationDeploymentDescription descriptor)throws DescriptorDoesNotExistsException, RegistryException;
-	public void updateApplicationDescriptor(String serviceName, String hostName, ApplicationDeploymentDescription descriptor)throws DescriptorDoesNotExistsException, RegistryException;
-	public ApplicationDeploymentDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName)throws DescriptorDoesNotExistsException, MalformedDescriptorException, RegistryException;
-	public ApplicationDeploymentDescription getApplicationDescriptors(String serviceName, String hostname)throws MalformedDescriptorException, RegistryException;
-	public Map<String,ApplicationDeploymentDescription> getApplicationDescriptors(String serviceName)throws MalformedDescriptorException, RegistryException;
-	public Map<String[],ApplicationDeploymentDescription> getApplicationDescriptors()throws MalformedDescriptorException, RegistryException;
+	public void addApplicationDescriptor(ServiceDescription serviceDescription, HostDescription hostDescriptor, ApplicationDescription descriptor)throws DescriptorAlreadyExistsException, RegistryException;
+	public void addApplicationDescriptor(String serviceName, String hostName, ApplicationDescription descriptor)throws DescriptorAlreadyExistsException, RegistryException;
+	public void udpateApplicationDescriptor(ServiceDescription serviceDescription, HostDescription hostDescriptor, ApplicationDescription descriptor)throws DescriptorDoesNotExistsException, RegistryException;
+	public void updateApplicationDescriptor(String serviceName, String hostName, ApplicationDescription descriptor)throws DescriptorDoesNotExistsException, RegistryException;
+	public ApplicationDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName)throws DescriptorDoesNotExistsException, MalformedDescriptorException, RegistryException;
+	public ApplicationDescription getApplicationDescriptors(String serviceName, String hostname)throws MalformedDescriptorException, RegistryException;
+	public Map<String,ApplicationDescription> getApplicationDescriptors(String serviceName)throws MalformedDescriptorException, RegistryException;
+	public Map<String[],ApplicationDescription> getApplicationDescriptors()throws MalformedDescriptorException, RegistryException;
 	public void removeApplicationDescriptor(String serviceName, String hostName, String applicationName)throws DescriptorDoesNotExistsException, RegistryException;
 	public ResourceMetadata getApplicationDescriptorMetadata(String serviceName, String hostName, String applicationName)throws DescriptorDoesNotExistsException, RegistryException;
 

Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java Wed Dec 26 15:32:51 2012
@@ -28,7 +28,7 @@ import com.sun.jersey.api.client.config.
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.json.JSONConfiguration;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+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.registry.api.PasswordCallback;
@@ -704,7 +704,7 @@ public class DescriptorResourceClient {
 
     public void addApplicationDescriptor(ServiceDescription serviceDescription,
                                          HostDescription hostDescriptor,
-                                         ApplicationDeploymentDescription descriptor) {
+                                         ApplicationDescription descriptor) {
         ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(descriptor);
         applicationDescriptor.setHostdescName(hostDescriptor.getType().getHostName());
         ServiceDescriptor serviceDescriptor = DescriptorUtil.createServiceDescriptor(serviceDescription);
@@ -749,7 +749,7 @@ public class DescriptorResourceClient {
 
     public void addApplicationDescriptor(String serviceName,
                                          String hostName,
-                                         ApplicationDeploymentDescription descriptor) {
+                                         ApplicationDescription descriptor) {
         ServiceDescription serviceDescription = getServiceDescriptor(serviceName);
         ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(descriptor);
         applicationDescriptor.setHostdescName(hostName);
@@ -795,7 +795,7 @@ public class DescriptorResourceClient {
 
     public void udpateApplicationDescriptor(ServiceDescription serviceDescription,
                                             HostDescription hostDescriptor,
-                                            ApplicationDeploymentDescription descriptor) {
+                                            ApplicationDescription descriptor) {
         ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(descriptor);
         applicationDescriptor.setHostdescName(hostDescriptor.getType().getHostName());
         ServiceDescriptor serviceDescriptor = DescriptorUtil.createServiceDescriptor(serviceDescription);
@@ -840,7 +840,7 @@ public class DescriptorResourceClient {
 
     public void updateApplicationDescriptor(String serviceName,
                                             String hostName,
-                                            ApplicationDeploymentDescription descriptor) {
+                                            ApplicationDescription descriptor) {
         ServiceDescription serviceDescription = getServiceDescriptor(serviceName);
         ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(descriptor);
         applicationDescriptor.setHostdescName(hostName);
@@ -884,7 +884,7 @@ public class DescriptorResourceClient {
         }
     }
 
-    public ApplicationDeploymentDescription getApplicationDescriptor(String serviceName,
+    public ApplicationDescription getApplicationDescriptor(String serviceName,
                                                                      String hostname,
                                                                      String applicationName) {
         webResource = getDescriptorRegistryBaseResource().path(
@@ -933,12 +933,12 @@ public class DescriptorResourceClient {
         }
 
         ApplicationDescriptor applicationDescriptor = response.getEntity(ApplicationDescriptor.class);
-        ApplicationDeploymentDescription applicationDeploymentDescription =
+        ApplicationDescription applicationDescription =
                 DescriptorUtil.createApplicationDescription(applicationDescriptor);
-        return applicationDeploymentDescription;
+        return applicationDescription;
     }
 
-    public ApplicationDeploymentDescription getApplicationDescriptors(String serviceName,
+    public ApplicationDescription getApplicationDescriptors(String serviceName,
                                                                       String hostname) {
         webResource = getDescriptorRegistryBaseResource().path(
                 ResourcePathConstants.DecResourcePathConstants.APP_DESC_PER_HOST_SERVICE);
@@ -985,15 +985,15 @@ public class DescriptorResourceClient {
         }
 
         ApplicationDescriptor applicationDescriptor = response.getEntity(ApplicationDescriptor.class);
-        ApplicationDeploymentDescription applicationDeploymentDescription =
+        ApplicationDescription applicationDescription =
                 DescriptorUtil.createApplicationDescription(applicationDescriptor);
-        return applicationDeploymentDescription;
+        return applicationDescription;
     }
 
-    public Map<String, ApplicationDeploymentDescription> getApplicationDescriptors(String serviceName) {
+    public Map<String, ApplicationDescription> getApplicationDescriptors(String serviceName) {
         webResource = getDescriptorRegistryBaseResource().path(
                 ResourcePathConstants.DecResourcePathConstants.APP_DESC_ALL_DESCS_SERVICE);
-        Map<String, ApplicationDeploymentDescription> applicationDeploymentDescriptionMap = new HashMap<String, ApplicationDeploymentDescription>();
+        Map<String, ApplicationDescription> applicationDeploymentDescriptionMap = new HashMap<String, ApplicationDescription>();
         MultivaluedMap queryParams = new MultivaluedMapImpl();
         queryParams.add("serviceName", serviceName);
         builder = BasicAuthHeaderUtil.getBuilder(
@@ -1041,16 +1041,16 @@ public class DescriptorResourceClient {
                 applicationDescriptorList.getApplicationDescriptors();
 
         for (ApplicationDescriptor applicationDescriptor : applicationDescriptors) {
-            ApplicationDeploymentDescription applicationDeploymentDescription =
+            ApplicationDescription applicationDescription =
                     DescriptorUtil.createApplicationDescription(applicationDescriptor);
             applicationDeploymentDescriptionMap.put(
-                    applicationDescriptor.getHostdescName(), applicationDeploymentDescription);
+                    applicationDescriptor.getHostdescName(), applicationDescription);
         }
         return applicationDeploymentDescriptionMap;
     }
 
-    public Map<String[], ApplicationDeploymentDescription> getApplicationDescriptors() {
-        Map<String[], ApplicationDeploymentDescription> applicationDeploymentDescriptionMap = new HashMap<String[], ApplicationDeploymentDescription>();
+    public Map<String[], ApplicationDescription> getApplicationDescriptors() {
+        Map<String[], ApplicationDescription> applicationDeploymentDescriptionMap = new HashMap<String[], ApplicationDescription>();
         webResource = getDescriptorRegistryBaseResource().path(
                 ResourcePathConstants.DecResourcePathConstants.APP_DESC_ALL_DESCRIPTORS);
         builder = BasicAuthHeaderUtil.getBuilder(
@@ -1097,12 +1097,12 @@ public class DescriptorResourceClient {
         ApplicationDescriptor[] applicationDescriptors =
                 applicationDescriptorList.getApplicationDescriptors();
         for (ApplicationDescriptor applicationDescriptor : applicationDescriptors) {
-            ApplicationDeploymentDescription applicationDeploymentDescription =
+            ApplicationDescription applicationDescription =
                     DescriptorUtil.createApplicationDescription(applicationDescriptor);
             String[] descriptors =
                     {applicationDescriptor.getServiceDescriptor().getServiceName(),
                             applicationDescriptor.getHostdescName()};
-            applicationDeploymentDescriptionMap.put(descriptors, applicationDeploymentDescription);
+            applicationDeploymentDescriptionMap.put(descriptors, applicationDescription);
         }
         return applicationDeploymentDescriptionMap;
     }



Mime
View raw message