You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2013/10/09 20:33:10 UTC
svn commit: r1530755 - in
/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings:
resourcemappings/ApplicationDescriptor.java utils/DescriptorUtil.java
Author: lahiru
Date: Wed Oct 9 18:33:09 2013
New Revision: 1530755
URL: http://svn.apache.org/r1530755
Log:
adding new data to mapping.
Modified:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ApplicationDescriptor.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ApplicationDescriptor.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ApplicationDescriptor.java?rev=1530755&r1=1530754&r2=1530755&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ApplicationDescriptor.java (original)
+++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ApplicationDescriptor.java Wed Oct 9 18:33:09 2013
@@ -50,6 +50,8 @@ public class ApplicationDescriptor {
private String stdError;
private String staticWorkigDir;
private HashMap<String, String> environmentVariables;
+ private String installedPath;
+ private String jobSubmitterCommand;
public String getName() {
@@ -243,4 +245,20 @@ public class ApplicationDescriptor {
public void setStaticWorkigDir(String staticWorkigDir) {
this.staticWorkigDir = staticWorkigDir;
}
+
+ public String getInstalledPath() {
+ return installedPath;
+ }
+
+ public String getJobSubmitterCommand() {
+ return jobSubmitterCommand;
+ }
+
+ public void setInstalledPath(String installedPath) {
+ this.installedPath = installedPath;
+ }
+
+ public void setJobSubmitterCommand(String jobSubmitterCommand) {
+ this.jobSubmitterCommand = jobSubmitterCommand;
+ }
}
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=1530755&r1=1530754&r2=1530755&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 Oct 9 18:33:09 2013
@@ -358,6 +358,7 @@ public class DescriptorUtil {
if (applicationDescriptor.getStaticWorkigDir() != null){
appDesc.getType().setStaticWorkingDirectory(applicationDescriptor.getStaticWorkigDir());
}
+
HashMap<String,String> envVariables = applicationDescriptor.getEnvironmentVariables();
if (envVariables != null && !envVariables.isEmpty()){
NameValuePairType[] appEnviVariablesArray = new NameValuePairType[envVariables.size()];
@@ -387,7 +388,8 @@ public class DescriptorUtil {
if (applicationDescriptor.getJobType() != null){
app.setJobType(JobTypeType.Enum.forString(applicationDescriptor.getJobType()));
}
-
+ app.setInstalledParentPath(applicationDescriptor.getInstalledPath());
+ app.setJobSubmitterCommand(applicationDescriptor.getJobSubmitterCommand());
app.setMaxMemory(applicationDescriptor.getMaxMemory());
app.setMinMemory(applicationDescriptor.getMinMemory());
app.setMaxWallTime(applicationDescriptor.getMaxWallTime());
@@ -449,6 +451,8 @@ public class DescriptorUtil {
applicationDescriptor.setMaxMemory(gramApplicationDeploymentType.getMaxMemory());
applicationDescriptor.setMinMemory(gramApplicationDeploymentType.getMinMemory());
applicationDescriptor.setMaxWallTime(gramApplicationDeploymentType.getMaxWallTime());
+ applicationDescriptor.setJobSubmitterCommand(gramApplicationDeploymentType.getJobSubmitterCommand());
+ applicationDescriptor.setInstalledPath(gramApplicationDeploymentType.getInstalledParentPath());
if (gramApplicationDeploymentType.getJobType() != null) {
applicationDescriptor.setJobType(gramApplicationDeploymentType.getJobType().toString());
}