Repository: airavata Updated Branches: refs/heads/workflow-support 92838e4a8 -> 16cd757f2
fixing xslt Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/780351d8 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/780351d8 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/780351d8 Branch: refs/heads/workflow-support Commit: 780351d8ea407b6f95842a971797082f6fe8677b Parents: a563e94 Author: lahiru <[email protected]> Authored: Fri Jul 11 22:40:06 2014 -0400 Committer: lahiru <[email protected]> Committed: Fri Jul 11 22:40:06 2014 -0400 ---------------------------------------------------------------------- .../server/src/main/resources/PBSTemplate.xslt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/780351d8/modules/configuration/server/src/main/resources/PBSTemplate.xslt ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/PBSTemplate.xslt b/modules/configuration/server/src/main/resources/PBSTemplate.xslt index 3699514..9250472 100644 --- a/modules/configuration/server/src/main/resources/PBSTemplate.xslt +++ b/modules/configuration/server/src/main/resources/PBSTemplate.xslt @@ -5,18 +5,18 @@ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:ns="http://airavata.apache.org/gsi/ssh/2012/12";> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:ns="http://airavata.apache.org/gsi/ssh/2012/12";> <xsl:output method="text" /> <xsl:template match="/ns:JobDescriptor"> #! /bin/sh -# PBS batch job script built by Globus job manager +# PBS batch job submission script generated by Apache Airavata # <xsl:choose> <xsl:when test="ns:shellName"> ##PBS -S <xsl:value-of select="ns:shellName"/> </xsl:when></xsl:choose> <xsl:choose> <xsl:when test="ns:queueName"> -#PBS -q <xsl:value-of select="ns:queueName"/> +#PBS -q <xsl:value-of select="queueName"/> </xsl:when> </xsl:choose> <xsl:choose> @@ -59,8 +59,10 @@ export<xsl:text> </xsl:text><xsl:value-of select="."/> <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:choose><xsl:when test="xsd:jobSubmitterCommand"> -<xsl:value-of select="xsd:jobSubmitterCommand"/><xsl:text> </xsl:text></xsl:when></xsl:choose><xsl:value-of select="ns:executablePath"/><xsl:text> </xsl:text> + <xsl:choose><xsl:when test="ns:jobSubmitterCommand != null"> +<xsl:value-of select="ns:jobSubmitterCommand"/><xsl:text> </xsl:text> +<xsl:value-of select="ns:cpuCount"/><xsl:text> </xsl:text> + </xsl:when></xsl:choose><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> @@ -70,4 +72,4 @@ cd <xsl:text> </xsl:text><xsl:value-of select="ns:workingDirectory"/><xsl:text </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet>
