airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [46/50] [abbrv] airavata git commit: Fixed AIRAVATA-1633.
Date Thu, 19 Mar 2015 19:12:04 GMT
Fixed AIRAVATA-1633.

Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d09957ba
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d09957ba
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d09957ba

Branch: refs/heads/new-workflow-design
Commit: d09957ba1b8c4b19c59349defccc9382a483619c
Parents: 5749f12
Author: raminder <raminder@apache.org>
Authored: Tue Mar 17 10:40:46 2015 -0400
Committer: raminder <raminder@apache.org>
Committed: Tue Mar 17 10:40:46 2015 -0400

----------------------------------------------------------------------
 .../server/src/main/resources/PBSTemplate.xslt  | 25 ++++++++++----------
 .../server/src/main/resources/SGETemplate.xslt  | 18 +++++++-------
 .../src/main/resources/SLURMTemplate.xslt       | 22 ++++++++---------
 3 files changed, 33 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/d09957ba/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 7676883..fe94ef1 100644
--- a/modules/configuration/server/src/main/resources/PBSTemplate.xslt
+++ b/modules/configuration/server/src/main/resources/PBSTemplate.xslt
@@ -12,51 +12,51 @@
 #! /bin/sh
 # 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 test="ns:shellName != ''">
+#PBS -S <xsl:value-of select="ns:shellName"/>
     </xsl:when></xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:queueName">
+    <xsl:when test="ns:queueName != ''">
 #PBS -q <xsl:value-of select="ns:queueName"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-        <xsl:when test="ns:jobName">
+        <xsl:when test="ns:jobName != ''">
 #PBS -N <xsl:value-of select="ns:jobName"/>
         </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:mailOptions">
+    <xsl:when test="ns:mailOptions != ''">
 #PBS -m <xsl:value-of select="ns:mailOptions"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:mailAddress">
+    <xsl:when test="ns:mailAddress != ''">
 #PBS -M <xsl:value-of select="ns:mailAddress"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-<xsl:when test="ns:acountString">
+<xsl:when test="ns:acountString != ''">
 #PBS -A <xsl:value-of select="ns:acountString"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:maxWallTime">
+    <xsl:when test="ns:maxWallTime != ''">
 #PBS -l walltime=<xsl:value-of select="ns:maxWallTime"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:standardOutFile">
+    <xsl:when test="ns:standardOutFile != ''">
 #PBS -o <xsl:value-of select="ns:standardOutFile"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:standardOutFile">
+    <xsl:when test="ns:standardOutFile != ''">
 #PBS -e <xsl:value-of select="ns:standardErrorFile"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-        <xsl:when test="ns:usedMem">
+        <xsl:when test="ns:usedMem != ''">
             #PBS -l mem=<xsl:value-of select="ns:usedMem"/>
         </xsl:when>
     </xsl:choose>
@@ -96,6 +96,7 @@ cd <xsl:text>   </xsl:text><xsl:value-of select="ns:workingDirectory"/><xsl:text
       <xsl:value-of select="."/><xsl:text>   </xsl:text>
 </xsl:for-each>
     <xsl:text>&#xa;</xsl:text>
-R</xsl:template>
+~/rabbitmq-java-client-bin-3.3.5/runjava.sh com.rabbitmq.examples.SimpleProducer amqp://<xsl:value-of
select="ns:callBackIp"/><xsl:text> </xsl:text><xsl:value-of select="ns:userName"/>,<xsl:value-of
select="ns:jobName"/><xsl:text> </xsl:text><xsl:value-of select="$quote"/><xsl:value-of
select="$quote"/><xsl:text> </xsl:text><xsl:value-of select="ns:callBackPort"/>
+</xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/d09957ba/modules/configuration/server/src/main/resources/SGETemplate.xslt
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/SGETemplate.xslt b/modules/configuration/server/src/main/resources/SGETemplate.xslt
index 15c6d14..0658b35 100644
--- a/modules/configuration/server/src/main/resources/SGETemplate.xslt
+++ b/modules/configuration/server/src/main/resources/SGETemplate.xslt
@@ -12,47 +12,47 @@
     #! /bin/bash
 # Grid Engine batch job script built by Apache Airavata
 #   <xsl:choose>
-    <xsl:when test="ns:shellName">
+    <xsl:when test="ns:shellName != ''">
 #$ -S <xsl:value-of select="ns:shellName"/>
     </xsl:when></xsl:choose>
 #$ -V
     <xsl:choose>
-    <xsl:when test="ns:queueName">
+    <xsl:when test="ns:queueName != ''">
 #$ -q <xsl:value-of select="ns:queueName"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:mailOptions">
+    <xsl:when test="ns:mailOptions != ''">
 #$ -m <xsl:value-of select="ns:mailOptions"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:mailAddress">
+    <xsl:when test="ns:mailAddress != ''">
 #$ -M <xsl:value-of select="ns:mailAddress"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-<xsl:when test="ns:acountString">
+<xsl:when test="ns:acountString != ''">
 #$ -A <xsl:value-of select="ns:acountString"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:maxWallTime">
+    <xsl:when test="ns:maxWallTime != ''">
 #$ -l h_rt=<xsl:value-of select="ns:maxWallTime"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:jobName">
+    <xsl:when test="ns:jobName != ''">
 #$ -N <xsl:value-of select="ns:jobName"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:standardOutFile">
+    <xsl:when test="ns:standardOutFile != ''">
 #$ -o <xsl:value-of select="ns:standardOutFile"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:standardOutFile">
+    <xsl:when test="ns:standardOutFile != ''">
 #$ -e <xsl:value-of select="ns:standardErrorFile"/>
     </xsl:when>
     </xsl:choose>

http://git-wip-us.apache.org/repos/asf/airavata/blob/d09957ba/modules/configuration/server/src/main/resources/SLURMTemplate.xslt
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/SLURMTemplate.xslt b/modules/configuration/server/src/main/resources/SLURMTemplate.xslt
index 1ca12df..ecafbc2 100644
--- a/modules/configuration/server/src/main/resources/SLURMTemplate.xslt
+++ b/modules/configuration/server/src/main/resources/SLURMTemplate.xslt
@@ -10,57 +10,57 @@
 <xsl:template match="/ns:JobDescriptor">
     <xsl:param name="quote">"</xsl:param>
     <xsl:choose>
-<xsl:when test="ns:shellName">
+<xsl:when test="ns:shellName != ''">
 #!<xsl:value-of select="ns:shellName"/>
     </xsl:when>
     </xsl:choose>
 <xsl:choose>
-    <xsl:when test="ns:queueName">
+    <xsl:when test="ns:queueName != ''">
 #SBATCH -p <xsl:value-of select="ns:queueName"/>
     </xsl:when>
     </xsl:choose>
 <xsl:choose>
-    <xsl:when test="ns:nodes">
+    <xsl:when test="ns:nodes != ''">
 #SBATCH -N <xsl:value-of select="ns:nodes"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:cpuCount">
+    <xsl:when test="ns:cpuCount != ''">
 #SBATCH -n <xsl:value-of select="ns:cpuCount"/>
         </xsl:when>
         </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:mailAddress">
+    <xsl:when test="ns:mailAddress != ''">
 #SBATCH -mail-user=<xsl:value-of select="ns:mailAddress"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:mailType">
+    <xsl:when test="ns:mailType != ''">
 #SBATCH -mail-type=<xsl:value-of select="ns:mailType"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-<xsl:when test="ns:acountString">
+<xsl:when test="ns:acountString != ''">
 #SBATCH -A <xsl:value-of select="ns:acountString"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:maxWallTime">
+    <xsl:when test="ns:maxWallTime != ''">
 #SBATCH -t <xsl:value-of select="ns:maxWallTime"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:jobName">
+    <xsl:when test="ns:jobName != ''">
 #SBATCH -J <xsl:value-of select="ns:jobName"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:standardOutFile">
+    <xsl:when test="ns:standardOutFile != ''">
 #SBATCH -o <xsl:value-of select="ns:standardOutFile"/>
     </xsl:when>
     </xsl:choose>
     <xsl:choose>
-    <xsl:when test="ns:standardOutFile">
+    <xsl:when test="ns:standardOutFile != ''">
 #SBATCH -e <xsl:value-of select="ns:standardErrorFile"/>
     </xsl:when>
     </xsl:choose>


Mime
View raw message