Author: smarru
Date: Sat Dec 1 18:41:25 2012
New Revision: 1416040
URL: http://svn.apache.org/viewvc?rev=1416040&view=rev
Log:
addressing AIRAVATA-671. Removed GRAMDeploymnetType in application description
and renamed batch application to HPCApplicationDeploymentType.
Modified:
airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JSDLGenerator.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ApplicationDescriptorTypes.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.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/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/HostDeploymentDialog.java
Modified:
airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd?rev=1416040&r1=1416039&r2=1416040&view=diff
==============================================================================
---
airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd
(original)
+++
airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/ApplicationDeploymentDescription.xsd
Sat Dec 1 18:41:25 2012
@@ -38,7 +38,7 @@
</sequence>
</complexType>
- <complexType name="batchApplicationDeploymentDescriptionType">
+ <complexType name="hpcApplicationDeploymentType">
<complexContent>
<extension
base="gfac:applicationDeploymentDescriptionType">
<sequence>
@@ -53,26 +53,7 @@
<element name="processorsPerNode"
type="xsd:int" minOccurs="0" maxOccurs="1" />
<element name="minMemory"
type="xsd:int" minOccurs="0" maxOccurs="1" />
<element name="maxMemory"
type="xsd:int" minOccurs="0" maxOccurs="1" />
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="gramApplicationDeploymentType">
- <complexContent>
- <extension
base="gfac:batchApplicationDeploymentDescriptionType">
- <sequence>
- <element name="rslparm"
type="gfac:RSLParmType" minOccurs="0" maxOccurs="unbounded" />
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="unicoreApplicationDeploymentType">
- <complexContent>
- <extension
base="gfac:batchApplicationDeploymentDescriptionType">
- <sequence>
- <element name="jsdlparam"
type="gfac:JSDLParamType" minOccurs="0" maxOccurs="unbounded" />
+ <element name="keyValuePairs"
type="gfac:extendedKeyValueType" minOccurs="0" maxOccurs="unbounded" />
</sequence>
</extension>
</complexContent>
@@ -133,15 +114,7 @@
</sequence>
</complexType>
- <complexType name="RSLParmType">
- <simpleContent>
- <extension base="xsd:string">
- <attribute name="name" type="xsd:string"
use="required" />
- </extension>
- </simpleContent>
- </complexType>
-
- <complexType name="JSDLParamType">
+ <complexType name="extendedKeyValueType">
<simpleContent>
<extension base="xsd:string">
<attribute name="name" type="xsd:string"
use="required" />
Modified:
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java?rev=1416040&r1=1416039&r2=1416040&view=diff
==============================================================================
---
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
(original)
+++
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/GramRSLGenerator.java
Sat Dec 1 18:41:25 2012
@@ -33,7 +33,7 @@ import org.apache.airavata.core.gfac.con
import org.apache.airavata.core.gfac.exception.ProviderException;
import org.apache.airavata.core.gfac.exception.ToolsException;
import org.apache.airavata.core.gfac.utils.GFacConstants;
-import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.HpcApplicationDeploymentType;
import org.apache.airavata.schemas.gfac.NameValuePairType;
import org.apache.airavata.schemas.gfac.QueueType;
import org.apache.airavata.schemas.gfac.URIArrayType;
@@ -55,7 +55,7 @@ public class GramRSLGenerator {
;
public static GramAttributes configureRemoteJob(InvocationContext context)
throws ToolsException {
- GramApplicationDeploymentType app = (GramApplicationDeploymentType)
context.getExecutionDescription().getApp().getType();
+ HpcApplicationDeploymentType app = (HpcApplicationDeploymentType)
context.getExecutionDescription().getApp().getType();
GramAttributes jobAttr = new GramAttributes();
jobAttr.setExecutable(app.getExecutableLocation());
jobAttr.setDirectory(app.getStaticWorkingDirectory());
Modified:
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JSDLGenerator.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JSDLGenerator.java?rev=1416040&r1=1416039&r2=1416040&view=diff
==============================================================================
---
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JSDLGenerator.java
(original)
+++
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JSDLGenerator.java
Sat Dec 1 18:41:25 2012
@@ -22,7 +22,6 @@ package org.apache.airavata.core.gfac.pr
import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.exception.ToolsException;
-import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
import org.apache.xmlbeans.XmlException;
import org.ggf.schemas.jsdl.x2005.x11.jsdl.ApplicationType;
import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDefinitionDocument;
Modified:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ApplicationDescriptorTypes.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ApplicationDescriptorTypes.java?rev=1416040&r1=1416039&r2=1416040&view=diff
==============================================================================
---
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ApplicationDescriptorTypes.java
(original)
+++
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ApplicationDescriptorTypes.java
Sat Dec 1 18:41:25 2012
@@ -23,7 +23,6 @@ package org.apache.airavata.rest.mapping
public class ApplicationDescriptorTypes {
public static final String APP_DEP_DESC_TYPE = "Default";
- public static final String BATCH_APP_DEP_DESC_TYPE = "Batch";
- public static final String GRAM_APP_DEP_DESC_TYPE = "Gram";
+ public static final String HPC_APP_DEP_DESC_TYPE = "HPC";
public static final String HADOOP_APP_DEP_DESC_TYPE = "Hadoop";
}
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=1416040&r1=1416039&r2=1416040&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
Sat Dec 1 18:41:25 2012
@@ -56,15 +56,15 @@ public class DescriptorUtil {
public static ApplicationDeploymentDescription 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(GramApplicationDeploymentType.type);
- GramApplicationDeploymentType app = (GramApplicationDeploymentType)
appDesc.getType();
+ ApplicationDeploymentDescription appDesc = new
ApplicationDeploymentDescription(HpcApplicationDeploymentType.type);
+ HpcApplicationDeploymentType app = (HpcApplicationDeploymentType)
appDesc.getType();
app.setCpuCount(Integer.parseInt(cpuCount));
app.setNodeCount(Integer.parseInt(nodeCount));
ApplicationDeploymentDescriptionType.ApplicationName name =
appDesc.getType().addNewApplicationName();
name.setStringValue(appName);
app.setExecutableLocation(exeuctableLocation);
app.setScratchWorkingDirectory(scratchWorkingDirectory);
- ProjectAccountType projectAccountType =
((GramApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
+ ProjectAccountType projectAccountType =
((HpcApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
projectAccountType.setProjectAccountNumber(projAccNumber);
QueueType queueType = app.addNewQueue();
queueType.setQueueName(queueName);
@@ -258,12 +258,12 @@ public class DescriptorUtil {
//set advanced options according app desc type
if(applicationDescriptor.getApplicationDescType() != null &&
!applicationDescriptor.getApplicationDescType().isEmpty()){
- if
(applicationDescriptor.getApplicationDescType().equals(ApplicationDescriptorTypes.GRAM_APP_DEP_DESC_TYPE)){
- ApplicationDeploymentDescription appDesc = new
ApplicationDeploymentDescription(GramApplicationDeploymentType.type);
+ if
(applicationDescriptor.getApplicationDescType().equals(ApplicationDescriptorTypes.HPC_APP_DEP_DESC_TYPE)){
+ ApplicationDeploymentDescription appDesc = new
ApplicationDeploymentDescription(HpcApplicationDeploymentType.type);
appDesc.getType().setApplicationName(name);
appDesc.getType().setExecutableLocation(applicationDescriptor.getExecutablePath());
appDesc.getType().setOutputDataDirectory(applicationDescriptor.getWorkingDir());
- GramApplicationDeploymentType app =
(GramApplicationDeploymentType) appDesc.getType();
+ HpcApplicationDeploymentType app =
(HpcApplicationDeploymentType) appDesc.getType();
app.setCpuCount(applicationDescriptor.getCpuCount());
app.setJobType(JobTypeType.Enum.forString(applicationDescriptor.getJobType()));
app.setMaxMemory(applicationDescriptor.getMaxMemory());
@@ -272,20 +272,6 @@ public class DescriptorUtil {
app.setNodeCount(applicationDescriptor.getNodeCount());
app.setProcessorsPerNode(applicationDescriptor.getProcessorsPerNode());
return appDesc;
- } else if
(applicationDescriptor.getApplicationDescType().equals(ApplicationDescriptorTypes.BATCH_APP_DEP_DESC_TYPE)){
- ApplicationDeploymentDescription appDesc = new
ApplicationDeploymentDescription(BatchApplicationDeploymentDescriptionType.type);
- appDesc.getType().setApplicationName(name);
-
appDesc.getType().setExecutableLocation(applicationDescriptor.getExecutablePath());
-
appDesc.getType().setOutputDataDirectory(applicationDescriptor.getWorkingDir());
- BatchApplicationDeploymentDescriptionType
applicationDeploymentType = (BatchApplicationDeploymentDescriptionType)
appDesc.getType();
-
applicationDeploymentType.setCpuCount(applicationDescriptor.getCpuCount());
-
applicationDeploymentType.setJobType(JobTypeType.Enum.forString(applicationDescriptor.getJobType()));
-
applicationDeploymentType.setMaxMemory(applicationDescriptor.getMaxMemory());
-
applicationDeploymentType.setMinMemory(applicationDescriptor.getMinMemory());
-
applicationDeploymentType.setMaxWallTime(applicationDescriptor.getMaxWallTime());
-
applicationDeploymentType.setNodeCount(applicationDescriptor.getNodeCount());
-
applicationDeploymentType.setProcessorsPerNode(applicationDescriptor.getProcessorsPerNode());
- return appDesc;
}
}
return applicationDeploymentDescription;
@@ -297,8 +283,8 @@ public class DescriptorUtil {
applicationDescriptor.setExecutablePath(applicationDeploymentDescription.getType().getExecutableLocation());
applicationDescriptor.setWorkingDir(applicationDeploymentDescription.getType().getOutputDataDirectory());
if(applicationDeploymentDescription.getType() != null){
- if(applicationDeploymentDescription.getType() instanceof
GramApplicationDeploymentType){
- GramApplicationDeploymentType gramApplicationDeploymentType =
(GramApplicationDeploymentType)applicationDeploymentDescription.getType();
+ if(applicationDeploymentDescription.getType() instanceof
HpcApplicationDeploymentType){
+ HpcApplicationDeploymentType gramApplicationDeploymentType =
(HpcApplicationDeploymentType)applicationDeploymentDescription.getType();
if(gramApplicationDeploymentType != null){
applicationDescriptor.setCpuCount(gramApplicationDeploymentType.getCpuCount());
applicationDescriptor.setNodeCount(gramApplicationDeploymentType.getNodeCount());
@@ -309,20 +295,6 @@ public class DescriptorUtil {
applicationDescriptor.setQueueName(gramApplicationDeploymentType.getQueue().getQueueName());
}
}
- } else if (applicationDeploymentDescription.getType() instanceof
BatchApplicationDeploymentDescriptionType){
- BatchApplicationDeploymentDescriptionType
batchApplicationDeploymentDescriptionType =
(BatchApplicationDeploymentDescriptionType)applicationDeploymentDescription.getType();
- if (batchApplicationDeploymentDescriptionType != null){
-
applicationDescriptor.setCpuCount(batchApplicationDeploymentDescriptionType.getCpuCount());
-
applicationDescriptor.setNodeCount(batchApplicationDeploymentDescriptionType.getNodeCount());
-
applicationDescriptor.setMaxMemory(batchApplicationDeploymentDescriptionType.getMaxMemory());
-
applicationDescriptor.setMinMemory(batchApplicationDeploymentDescriptionType.getMinMemory());
-
applicationDescriptor.setMaxWallTime(batchApplicationDeploymentDescriptionType.getMaxWallTime());
- if (batchApplicationDeploymentDescriptionType.getQueue()
!= null){
-
applicationDescriptor.setQueueName(batchApplicationDeploymentDescriptionType.getQueue().getQueueName());
- }
-
- }
-
}
}
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=1416040&r1=1416039&r2=1416040&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
Sat Dec 1 18:41:25 2012
@@ -44,7 +44,7 @@ import org.apache.airavata.core.gfac.ser
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.DataType;
import org.apache.airavata.schemas.gfac.GlobusHostType;
-import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.HpcApplicationDeploymentType;
import org.apache.airavata.schemas.gfac.InputParameterType;
import org.apache.airavata.schemas.gfac.OutputParameterType;
import org.apache.airavata.schemas.gfac.ParameterType;
@@ -91,8 +91,8 @@ public class FileBreedGramTest {
/*
* Application deployment description
*/
- ApplicationDeploymentDescription appDesc = new
ApplicationDeploymentDescription(GramApplicationDeploymentType.type);
- GramApplicationDeploymentType app = (GramApplicationDeploymentType)
appDesc.getType();
+ ApplicationDeploymentDescription appDesc = new
ApplicationDeploymentDescription(HpcApplicationDeploymentType.type);
+ HpcApplicationDeploymentType app = (HpcApplicationDeploymentType)
appDesc.getType();
app.setCpuCount(1);
app.setNodeCount(1);
ApplicationDeploymentDescriptionType.ApplicationName name =
appDesc.getType().addNewApplicationName();
@@ -100,7 +100,7 @@ public class FileBreedGramTest {
app.setExecutableLocation("/bin/echo");
app.setScratchWorkingDirectory(properties.getProperty("scratch.working.directory"));
app.setCpuCount(1);
- ProjectAccountType projectAccountType =
((GramApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
+ ProjectAccountType projectAccountType =
((HpcApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
projectAccountType.setProjectAccountNumber(properties.getProperty("allocation.charge.number"));
QueueType queueType = app.addNewQueue();
queueType.setQueueName(properties.getProperty("defualt.queue"));
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=1416040&r1=1416039&r2=1416040&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
Sat Dec 1 18:41:25 2012
@@ -43,7 +43,7 @@ import org.apache.airavata.core.gfac.not
import org.apache.airavata.core.gfac.services.impl.PropertiesBasedServiceImpl;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.GlobusHostType;
-import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.HpcApplicationDeploymentType;
import org.apache.airavata.schemas.gfac.InputParameterType;
import org.apache.airavata.schemas.gfac.JobTypeType;
import org.apache.airavata.schemas.gfac.OutputParameterType;
@@ -80,8 +80,8 @@ public class GramProviderMPIRangerTest {
((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new
String[]{properties.getProperty("gram.endpoints")});
/* Application */
- ApplicationDeploymentDescription appDesc = new
ApplicationDeploymentDescription(GramApplicationDeploymentType.type);
- GramApplicationDeploymentType app = (GramApplicationDeploymentType)
appDesc.getType();
+ ApplicationDeploymentDescription appDesc = new
ApplicationDeploymentDescription(HpcApplicationDeploymentType.type);
+ HpcApplicationDeploymentType app = (HpcApplicationDeploymentType)
appDesc.getType();
app.setCpuCount(1);
app.setNodeCount(1);
ApplicationDeploymentDescriptionType.ApplicationName name =
appDesc.getType().addNewApplicationName();
@@ -91,7 +91,7 @@ public class GramProviderMPIRangerTest {
app.setCpuCount(16);
app.setJobType(JobTypeType.MPI);
//app.setMinMemory();
- ProjectAccountType projectAccountType =
((GramApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
+ ProjectAccountType projectAccountType =
((HpcApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
projectAccountType.setProjectAccountNumber(properties.getProperty("allocation.charge.number"));
/* Service */
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=1416040&r1=1416039&r2=1416040&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
Sat Dec 1 18:41:25 2012
@@ -44,7 +44,7 @@ import org.apache.airavata.core.gfac.not
import org.apache.airavata.core.gfac.services.impl.PropertiesBasedServiceImpl;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.GlobusHostType;
-import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.HpcApplicationDeploymentType;
import org.apache.airavata.schemas.gfac.InputParameterType;
import org.apache.airavata.schemas.gfac.JobTypeType;
import org.apache.airavata.schemas.gfac.OutputParameterType;
@@ -79,8 +79,8 @@ public class GramProviderPwscfRangerTest
((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new
String[]{properties.getProperty("gram.endpoints")});
/* Application */
- ApplicationDeploymentDescription appDesc = new
ApplicationDeploymentDescription(GramApplicationDeploymentType.type);
- GramApplicationDeploymentType app = (GramApplicationDeploymentType)
appDesc.getType();
+ ApplicationDeploymentDescription appDesc = new
ApplicationDeploymentDescription(HpcApplicationDeploymentType.type);
+ HpcApplicationDeploymentType app = (HpcApplicationDeploymentType)
appDesc.getType();
app.setNodeCount(1);
ApplicationDeploymentDescriptionType.ApplicationName name =
appDesc.getType().addNewApplicationName();
name.setStringValue("MockPwscfMPI");
@@ -90,7 +90,7 @@ public class GramProviderPwscfRangerTest
app.setCpuCount(4);
app.setJobType(JobTypeType.MPI);
app.setMaxWallTime(9);
- ProjectAccountType projectAccountType =
((GramApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
+ ProjectAccountType projectAccountType =
((HpcApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
projectAccountType.setProjectAccountNumber(properties.getProperty("allocation.charge.number"));
/* Service */
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=1416040&r1=1416039&r2=1416040&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
Sat Dec 1 18:41:25 2012
@@ -43,7 +43,7 @@ import org.apache.airavata.core.gfac.not
import org.apache.airavata.core.gfac.services.impl.PropertiesBasedServiceImpl;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.GlobusHostType;
-import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.HpcApplicationDeploymentType;
import org.apache.airavata.schemas.gfac.InputParameterType;
import org.apache.airavata.schemas.gfac.OutputParameterType;
import org.apache.airavata.schemas.gfac.ParameterType;
@@ -90,8 +90,8 @@ public class GramProviderTest {
/*
* App
*/
- ApplicationDeploymentDescription appDesc = new
ApplicationDeploymentDescription(GramApplicationDeploymentType.type);
- GramApplicationDeploymentType app = (GramApplicationDeploymentType)
appDesc.getType();
+ ApplicationDeploymentDescription appDesc = new
ApplicationDeploymentDescription(HpcApplicationDeploymentType.type);
+ HpcApplicationDeploymentType app = (HpcApplicationDeploymentType)
appDesc.getType();
app.setCpuCount(1);
app.setNodeCount(1);
ApplicationDeploymentDescriptionType.ApplicationName name =
appDesc.getType().addNewApplicationName();
@@ -99,7 +99,7 @@ public class GramProviderTest {
app.setExecutableLocation("/bin/echo");
app.setScratchWorkingDirectory(properties.getProperty("scratch.working.directory"));
app.setCpuCount(1);
- ProjectAccountType projectAccountType =
((GramApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
+ ProjectAccountType projectAccountType =
((HpcApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
projectAccountType.setProjectAccountNumber(properties.getProperty("allocation.charge.number"));
QueueType queueType = app.addNewQueue();
queueType.setQueueName(properties.getProperty("defualt.queue"));
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=1416040&r1=1416039&r2=1416040&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
Sat Dec 1 18:41:25 2012
@@ -56,7 +56,7 @@ import org.apache.airavata.commons.gfac.
import org.apache.airavata.commons.gfac.type.ServiceDescription;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.GlobusHostType;
-import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.HpcApplicationDeploymentType;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.ui.menues.MenuIcons;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
@@ -706,7 +706,7 @@ public class ApplicationDescriptionDialo
hostDescription =
registry.getApplicationManager().getHostDescription(hostName);
if (hostDescription.getType() instanceof
GlobusHostType) {
getShellApplicationDescription().getType().changeType(
-
GramApplicationDeploymentType.type);
+
HpcApplicationDeploymentType.type);
} else {
getShellApplicationDescription().getType().changeType(
ApplicationDeploymentDescriptionType.type);
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=1416040&r1=1416039&r2=1416040&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
Sat Dec 1 18:41:25 2012
@@ -24,8 +24,8 @@ 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.schemas.gfac.HpcApplicationDeploymentType;
//import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
import org.apache.airavata.schemas.gfac.JobTypeType;
import org.apache.airavata.schemas.gfac.JobTypeType.Enum;
import org.apache.airavata.schemas.gfac.ProjectAccountType;
@@ -222,8 +222,8 @@ public class ApplicationDescriptionHostA
return descriptor;
}
- public GramApplicationDeploymentType getGramApplicationDescriptionType() {
- return (GramApplicationDeploymentType)descriptor.getType();
+ public HpcApplicationDeploymentType getHPCApplicationDescriptionType() {
+ return (HpcApplicationDeploymentType)descriptor.getType();
}
public void
setShellApplicationDescription(ApplicationDeploymentDescription
shellApplicationDescription) {
@@ -236,31 +236,31 @@ public class ApplicationDescriptionHostA
private void saveApplicationDescriptionAdvancedOptions() {
if (isValueNotEmpty(cmbJobType.getText())) {
- getGramApplicationDescriptionType().setJobType(
+ getHPCApplicationDescriptionType().setJobType(
getJobTypeEnum(cmbJobType.getText()));
}
if (isValueNotEmpty(txtMaxWallTime.getText())) {
- getGramApplicationDescriptionType().setMaxWallTime(
+ getHPCApplicationDescriptionType().setMaxWallTime(
Integer.parseInt(txtMaxWallTime.getText()));
}
if (isValueNotEmpty(txtCpuCount.getText())) {
- getGramApplicationDescriptionType().setCpuCount(
+ getHPCApplicationDescriptionType().setCpuCount(
Integer.parseInt(txtCpuCount.getText()));
}
if (isValueNotEmpty(txtProcessorsPerNode.getText())) {
-
getGramApplicationDescriptionType().setProcessorsPerNode(
+ getHPCApplicationDescriptionType().setProcessorsPerNode(
Integer.parseInt(txtProcessorsPerNode.getText()));
}
if (isValueNotEmpty(txtNodeCount.getText())) {
- getGramApplicationDescriptionType().setNodeCount(
+ getHPCApplicationDescriptionType().setNodeCount(
Integer.parseInt(txtNodeCount.getText()));
}
if (isValueNotEmpty(txtMinMemory.getText())) {
- getGramApplicationDescriptionType().setMinMemory(
+ getHPCApplicationDescriptionType().setMinMemory(
Integer.parseInt(txtMinMemory.getText()));
}
if (isValueNotEmpty(txtMaxMemory.getText())) {
- getGramApplicationDescriptionType().setMaxMemory(
+ getHPCApplicationDescriptionType().setMaxMemory(
Integer.parseInt(txtMaxMemory.getText()));
}
ProjectAccountType projectAccount = getProjectAccountType();
@@ -280,17 +280,17 @@ public class ApplicationDescriptionHostA
}
private QueueType getQueueName() {
- if (getGramApplicationDescriptionType().getQueue()==null){
- getGramApplicationDescriptionType().addNewQueue();
+ if (getHPCApplicationDescriptionType().getQueue()==null){
+ getHPCApplicationDescriptionType().addNewQueue();
}
- return getGramApplicationDescriptionType().getQueue();
+ return getHPCApplicationDescriptionType().getQueue();
}
private ProjectAccountType getProjectAccountType() {
- if
(getGramApplicationDescriptionType().getProjectAccount()==null){
-
getGramApplicationDescriptionType().addNewProjectAccount();
+ if
(getHPCApplicationDescriptionType().getProjectAccount()==null){
+ getHPCApplicationDescriptionType().addNewProjectAccount();
}
- return getGramApplicationDescriptionType().getProjectAccount();
+ return getHPCApplicationDescriptionType().getProjectAccount();
}
private String getPropValue(int num){
@@ -302,18 +302,18 @@ public class ApplicationDescriptionHostA
}
private void loadApplicationDescriptionAdvancedOptions() {
- GramApplicationDeploymentType gadType =
getGramApplicationDescriptionType();
- if (gadType.getJobType()!=null) {
- cmbJobType.setSelectedItem(gadType
+ HpcApplicationDeploymentType hpcAppType =
getHPCApplicationDescriptionType();
+ if (hpcAppType.getJobType()!=null) {
+ cmbJobType.setSelectedItem(hpcAppType
.getJobType().toString());
}
- txtMaxWallTime.setText(getPropValue(gadType.getMaxWallTime()));
- txtCpuCount.setText(getPropValue(gadType.getCpuCount()));
- txtNodeCount.setText(getPropValue(gadType.getNodeCount()));
-
txtProcessorsPerNode.setText(getPropValue(gadType.getProcessorsPerNode()));
- txtMinMemory.setText(getPropValue(gadType.getMinMemory()));
- txtMaxMemory.setText(getPropValue(gadType.getMaxMemory()));
- txtNodeCount.setText(getPropValue(gadType.getNodeCount()));
+ txtMaxWallTime.setText(getPropValue(hpcAppType.getMaxWallTime()));
+ txtCpuCount.setText(getPropValue(hpcAppType.getCpuCount()));
+ txtNodeCount.setText(getPropValue(hpcAppType.getNodeCount()));
+
txtProcessorsPerNode.setText(getPropValue(hpcAppType.getProcessorsPerNode()));
+ txtMinMemory.setText(getPropValue(hpcAppType.getMinMemory()));
+ txtMaxMemory.setText(getPropValue(hpcAppType.getMaxMemory()));
+ txtNodeCount.setText(getPropValue(hpcAppType.getNodeCount()));
ProjectAccountType projectAccount = getProjectAccountType();
txtProjectAccountNumber.setText(projectAccount.getProjectAccountNumber()==null?
"":projectAccount.getProjectAccountNumber());
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=1416040&r1=1416039&r2=1416040&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
Sat Dec 1 18:41:25 2012
@@ -56,13 +56,13 @@ import org.apache.airavata.registry.api.
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.schemas.gfac.GramApplicationDeploymentType;
import org.apache.airavata.xbaya.ui.menues.MenuIcons;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
import org.apache.airavata.xbaya.ui.widgets.XBayaLinkButton;
import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
import org.apache.xmlbeans.XmlException;
+import org.ggf.schemas.jsdl.x2006.x07.jsdlHpcpa.HPCProfileApplicationDocument;
public class HostDeploymentDialog extends JDialog implements ActionListener {
/**
@@ -498,7 +498,7 @@ public class HostDeploymentDialog extend
hostDescription =
registry.getApplicationManager().getHostDescription(hostName);
if (hostDescription.getType() instanceof
GlobusHostType) {
getShellApplicationDescription().getType().changeType(
- GramApplicationDeploymentType.type);
+ HPCProfileApplicationDocument.type);
} else {
getShellApplicationDescription().getType().changeType(
ApplicationDeploymentDescriptionType.type);
