Author: lahiru
Date: Fri Oct 4 18:10:54 2013
New Revision: 1529245
URL: http://svn.apache.org/r1529245
Log:
adding new parameter to jd.
Modified:
airavata/sandbox/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java
airavata/sandbox/gsissh/src/main/resources/PBSTemplate.xslt
airavata/sandbox/gsissh/src/main/resources/schemas/PBSJobDescriptor.xsd
Modified:
airavata/sandbox/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java
URL:
http://svn.apache.org/viewvc/airavata/sandbox/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java?rev=1529245&r1=1529244&r2=1529245&view=diff
==============================================================================
---
airavata/sandbox/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java
(original)
+++
airavata/sandbox/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java
Fri Oct 4 18:10:54 2013
@@ -220,6 +220,10 @@ public class JobDescriptor {
this.getJobDescriptorDocument().getJobDescriptor().getPostJobCommands().addCommand(command);
}
+ public void setJobSubmitter(String jobSubmitter){
+
this.getJobDescriptorDocument().getJobDescriptor().setJobSubmitterCommand(jobSubmitter);
+ }
+
public String getExecutablePath() {
return
this.getJobDescriptorDocument().getJobDescriptor().getExecutablePath();
}
@@ -330,13 +334,13 @@ public class JobDescriptor {
return this.getJobDescriptorDocument().getJobDescriptor().getJobID();
}
-
public String[] getPostJobCommands(){
if(this.getJobDescriptorDocument().getJobDescriptor().getPostJobCommands() !=
null) {
return
this.getJobDescriptorDocument().getJobDescriptor().getPostJobCommands().getCommandArray();
}
return null;
}
+
public String[] getPreJobCommands(){
if(this.getJobDescriptorDocument().getJobDescriptor().getPreJobCommands() !=
null) {
return
this.getJobDescriptorDocument().getJobDescriptor().getPreJobCommands().getCommandArray();
@@ -344,5 +348,8 @@ public class JobDescriptor {
return null;
}
+ public String getJobSubmitterCommand(){
+ return
this.getJobDescriptorDocument().getJobDescriptor().getJobSubmitterCommand();
+ }
}
Modified: airavata/sandbox/gsissh/src/main/resources/PBSTemplate.xslt
URL:
http://svn.apache.org/viewvc/airavata/sandbox/gsissh/src/main/resources/PBSTemplate.xslt?rev=1529245&r1=1529244&r2=1529245&view=diff
==============================================================================
--- airavata/sandbox/gsissh/src/main/resources/PBSTemplate.xslt (original)
+++ airavata/sandbox/gsissh/src/main/resources/PBSTemplate.xslt Fri Oct 4
18:10:54 2013
@@ -29,7 +29,7 @@ export<xsl:text> </xsl:text><xsl:value
<xsl:value-of select="."/><xsl:text> </xsl:text>
</xsl:for-each>
cd <xsl:text> </xsl:text><xsl:value-of
select="ns:workingDirectory"/><xsl:text>
</xsl:text>
-<xsl:value-of select="ns:executablePath"/><xsl:text> </xsl:text>
+<xsl:value-of select="ns:jobSubmitterCommand"/><xsl:text>
</xsl:text><xsl:value-of select="ns:executablePath"/><xsl:text> </xsl:text>
<xsl:for-each select="ns:inputs/ns:input">
<xsl:value-of select="."/><xsl:text> </xsl:text>
</xsl:for-each>
Modified:
airavata/sandbox/gsissh/src/main/resources/schemas/PBSJobDescriptor.xsd
URL:
http://svn.apache.org/viewvc/airavata/sandbox/gsissh/src/main/resources/schemas/PBSJobDescriptor.xsd?rev=1529245&r1=1529244&r2=1529245&view=diff
==============================================================================
--- airavata/sandbox/gsissh/src/main/resources/schemas/PBSJobDescriptor.xsd
(original)
+++ airavata/sandbox/gsissh/src/main/resources/schemas/PBSJobDescriptor.xsd Fri
Oct 4 18:10:54 2013
@@ -49,6 +49,7 @@
<element name="variableList" type="xsd:string" minOccurs="0"
maxOccurs="1"/>
<element name="preJobCommands" type="gsissh:preJobCommands"
minOccurs="0" maxOccurs="1"/>
<element name="postJobCommands" type="gsissh:postJobCommands"
minOccurs="0" maxOccurs="1"/>
+ <element name="jobSubmitterCommand" type="xsd:string"
minOccurs="0" maxOccurs="1"/>
</sequence>
</complexType>
