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 2012/12/26 16:32:52 UTC
svn commit: r1425953 [2/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/ ...
Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java Wed Dec 26 15:32:51 2012
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
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.AiravataExperiment;
@@ -299,51 +299,51 @@ public class RegistryClient extends Aira
public void addApplicationDescriptor(ServiceDescription serviceDescription,
HostDescription hostDescriptor,
- ApplicationDeploymentDescription descriptor) throws RegistryException {
+ ApplicationDescription descriptor) throws RegistryException {
getDescriptorResourceClient().addApplicationDescriptor(serviceDescription, hostDescriptor, descriptor);
}
public void addApplicationDescriptor(String serviceName,
String hostName,
- ApplicationDeploymentDescription descriptor) throws RegistryException {
+ ApplicationDescription descriptor) throws RegistryException {
getDescriptorResourceClient().addApplicationDescriptor(serviceName, hostName, descriptor);
}
public void udpateApplicationDescriptor(ServiceDescription serviceDescription,
HostDescription hostDescriptor,
- ApplicationDeploymentDescription descriptor) throws RegistryException {
+ ApplicationDescription descriptor) throws RegistryException {
getDescriptorResourceClient().udpateApplicationDescriptor(serviceDescription, hostDescriptor, descriptor);
}
public void updateApplicationDescriptor(String serviceName,
String hostName,
- ApplicationDeploymentDescription descriptor) throws RegistryException {
+ ApplicationDescription descriptor) throws RegistryException {
getDescriptorResourceClient().updateApplicationDescriptor(serviceName, hostName, descriptor);
}
- public ApplicationDeploymentDescription getApplicationDescriptor(String serviceName,
+ public ApplicationDescription getApplicationDescriptor(String serviceName,
String hostname,
String applicationName) throws RegistryException {
return getDescriptorResourceClient().getApplicationDescriptor(serviceName, hostname, applicationName);
}
- public ApplicationDeploymentDescription getApplicationDescriptors(String serviceName,
+ public ApplicationDescription getApplicationDescriptors(String serviceName,
String hostname) throws RegistryException {
return getDescriptorResourceClient().getApplicationDescriptors(serviceName, hostname);
}
- public Map<String, ApplicationDeploymentDescription> getApplicationDescriptors(String serviceName) throws RegistryException {
+ public Map<String, ApplicationDescription> getApplicationDescriptors(String serviceName) throws RegistryException {
return getDescriptorResourceClient().getApplicationDescriptors(serviceName);
}
- public Map<String[], ApplicationDeploymentDescription> getApplicationDescriptors() throws RegistryException {
+ public Map<String[], ApplicationDescription> getApplicationDescriptors() throws RegistryException {
return getDescriptorResourceClient().getApplicationDescriptors();
}
Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java (original)
+++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java Wed Dec 26 15:32:51 2012
@@ -21,7 +21,7 @@
package org.apache.airavata.rest.mappings.utils;
-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.rest.mappings.resourcemappings.ApplicationDescriptor;
@@ -53,10 +53,10 @@ public class DescriptorUtil {
return host;
}
- public static ApplicationDeploymentDescription registerApplication(String appName, String exeuctableLocation, String scratchWorkingDirectory, String hostName,
+ public static ApplicationDescription registerApplication(String appName, String exeuctableLocation, String scratchWorkingDirectory, String hostName,
String projAccNumber, String queueName, String cpuCount, String nodeCount, String maxMemory) throws Exception {
// Create Application Description
- ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription(HpcApplicationDeploymentType.type);
+ ApplicationDescription appDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
HpcApplicationDeploymentType app = (HpcApplicationDeploymentType) appDesc.getType();
app.setCpuCount(Integer.parseInt(cpuCount));
app.setNodeCount(Integer.parseInt(nodeCount));
@@ -251,18 +251,18 @@ public class DescriptorUtil {
return serviceDescriptor;
}
- public static ApplicationDeploymentDescription createApplicationDescription(ApplicationDescriptor applicationDescriptor){
- ApplicationDeploymentDescription applicationDeploymentDescription = new ApplicationDeploymentDescription();
+ public static ApplicationDescription createApplicationDescription(ApplicationDescriptor applicationDescriptor){
+ ApplicationDescription applicationDescription = new ApplicationDescription();
ApplicationDeploymentDescriptionType.ApplicationName name = ApplicationDeploymentDescriptionType.ApplicationName.Factory.newInstance();
name.setStringValue(applicationDescriptor.getName());
- applicationDeploymentDescription.getType().setApplicationName(name);
- applicationDeploymentDescription.getType().setExecutableLocation(applicationDescriptor.getExecutablePath());
- applicationDeploymentDescription.getType().setOutputDataDirectory(applicationDescriptor.getWorkingDir());
+ applicationDescription.getType().setApplicationName(name);
+ applicationDescription.getType().setExecutableLocation(applicationDescriptor.getExecutablePath());
+ applicationDescription.getType().setOutputDataDirectory(applicationDescriptor.getWorkingDir());
//set advanced options according app desc type
if(applicationDescriptor.getApplicationDescType() != null && !applicationDescriptor.getApplicationDescType().isEmpty()){
if (applicationDescriptor.getApplicationDescType().equals(ApplicationDescriptorTypes.HPC_APP_DEP_DESC_TYPE)){
- ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription(HpcApplicationDeploymentType.type);
+ ApplicationDescription appDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
appDesc.getType().setApplicationName(name);
appDesc.getType().setExecutableLocation(applicationDescriptor.getExecutablePath());
appDesc.getType().setOutputDataDirectory(applicationDescriptor.getWorkingDir());
@@ -277,17 +277,17 @@ public class DescriptorUtil {
return appDesc;
}
}
- return applicationDeploymentDescription;
+ return applicationDescription;
}
- public static ApplicationDescriptor createApplicationDescriptor (ApplicationDeploymentDescription applicationDeploymentDescription){
+ public static ApplicationDescriptor createApplicationDescriptor (ApplicationDescription applicationDescription){
ApplicationDescriptor applicationDescriptor = new ApplicationDescriptor();
- applicationDescriptor.setName(applicationDeploymentDescription.getType().getApplicationName().getStringValue());
- applicationDescriptor.setExecutablePath(applicationDeploymentDescription.getType().getExecutableLocation());
- applicationDescriptor.setWorkingDir(applicationDeploymentDescription.getType().getOutputDataDirectory());
- if(applicationDeploymentDescription.getType() != null){
- if(applicationDeploymentDescription.getType() instanceof HpcApplicationDeploymentType){
- HpcApplicationDeploymentType gramApplicationDeploymentType = (HpcApplicationDeploymentType)applicationDeploymentDescription.getType();
+ applicationDescriptor.setName(applicationDescription.getType().getApplicationName().getStringValue());
+ applicationDescriptor.setExecutablePath(applicationDescription.getType().getExecutableLocation());
+ applicationDescriptor.setWorkingDir(applicationDescription.getType().getOutputDataDirectory());
+ if(applicationDescription.getType() != null){
+ if(applicationDescription.getType() instanceof HpcApplicationDeploymentType){
+ HpcApplicationDeploymentType gramApplicationDeploymentType = (HpcApplicationDeploymentType) applicationDescription.getType();
if(gramApplicationDeploymentType != null){
applicationDescriptor.setCpuCount(gramApplicationDeploymentType.getCpuCount());
applicationDescriptor.setNodeCount(gramApplicationDeploymentType.getNodeCount());
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java Wed Dec 26 15:32:51 2012
@@ -21,7 +21,7 @@
package org.apache.airavata.services.registry.rest.resources;
-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.AiravataRegistry2;
@@ -567,7 +567,7 @@ public class DescriptorRegistryResource
builder.entity("Given host does not exist...");
return builder.build();
}
- ApplicationDeploymentDescription applicationDeploymentDescription = DescriptorUtil.createApplicationDescription(applicationDescriptor);
+ ApplicationDescription applicationDescription = DescriptorUtil.createApplicationDescription(applicationDescriptor);
ServiceDescriptor serviceDescriptor = applicationDescriptor.getServiceDescriptor();
String serviceName;
if (serviceDescriptor != null) {
@@ -584,7 +584,7 @@ public class DescriptorRegistryResource
} else {
serviceName = applicationDescriptor.getName();
}
- airavataRegistry.addApplicationDescriptor(serviceName, hostdescName, applicationDeploymentDescription);
+ airavataRegistry.addApplicationDescriptor(serviceName, hostdescName, applicationDescription);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -624,7 +624,7 @@ public class DescriptorRegistryResource
builder.entity("Host does not available...");
return builder.build();
}
- ApplicationDeploymentDescription applicationDeploymentDescription = DescriptorUtil.createApplicationDescription(applicationDescriptor);
+ ApplicationDescription applicationDescription = DescriptorUtil.createApplicationDescription(applicationDescriptor);
ServiceDescriptor serviceDescriptor = applicationDescriptor.getServiceDescriptor();
String serviceName;
if (serviceDescriptor != null) {
@@ -644,7 +644,7 @@ public class DescriptorRegistryResource
} else {
serviceName = applicationDescriptor.getName();
}
- airavataRegistry.updateApplicationDescriptor(serviceName, hostdescName, applicationDeploymentDescription);
+ airavataRegistry.updateApplicationDescriptor(serviceName, hostdescName, applicationDescription);
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity("Application descriptor updated successfully...");
return builder.build();
@@ -680,9 +680,9 @@ public class DescriptorRegistryResource
@QueryParam("applicationName") String applicationName) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- ApplicationDeploymentDescription applicationDeploymentDescription = airavataRegistry.getApplicationDescriptor(serviceName, hostName, applicationName);
- if (applicationDeploymentDescription != null) {
- ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(applicationDeploymentDescription);
+ ApplicationDescription applicationDescription = airavataRegistry.getApplicationDescriptor(serviceName, hostName, applicationName);
+ if (applicationDescription != null) {
+ ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(applicationDescription);
applicationDescriptor.setHostdescName(hostName);
ServiceDescription serviceDescription = airavataRegistry.getServiceDescriptor(serviceName);
ServiceDescriptor serviceDescriptor = DescriptorUtil.createServiceDescriptor(serviceDescription);
@@ -721,14 +721,14 @@ public class DescriptorRegistryResource
@QueryParam("hostName") String hostName) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- ApplicationDeploymentDescription applicationDeploymentDescription = airavataRegistry.getApplicationDescriptors(serviceName, hostName);
- ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(applicationDeploymentDescription);
+ ApplicationDescription applicationDescription = airavataRegistry.getApplicationDescriptors(serviceName, hostName);
+ ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(applicationDescription);
applicationDescriptor.setHostdescName(hostName);
ServiceDescription serviceDescription = airavataRegistry.getServiceDescriptor(serviceName);
ServiceDescriptor serviceDescriptor = DescriptorUtil.createServiceDescriptor(serviceDescription);
applicationDescriptor.setServiceDescriptor(serviceDescriptor);
- if (applicationDeploymentDescription != null) {
+ if (applicationDescription != null) {
Response.ResponseBuilder builder = Response.status(Response.Status.OK);
builder.entity(applicationDescriptor);
return builder.build();
@@ -760,13 +760,13 @@ public class DescriptorRegistryResource
public Response getApplicationDescriptors(@QueryParam("serviceName") String serviceName) {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- Map<String, ApplicationDeploymentDescription> applicationDeploymentDescriptionMap = airavataRegistry.getApplicationDescriptors(serviceName);
+ Map<String, ApplicationDescription> applicationDeploymentDescriptionMap = airavataRegistry.getApplicationDescriptors(serviceName);
ApplicationDescriptorList applicationDescriptorList = new ApplicationDescriptorList();
ApplicationDescriptor[] applicationDescriptors = new ApplicationDescriptor[applicationDeploymentDescriptionMap.size()];
int i = 0;
for (String hostName : applicationDeploymentDescriptionMap.keySet()) {
- ApplicationDeploymentDescription applicationDeploymentDescription = applicationDeploymentDescriptionMap.get(hostName);
- ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(applicationDeploymentDescription);
+ ApplicationDescription applicationDescription = applicationDeploymentDescriptionMap.get(hostName);
+ ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(applicationDescription);
applicationDescriptor.setHostdescName(hostName);
ServiceDescription serviceDescription = airavataRegistry.getServiceDescriptor(serviceName);
@@ -811,13 +811,13 @@ public class DescriptorRegistryResource
public Response getApplicationDescriptors() {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- Map<String[], ApplicationDeploymentDescription> applicationDeploymentDescriptionMap = airavataRegistry.getApplicationDescriptors();
+ Map<String[], ApplicationDescription> applicationDeploymentDescriptionMap = airavataRegistry.getApplicationDescriptors();
ApplicationDescriptorList applicationDescriptorList = new ApplicationDescriptorList();
ApplicationDescriptor[] applicationDescriptors = new ApplicationDescriptor[applicationDeploymentDescriptionMap.size()];
int i = 0;
for (String[] descriptors : applicationDeploymentDescriptionMap.keySet()) {
- ApplicationDeploymentDescription applicationDeploymentDescription = applicationDeploymentDescriptionMap.get(descriptors);
- ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(applicationDeploymentDescription);
+ ApplicationDescription applicationDescription = applicationDeploymentDescriptionMap.get(descriptors);
+ ApplicationDescriptor applicationDescriptor = DescriptorUtil.createApplicationDescriptor(applicationDescription);
applicationDescriptor.setHostdescName(descriptors[1]);
ServiceDescription serviceDescription = airavataRegistry.getServiceDescriptor(descriptors[0]);
if (serviceDescription == null) {
@@ -864,12 +864,12 @@ public class DescriptorRegistryResource
public Response getApplicationDescriptorNames() {
AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
try {
- Map<String[], ApplicationDeploymentDescription> applicationDeploymentDescriptionMap = airavataRegistry.getApplicationDescriptors();
+ Map<String[], ApplicationDescription> applicationDeploymentDescriptionMap = airavataRegistry.getApplicationDescriptors();
DescriptorNameList descriptorNameList = new DescriptorNameList();
List<String> appDesNames = new ArrayList<String>();
for (String[] descriptors : applicationDeploymentDescriptionMap.keySet()) {
- ApplicationDeploymentDescription applicationDeploymentDescription = applicationDeploymentDescriptionMap.get(descriptors);
- appDesNames.add(applicationDeploymentDescription.getType().getApplicationName().getStringValue());
+ ApplicationDescription applicationDescription = applicationDeploymentDescriptionMap.get(descriptors);
+ appDesNames.add(applicationDescription.getType().getApplicationName().getStringValue());
}
descriptorNameList.setDescriptorNames(appDesNames);
if (applicationDeploymentDescriptionMap.size() != 0) {
Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/FileBreedGramTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/FileBreedGramTest.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/FileBreedGramTest.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/FileBreedGramTest.java Wed Dec 26 15:32:51 2012
@@ -32,7 +32,7 @@ import java.util.Properties;
import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.commons.gfac.type.ActualParameter;
-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.impl.DefaultExecutionContext;
@@ -91,7 +91,7 @@ public class FileBreedGramTest {
/*
* Application deployment description
*/
- ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription(HpcApplicationDeploymentType.type);
+ ApplicationDescription appDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
HpcApplicationDeploymentType app = (HpcApplicationDeploymentType) appDesc.getType();
app.setCpuCount(1);
app.setNodeCount(1);
@@ -137,7 +137,7 @@ public class FileBreedGramTest {
* Save deployment descriptions to registry
*/
airavataAPI.getApplicationManager().saveHostDescription(host);
- airavataAPI.getApplicationManager().saveDeploymentDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
+ airavataAPI.getApplicationManager().saveApplicationDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
airavataAPI.getApplicationManager().saveServiceDescription(serv);
// jcrRegistry.deployServiceOnHost(serv.getType().getName(), host.getType().getHostName());
}
Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java Wed Dec 26 15:32:51 2012
@@ -32,7 +32,7 @@ import java.util.Properties;
import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.commons.gfac.type.ActualParameter;
-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.impl.DefaultExecutionContext;
@@ -80,7 +80,7 @@ public class GramProviderMPIRangerTest {
((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new String[]{properties.getProperty("gram.endpoints")});
/* Application */
- ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription(HpcApplicationDeploymentType.type);
+ ApplicationDescription appDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
HpcApplicationDeploymentType app = (HpcApplicationDeploymentType) appDesc.getType();
app.setCpuCount(1);
app.setNodeCount(1);
@@ -118,7 +118,7 @@ public class GramProviderMPIRangerTest {
/* Save to Registry */
airavataAPI.getApplicationManager().saveHostDescription(host);
- airavataAPI.getApplicationManager().saveDeploymentDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
+ airavataAPI.getApplicationManager().saveApplicationDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
airavataAPI.getApplicationManager().saveServiceDescription(serv);
// jcrRegistry.deployServiceOnHost(serv.getType().getName(), host.getType().getHostName());
}
Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java Wed Dec 26 15:32:51 2012
@@ -33,7 +33,7 @@ import java.util.Properties;
import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.commons.gfac.type.ActualParameter;
-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.impl.DefaultExecutionContext;
@@ -79,7 +79,7 @@ public class GramProviderPwscfRangerTest
((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new String[]{properties.getProperty("gram.endpoints")});
/* Application */
- ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription(HpcApplicationDeploymentType.type);
+ ApplicationDescription appDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
HpcApplicationDeploymentType app = (HpcApplicationDeploymentType) appDesc.getType();
app.setNodeCount(1);
ApplicationDeploymentDescriptionType.ApplicationName name = appDesc.getType().addNewApplicationName();
@@ -117,7 +117,7 @@ public class GramProviderPwscfRangerTest
/* Save to Registry */
airavataAPI.getApplicationManager().saveHostDescription(host);
- airavataAPI.getApplicationManager().saveDeploymentDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
+ airavataAPI.getApplicationManager().saveApplicationDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
airavataAPI.getApplicationManager().saveServiceDescription(serv);
// jcrRegistry.deployServiceOnHost(serv.getType().getName(), host.getType().getHostName());
}
Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java Wed Dec 26 15:32:51 2012
@@ -32,7 +32,7 @@ import java.util.Properties;
import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.commons.gfac.type.ActualParameter;
-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.impl.DefaultExecutionContext;
@@ -90,7 +90,7 @@ public class GramProviderTest {
/*
* App
*/
- ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription(HpcApplicationDeploymentType.type);
+ ApplicationDescription appDesc = new ApplicationDescription(HpcApplicationDeploymentType.type);
HpcApplicationDeploymentType app = (HpcApplicationDeploymentType) appDesc.getType();
app.setCpuCount(1);
app.setNodeCount(1);
@@ -141,10 +141,10 @@ public class GramProviderTest {
airavataAPI.getApplicationManager().saveHostDescription(host);
}
- if (airavataAPI.getApplicationManager().isDeploymentDescriptorExists(serv.getType().getName(),host.getType().getHostName(),appDesc.getType().getApplicationName().getStringValue())){
+ if (airavataAPI.getApplicationManager().isApplicationDescriptorExists(serv.getType().getName(), host.getType().getHostName(), appDesc.getType().getApplicationName().getStringValue())){
airavataAPI.getApplicationManager().updateApplicationDescriptor(serv.getType().getName(), host.getType().getHostName(), appDesc);
} else {
- airavataAPI.getApplicationManager().saveDeploymentDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
+ airavataAPI.getApplicationManager().saveApplicationDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
}
if (airavataAPI.getApplicationManager().isServiceDescriptorExists(serv.getType().getName())){
Modified: airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-component/src/main/java/org/apache/airavata/workflow/model/component/registry/JCRComponentRegistry.java Wed Dec 26 15:32:51 2012
@@ -144,12 +144,12 @@ public class JCRComponentRegistry extend
return NAME;
}
-// public String saveDeploymentDescription(String service, String host, ApplicationDeploymentDescription app) {
+// public String saveApplicationDescription(String service, String host, ApplicationDeploymentDescription app) {
// // deploy the service on host
// registry.deployServiceOnHost(service, host);
//
// // save deployment description
-// return registry.saveDeploymentDescription(service, host, app);
+// return registry.saveApplicationDescription(service, host, app);
// }
public AiravataAPI getAiravataAPI() {
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptionWrap.java Wed Dec 26 15:32:51 2012
@@ -23,32 +23,32 @@ package org.apache.airavata.xbaya.model.
import org.apache.airavata.client.api.AiravataAPI;
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.registry.api.AiravataRegistry2;
public class ApplicationDeploymentDescriptionWrap {
- private ApplicationDeploymentDescription applicationDeploymentDescription;
+ private ApplicationDescription applicationDescription;
private String service;
private String host;
// private AiravataRegistry2 registry;
private AiravataAPI airavataAPI;
public ApplicationDeploymentDescriptionWrap(AiravataAPI airavataAPI,
- ApplicationDeploymentDescription applicationDeploymentDescription, String service, String host) {
- setApplicationDeploymentDescription(applicationDeploymentDescription);
+ ApplicationDescription applicationDescription, String service, String host) {
+ setApplicationDescription(applicationDescription);
setService(service);
setHost(host);
setAiravataAPI(airavataAPI);
}
- public ApplicationDeploymentDescription getDescription() {
- return applicationDeploymentDescription;
+ public ApplicationDescription getDescription() {
+ return applicationDescription;
}
- public void setApplicationDeploymentDescription(ApplicationDeploymentDescription applicationDeploymentDescription) {
- this.applicationDeploymentDescription = applicationDeploymentDescription;
+ public void setApplicationDescription(ApplicationDescription applicationDescription) {
+ this.applicationDescription = applicationDescription;
}
public String getService() {
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java Wed Dec 26 15:32:51 2012
@@ -28,8 +28,8 @@ import java.util.Map;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.client.api.ApplicationManager;
+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.ServiceDescription;
//import org.apache.airavata.registry.api.AiravataRegistry2;
@@ -80,17 +80,17 @@ public class ApplicationDeploymentDescri
List<ServiceDescription> serviceDescriptors = applicationManager.getAllServiceDescriptions();
for (ServiceDescription serviceDescription : serviceDescriptors) {
String serviceName = serviceDescription.getType().getName();
- Map<String,ApplicationDeploymentDescription> deploymentDescriptions = applicationManager.getApplicationDescriptors(serviceName);
+ Map<String,ApplicationDescription> deploymentDescriptions = applicationManager.getApplicationDescriptors(serviceName);
for (String hostName : deploymentDescriptions.keySet()) {
- ApplicationDeploymentDescription descriptionWrap=deploymentDescriptions.get(hostName);
+ ApplicationDescription descriptionWrap=deploymentDescriptions.get(hostName);
list.add(new ApplicationDeploymentDescriptionWrap(getAiravataAPI(), descriptionWrap, serviceName,hostName));
}
}
}else{
- Map<String,ApplicationDeploymentDescription> deploymentDescriptions = getAiravataAPI().getApplicationManager().getApplicationDescriptors(serviceName);
+ Map<String,ApplicationDescription> deploymentDescriptions = getAiravataAPI().getApplicationManager().getApplicationDescriptors(serviceName);
for (String hostName : deploymentDescriptions.keySet()) {
- ApplicationDeploymentDescription descriptionWrap=deploymentDescriptions.get(hostName);
+ ApplicationDescription descriptionWrap=deploymentDescriptions.get(hostName);
list.add(new ApplicationDeploymentDescriptionWrap(getAiravataAPI(), descriptionWrap, getServiceName(),hostName));
}
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ApplicationDeploymentDescriptionNode.java Wed Dec 26 15:32:51 2012
@@ -29,7 +29,6 @@ import javax.swing.JTree;
import javax.swing.tree.TreeNode;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptionWrap;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
import org.apache.airavata.xbaya.ui.actions.registry.browser.DeleteAction;
@@ -101,7 +100,7 @@ public class ApplicationDeploymentDescri
if (askQuestion("Application description",
"Are you sure that you want to remove the application description \""
+ getApplicationDeploymentDescriptionWrap().getDescription().getType().getApplicationName().getStringValue() + "\"?")) {
- getRegistry().getApplicationManager().deleteDeploymentDescription(getApplicationDeploymentDescriptionWrap().getService(),
+ getRegistry().getApplicationManager().deleteApplicationDescription(getApplicationDeploymentDescriptionWrap().getService(),
getApplicationDeploymentDescriptionWrap().getHost(),
getApplicationDeploymentDescriptionWrap().getDescription().getType().getApplicationName().getStringValue());
((AbstractAiravataTreeNode) getParent()).refresh();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionAdvancedOptionDialog.java Wed Dec 26 15:32:51 2012
@@ -44,7 +44,7 @@ import javax.swing.table.DefaultTableMod
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.common.utils.SwingUtil;
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.commons.gfac.type.ApplicationDescription;
//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.NameValuePairType;
@@ -60,7 +60,7 @@ public class ApplicationDescriptionAdvan
private XBayaTextField txtSTDOUT;
private XBayaTextField txtSTDERR;
private JTable tblEnv;
- private ApplicationDeploymentDescription shellApplicationDescription;
+ private ApplicationDescription shellApplicationDescription;
private DefaultTableModel defaultTableModel;
private boolean tableModelChanging = false;
private JButton btnDeleteVariable;
@@ -85,7 +85,7 @@ public class ApplicationDescriptionAdvan
/**
* Create the dialog.
*/
- public ApplicationDescriptionAdvancedOptionDialog(AiravataAPI registry, ApplicationDeploymentDescription descriptor) {
+ public ApplicationDescriptionAdvancedOptionDialog(AiravataAPI registry, ApplicationDescription descriptor) {
addWindowListener(new WindowAdapter() {
@Override
public void windowOpened(WindowEvent arg0) {
@@ -281,7 +281,7 @@ public class ApplicationDescriptionAdvan
addNewRowIfLastIsNotEmpty();
}
- public ApplicationDeploymentDescription getApplicationDescription() {
+ public ApplicationDescription getApplicationDescription() {
return shellApplicationDescription;
}
@@ -289,7 +289,7 @@ public class ApplicationDescriptionAdvan
return (ApplicationDeploymentDescriptionType)shellApplicationDescription.getType();
}
- public void setShellApplicationDescription(ApplicationDeploymentDescription shellApplicationDescription) {
+ public void setShellApplicationDescription(ApplicationDescription shellApplicationDescription) {
this.shellApplicationDescription = shellApplicationDescription;
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java Wed Dec 26 15:32:51 2012
@@ -51,7 +51,7 @@ import javax.swing.SwingConstants;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.common.utils.SwingUtil;
-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.ApplicationDeploymentDescriptionType;
@@ -76,7 +76,7 @@ public class ApplicationDescriptionDialo
private XBayaTextField txtTempDir;
private AiravataAPI registry;
- private ApplicationDeploymentDescription shellApplicationDescription;
+ private ApplicationDescription shellApplicationDescription;
private JLabel lblError;
private boolean applcationDescCreated = false;
private JButton okButton;
@@ -88,7 +88,7 @@ public class ApplicationDescriptionDialo
private XBayaEngine engine;
private JButton btnHostAdvanceOptions;
private boolean newDescritor;
- private ApplicationDeploymentDescription originalDeploymentDescription;
+ private ApplicationDescription originalDescription;
private String originalHost;
private String originalService;
private ServiceDescription serviceDescription=null;
@@ -114,9 +114,9 @@ public class ApplicationDescriptionDialo
/**
* Create the dialog.
*/
- public ApplicationDescriptionDialog(XBayaEngine engine, boolean newDescritor, ApplicationDeploymentDescription originalDeploymentDescription, String originalHost, String originalService) {
+ public ApplicationDescriptionDialog(XBayaEngine engine, boolean newDescritor, ApplicationDescription originalDescription, String originalHost, String originalService) {
setNewDescritor(newDescritor);
- setOriginalDeploymentDescription(originalDeploymentDescription);
+ setOriginalDescription(originalDescription);
setOriginalHost(originalHost);
setOriginalService(originalService);
setRegistry(engine.getConfiguration().getAiravataAPI());
@@ -128,12 +128,12 @@ public class ApplicationDescriptionDialo
int i = 1;
String defaultName = baseName + i;
try {
- ApplicationDeploymentDescription applicationDeploymentDescription = getRegistry()
- .getApplicationManager().getDeploymentDescription(getServiceName(),
- getHostName());
+ ApplicationDescription applicationDescription = getRegistry()
+ .getApplicationManager().getApplicationDescription(getServiceName(),
+ getHostName());
while (true) {
boolean notFound = true;
- if (applicationDeploymentDescription.getType()
+ if (applicationDescription.getType()
.getApplicationName().getStringValue()
.equals(defaultName)) {
notFound = false;
@@ -180,7 +180,7 @@ public class ApplicationDescriptionDialo
if (isNewDescritor()) {
setTitle("Application Description");
}else{
- setTitle("Update Application Description: "+getOriginalDeploymentDescription().getType().getApplicationName().getStringValue());
+ setTitle("Update Application Description: "+ getOriginalDescription().getType().getApplicationName().getStringValue());
}
setBounds(100, 100, 600, 620);
setModal(true);
@@ -501,11 +501,11 @@ public class ApplicationDescriptionDialo
// }
private void loadData(){
- txtAppName.setText(getOriginalDeploymentDescription().getType().getApplicationName().getStringValue());
+ txtAppName.setText(getOriginalDescription().getType().getApplicationName().getStringValue());
setApplicationName(txtAppName.getText());
- txtExecPath.setText(getOriginalDeploymentDescription().getType().getExecutableLocation());
+ txtExecPath.setText(getOriginalDescription().getType().getExecutableLocation());
setExecutablePath(txtExecPath.getText());
- txtTempDir.setText(getOriginalDeploymentDescription().getType().getScratchWorkingDirectory());
+ txtTempDir.setText(getOriginalDescription().getType().getScratchWorkingDirectory());
setTempDir(txtTempDir.getText());
cmbHostName.setSelectedItem(getOriginalHost());
@@ -533,13 +533,13 @@ public class ApplicationDescriptionDialo
updateHostName();
}
- public ApplicationDeploymentDescription getShellApplicationDescription() {
+ public ApplicationDescription getShellApplicationDescription() {
if(shellApplicationDescription == null){
if (isNewDescritor()) {
- shellApplicationDescription = new ApplicationDeploymentDescription();
+ shellApplicationDescription = new ApplicationDescription();
}else{
try {
- shellApplicationDescription=ApplicationDeploymentDescription.fromXML(getOriginalDeploymentDescription().toXML());
+ shellApplicationDescription= ApplicationDescription.fromXML(getOriginalDescription().toXML());
} catch (XmlException e) {
//shouldn't happen (hopefully)
}
@@ -605,15 +605,15 @@ public class ApplicationDescriptionDialo
public void saveApplicationDescription() {
try {
try {
- getRegistry().getApplicationManager().saveDeploymentDescription(getServiceName(), getHostName(), getShellApplicationDescription());
+ getRegistry().getApplicationManager().saveApplicationDescription(getServiceName(), getHostName(), getShellApplicationDescription());
} catch (AiravataAPIInvocationException e) {
getRegistry().getApplicationManager().updateApplicationDescriptor(getServiceName(), getHostName(), getShellApplicationDescription());
}
if (!isNewDescritor() && (!getServiceName().equals(getOriginalService()) || !getHostName().equals(getOriginalHost()))) {
try {
- getRegistry().getApplicationManager().deleteDeploymentDescription(getOriginalService(),
- getOriginalHost(),getOriginalDeploymentDescription().getType()
- .getApplicationName().getStringValue());
+ getRegistry().getApplicationManager().deleteApplicationDescription(getOriginalService(),
+ getOriginalHost(), getOriginalDescription().getType()
+ .getApplicationName().getStringValue());
} catch (AiravataAPIInvocationException e) {
engine.getGUI().getErrorWindow().error(e);
}
@@ -656,14 +656,14 @@ public class ApplicationDescriptionDialo
throw new Exception("Name of the application cannot be empty!!!");
}
- ApplicationDeploymentDescription deploymentDescriptions = null;
+ ApplicationDescription descriptions = null;
try {
- deploymentDescriptions = getRegistry().getApplicationManager().getApplicationDescriptor(getServiceName(), getHostName(),
+ descriptions = getRegistry().getApplicationManager().getApplicationDescriptor(getServiceName(), getHostName(),
getApplicationName());
} catch (AiravataAPIInvocationException e) {
throw e;
}
- if (deploymentDescriptions!=null && (isNewDescritor() || (!getServiceName().equals(getOriginalService()) || !getHostName().equals(getOriginalHost())))) {
+ if (descriptions !=null && (isNewDescritor() || (!getServiceName().equals(getOriginalService()) || !getHostName().equals(getOriginalHost())))) {
throw new Exception("Application name already exists for the selected service & host!!!");
}
@@ -777,13 +777,13 @@ public class ApplicationDescriptionDialo
this.newDescritor = newDescritor;
}
- public ApplicationDeploymentDescription getOriginalDeploymentDescription() {
- return originalDeploymentDescription;
+ public ApplicationDescription getOriginalDescription() {
+ return originalDescription;
}
- public void setOriginalDeploymentDescription(
- ApplicationDeploymentDescription originalDeploymentDescription) {
- this.originalDeploymentDescription = originalDeploymentDescription;
+ public void setOriginalDescription(
+ ApplicationDescription originalDescription) {
+ this.originalDescription = originalDescription;
}
public String getOriginalService() {
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java Wed Dec 26 15:32:51 2012
@@ -23,7 +23,7 @@ package org.apache.airavata.xbaya.ui.dia
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.common.utils.SwingUtil;
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.commons.gfac.type.ApplicationDescription;
import org.apache.airavata.schemas.gfac.HpcApplicationDeploymentType;
//import org.apache.airavata.registry.api.AiravataRegistry2;
import org.apache.airavata.schemas.gfac.JobTypeType;
@@ -57,7 +57,7 @@ public class ApplicationDescriptionHostA
private XBayaTextField txtProcessorsPerNode = new XBayaTextField();
private JButton okButton;
private AiravataAPI registry;
- private ApplicationDeploymentDescription descriptor;
+ private ApplicationDescription descriptor;
private XBayaLabel lblCpuCount;
private XBayaLabel lblProcessorPerNode;
private XBayaLabel lbNodeCount;
@@ -65,7 +65,7 @@ public class ApplicationDescriptionHostA
/**
* Create the dialog.
*/
- public ApplicationDescriptionHostAdvancedOptionDialog(AiravataAPI registry, ApplicationDeploymentDescription descriptor) {
+ public ApplicationDescriptionHostAdvancedOptionDialog(AiravataAPI registry, ApplicationDescription descriptor) {
addWindowListener(new WindowAdapter() {
@Override
public void windowOpened(WindowEvent arg0) {
@@ -218,7 +218,7 @@ public class ApplicationDescriptionHostA
return null;
}
- public ApplicationDeploymentDescription getApplicationDescription() {
+ public ApplicationDescription getApplicationDescription() {
return descriptor;
}
@@ -226,7 +226,7 @@ public class ApplicationDescriptionHostA
return (HpcApplicationDeploymentType)descriptor.getType();
}
- public void setShellApplicationDescription(ApplicationDeploymentDescription shellApplicationDescription) {
+ public void setShellApplicationDescription(ApplicationDescription shellApplicationDescription) {
this.descriptor = shellApplicationDescription;
}
@@ -349,7 +349,7 @@ public class ApplicationDescriptionHostA
//
// List<ApplicationDeploymentDescription> deploymentDescriptions=null;
// try {
- // deploymentDescriptions = getJCRComponentRegistry().getRegistry().searchDeploymentDescription(getServiceName(),
+ // deploymentDescriptions = getJCRComponentRegistry().getRegistry().searchApplicationDescription(getServiceName(),
// getHostName(), Pattern.quote(getApplicationName()));
// } catch (PathNotFoundException e) {
// //what we want
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java Wed Dec 26 15:32:51 2012
@@ -47,13 +47,10 @@ import javax.xml.namespace.QName;
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.utils.SwingUtil;
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
//import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.exception.gateway.DescriptorDoesNotExistsException;
-import org.apache.airavata.registry.api.exception.gateway.MalformedDescriptorException;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.DataType;
import org.apache.airavata.schemas.gfac.HostDescriptionType;
@@ -478,7 +475,7 @@ public class DeploymentDescriptionDialog
updateIODataTable(descType);
getDeployments().clear();
try {
- Map<String, ApplicationDeploymentDescription> descs = getRegistry().getApplicationManager().getApplicationDescriptors(descType.getName());
+ Map<String, ApplicationDescription> descs = getRegistry().getApplicationManager().getApplicationDescriptors(descType.getName());
for (String hostDescName : descs.keySet()) {
getDeployments().put(hostDescName, new HostDeployment(getRegistry().getApplicationManager().getHostDescription(hostDescName), descs.get(hostDescName)));
}
@@ -651,13 +648,13 @@ public class DeploymentDescriptionDialog
getRegistry().getApplicationManager().saveServiceDescription(getServiceDescription());
}
if (!isNewDescription()) {
- Map<String, ApplicationDeploymentDescription> descs = getRegistry().getApplicationManager().getApplicationDescriptors(getServiceName());
+ Map<String, ApplicationDescription> descs = getRegistry().getApplicationManager().getApplicationDescriptors(getServiceName());
for (String hostDescName : descs.keySet()) {
- getRegistry().getApplicationManager().deleteDeploymentDescription(getServiceName(), hostDescName, descs.get(hostDescName).getType().getApplicationName().getStringValue());
+ getRegistry().getApplicationManager().deleteApplicationDescription(getServiceName(), hostDescName, descs.get(hostDescName).getType().getApplicationName().getStringValue());
}
}
for (String hostName : getDeployments().keySet()) {
- getRegistry().getApplicationManager().saveDeploymentDescription(getServiceName(), hostName, getDeployments().get(hostName).getApplicationDescription());
+ getRegistry().getApplicationManager().saveApplicationDescription(getServiceName(), hostName, getDeployments().get(hostName).getApplicationDescription());
}
setServiceCreated(true);
JOptionPane.showMessageDialog(this, "Application '" + getServiceName() + "' is registered Successfully !");
@@ -697,13 +694,13 @@ public class DeploymentDescriptionDialog
getServiceDescriptionType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[] {}));
getRegistry().getApplicationManager().saveServiceDescription(getServiceDescription());
if (!isNewDescription()) {
- Map<String, ApplicationDeploymentDescription> descs = getRegistry().getApplicationManager().getApplicationDescriptors(getServiceName());
+ Map<String, ApplicationDescription> descs = getRegistry().getApplicationManager().getApplicationDescriptors(getServiceName());
for (String hostDescName : descs.keySet()) {
- getRegistry().getApplicationManager().deleteDeploymentDescription(getServiceName(), hostDescName, descs.get(hostDescName).getType().getApplicationName().getStringValue());
+ getRegistry().getApplicationManager().deleteApplicationDescription(getServiceName(), hostDescName, descs.get(hostDescName).getType().getApplicationName().getStringValue());
}
}
for (String hostName : getDeployments().keySet()) {
- getRegistry().getApplicationManager().saveDeploymentDescription(getServiceName(), hostName, getDeployments().get(hostName).getApplicationDescription());
+ getRegistry().getApplicationManager().saveApplicationDescription(getServiceName(), hostName, getDeployments().get(hostName).getApplicationDescription());
}
setServiceCreated(true);
JOptionPane.showMessageDialog(this, "Application '" + getServiceName() + "' is registered Successfully !");
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java Wed Dec 26 15:32:51 2012
@@ -46,7 +46,7 @@ import javax.swing.event.ListSelectionLi
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
import org.apache.airavata.common.utils.SwingUtil;
-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.xbaya.XBayaEngine;
@@ -67,7 +67,7 @@ public class DescriptorEditorDialog exte
private JList descriptorList;
- private Map<ApplicationDeploymentDescription,String> dlist;
+ private Map<ApplicationDescription,String> dlist;
private JButton editButton;
@@ -231,7 +231,7 @@ public class DescriptorEditorDialog exte
}
break;
case APPLICATION:
- ApplicationDeploymentDescription a = (ApplicationDeploymentDescription) getSelected();
+ ApplicationDescription a = (ApplicationDescription) getSelected();
String[] s = dlist.get(a).split("\\$");
ApplicationDescriptionDialog aDescriptionDialog = new ApplicationDescriptionDialog(engine,false,a,s[1],s[0]);
aDescriptionDialog.setLocationRelativeTo(this.engine.getGUI().getFrame());
@@ -296,7 +296,7 @@ public class DescriptorEditorDialog exte
+ d.getType().getName() + "\"?";
break;
case APPLICATION:
- ApplicationDeploymentDescription a = (ApplicationDeploymentDescription) getSelected();
+ ApplicationDescription a = (ApplicationDescription) getSelected();
title = "Service description";
question = "Are you sure that you want to remove the service description \""
+ a.getType().getApplicationName().getStringValue() + "\"?";
@@ -315,9 +315,9 @@ public class DescriptorEditorDialog exte
getRegistry().getApplicationManager().deleteServiceDescription(d.getType().getName());
break;
case APPLICATION:
- ApplicationDeploymentDescription a = (ApplicationDeploymentDescription) getSelected();
+ ApplicationDescription a = (ApplicationDescription) getSelected();
String[] s = dlist.get(a).split("\\$");
- getRegistry().getApplicationManager().deleteDeploymentDescription(s[0], s[1], a.getType().getApplicationName().getStringValue());
+ getRegistry().getApplicationManager().deleteApplicationDescription(s[0], s[1], a.getType().getApplicationName().getStringValue());
break;
}
loadDescriptors();
@@ -342,12 +342,12 @@ public class DescriptorEditorDialog exte
descriptors = getRegistry().getApplicationManager().getAllServiceDescriptions();
break;
case APPLICATION:
- Map<String,ApplicationDeploymentDescription> temp =getRegistry().getApplicationManager().getApplicationDescriptors(null);
+ Map<String,ApplicationDescription> temp =getRegistry().getApplicationManager().getApplicationDescriptors(null);
for(String value:temp.keySet()) {
dlist.put(temp.get(value), value);
}
- descriptors =Arrays.asList(dlist.keySet().toArray(new ApplicationDeploymentDescription[]{}));
+ descriptors =Arrays.asList(dlist.keySet().toArray(new ApplicationDescription[]{}));
break;
}
for (Object d : descriptors) {
@@ -375,7 +375,7 @@ public class DescriptorEditorDialog exte
((JLabel) c).setIcon(JCRBrowserIcons.SERVICE_ICON);
break;
case APPLICATION:
- ((JLabel) c).setText(((ApplicationDeploymentDescription)value).getType().getApplicationName().getStringValue());
+ ((JLabel) c).setText(((ApplicationDescription)value).getType().getApplicationName().getStringValue());
((JLabel) c).setIcon(JCRBrowserIcons.APPLICATION_ICON);
break;
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorListDialog.java Wed Dec 26 15:32:51 2012
@@ -44,9 +44,8 @@ import javax.swing.event.ListSelectionLi
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.utils.SwingUtil;
-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.AiravataRegistry2;
@@ -67,7 +66,7 @@ public class DescriptorListDialog extend
private JList descriptorList;
- private Map<String[],ApplicationDeploymentDescription> dlist;
+ private Map<String[],ApplicationDescription> dlist;
private JButton okButton;
@@ -202,8 +201,8 @@ public class DescriptorListDialog extend
descriptors = getRegistry().getApplicationManager().getAllServiceDescriptions();
break;
case APPLICATION:
- dlist=getRegistry().getApplicationManager().getAllDeploymentDescriptions();
- descriptors =Arrays.asList(dlist.values().toArray(new ApplicationDeploymentDescription[]{}));
+ dlist=getRegistry().getApplicationManager().getAllApplicationDescriptions();
+ descriptors =Arrays.asList(dlist.values().toArray(new ApplicationDescription[]{}));
break;
}
for (Object d : descriptors) {
@@ -234,7 +233,7 @@ public class DescriptorListDialog extend
((JLabel) c).setIcon(JCRBrowserIcons.SERVICE_ICON);
break;
case APPLICATION:
- ((JLabel) c).setText(((ApplicationDeploymentDescription)value).getType().getApplicationName().getStringValue());
+ ((JLabel) c).setText(((ApplicationDescription)value).getType().getApplicationName().getStringValue());
((JLabel) c).setIcon(JCRBrowserIcons.APPLICATION_ICON);
break;
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java Wed Dec 26 15:32:51 2012
@@ -47,13 +47,10 @@ import javax.swing.SwingConstants;
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.utils.SwingUtil;
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
//import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.exception.gateway.DescriptorDoesNotExistsException;
-import org.apache.airavata.registry.api.exception.gateway.MalformedDescriptorException;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.GlobusHostType;
import org.apache.airavata.xbaya.ui.menues.MenuIcons;
@@ -73,7 +70,7 @@ public class HostDeploymentDialog extend
private XBayaTextField txtTempDir;
private AiravataAPI registry;
- private ApplicationDeploymentDescription shellApplicationDescription;
+ private ApplicationDescription shellApplicationDescription;
private JLabel lblError;
private boolean applcationDescCreated = false;
private JButton okButton;
@@ -83,7 +80,7 @@ public class HostDeploymentDialog extend
private JButton btnHostAdvanceOptions;
private boolean newDescriptor;
- private ApplicationDeploymentDescription originalDeploymentDescription;
+ private ApplicationDescription originalDescription;
private String originalHost;
private JButton btnTmpDirBrowse;
private JButton btnExecBrowse;
@@ -92,9 +89,9 @@ public class HostDeploymentDialog extend
/**
* Create the dialog.
*/
- public HostDeploymentDialog(AiravataAPI registry, boolean newDescriptor, ApplicationDeploymentDescription originalDeploymentDescription, String originalHost, List<String> existingHostList) {
+ public HostDeploymentDialog(AiravataAPI registry, boolean newDescriptor, ApplicationDescription originalDescription, String originalHost, List<String> existingHostList) {
setNewDescriptor(newDescriptor);
- setOriginalDeploymentDescription(originalDeploymentDescription);
+ setOriginalDescription(originalDescription);
setOriginalHost(originalHost);
setRegistry(registry);
setExistingHostList(existingHostList);
@@ -114,7 +111,7 @@ public class HostDeploymentDialog extend
if (isNewDescriptor()) {
setTitle("New Application Deployment");
}else{
- setTitle("Update Application Deployment: "+getOriginalDeploymentDescription().getType().getApplicationName().getStringValue());
+ setTitle("Update Application Deployment: "+ getOriginalDescription().getType().getApplicationName().getStringValue());
}
setBounds(100, 100, 600, 620);
setModal(true);
@@ -359,9 +356,9 @@ public class HostDeploymentDialog extend
}
private void loadData(){
- txtExecPath.setText(getOriginalDeploymentDescription().getType().getExecutableLocation());
+ txtExecPath.setText(getOriginalDescription().getType().getExecutableLocation());
setExecutablePath(txtExecPath.getText());
- txtTempDir.setText(getOriginalDeploymentDescription().getType().getScratchWorkingDirectory());
+ txtTempDir.setText(getOriginalDescription().getType().getScratchWorkingDirectory());
setTempDir(txtTempDir.getText());
cmbHostName.setSelectedItem(getOriginalHost());
@@ -385,13 +382,13 @@ public class HostDeploymentDialog extend
updateHostName();
}
- public ApplicationDeploymentDescription getShellApplicationDescription() {
+ public ApplicationDescription getShellApplicationDescription() {
if(shellApplicationDescription == null){
if (isNewDescriptor()) {
- shellApplicationDescription = new ApplicationDeploymentDescription();
+ shellApplicationDescription = new ApplicationDescription();
}else{
try {
- shellApplicationDescription=ApplicationDeploymentDescription.fromXML(getOriginalDeploymentDescription().toXML());
+ shellApplicationDescription= ApplicationDescription.fromXML(getOriginalDescription().toXML());
} catch (XmlException e) {
//shouldn't happen (hopefully)
}
@@ -553,13 +550,13 @@ public class HostDeploymentDialog extend
this.newDescriptor = newDescriptor;
}
- public ApplicationDeploymentDescription getOriginalDeploymentDescription() {
- return originalDeploymentDescription;
+ public ApplicationDescription getOriginalDescription() {
+ return originalDescription;
}
- public void setOriginalDeploymentDescription(
- ApplicationDeploymentDescription originalDeploymentDescription) {
- this.originalDeploymentDescription = originalDeploymentDescription;
+ public void setOriginalDescription(
+ ApplicationDescription originalDescription) {
+ this.originalDescription = originalDescription;
}
public String getOriginalHost() {
@@ -587,15 +584,15 @@ public class HostDeploymentDialog extend
public static class HostDeployment{
private HostDescription hostDescription;
- private ApplicationDeploymentDescription applicationDescription;
- public HostDeployment(HostDescription hostDescription,ApplicationDeploymentDescription applicationDescription) {
+ private ApplicationDescription applicationDescription;
+ public HostDeployment(HostDescription hostDescription,ApplicationDescription applicationDescription) {
setHostDescription(hostDescription);
setApplicationDescription(applicationDescription);
}
- public ApplicationDeploymentDescription getApplicationDescription() {
+ public ApplicationDescription getApplicationDescription() {
return applicationDescription;
}
- public void setApplicationDescription(ApplicationDeploymentDescription applicationDescription) {
+ public void setApplicationDescription(ApplicationDescription applicationDescription) {
this.applicationDescription = applicationDescription;
}
public HostDescription getHostDescription() {
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java?rev=1425953&r1=1425952&r2=1425953&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/RegistryServiceTest.java Wed Dec 26 15:32:51 2012
@@ -21,8 +21,8 @@
package org.apache.airavata.xbaya.interpreter;
+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.schemas.gfac.ApplicationDeploymentDescriptionType;
@@ -72,8 +72,8 @@ public class RegistryServiceTest {
return serv;
}
- private ApplicationDeploymentDescription createAppDeploymentDescription() {
- ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription();
+ private ApplicationDescription createAppDeploymentDescription() {
+ ApplicationDescription appDesc = new ApplicationDescription();
ApplicationDeploymentDescriptionType app = appDesc.getType();
ApplicationDeploymentDescriptionType.ApplicationName name = ApplicationDeploymentDescriptionType.ApplicationName.Factory
.newInstance();