You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/04/27 20:02:14 UTC
[1/2] airavata git commit: Fixed SGE Template for support email based
monitoring.
Repository: airavata
Updated Branches:
refs/heads/master 4117cbc68 -> 316c78888
Fixed SGE Template for support email based monitoring.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f0a2fdee
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f0a2fdee
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f0a2fdee
Branch: refs/heads/master
Commit: f0a2fdee0dd40d85ca1d244af617a0c9e54eb583
Parents: e7e23bf
Author: shamrath <sh...@gmail.com>
Authored: Mon Apr 27 14:01:50 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Mon Apr 27 14:01:50 2015 -0400
----------------------------------------------------------------------
.../server/src/main/resources/SGETemplate.xslt | 10 ++--------
tools/gsissh/src/main/resources/SGETemplate.xslt | 7 +------
2 files changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f0a2fdee/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 0658b35..7005295 100644
--- a/modules/configuration/server/src/main/resources/SGETemplate.xslt
+++ b/modules/configuration/server/src/main/resources/SGETemplate.xslt
@@ -9,7 +9,7 @@
<xsl:output method="text" />
<xsl:template match="/ns:JobDescriptor">
<xsl:param name="quote">"</xsl:param>
- #! /bin/bash
+#! /bin/bash
# Grid Engine batch job script built by Apache Airavata
# <xsl:choose>
<xsl:when test="ns:shellName != ''">
@@ -21,12 +21,7 @@
#$ -q <xsl:value-of select="ns:queueName"/>
</xsl:when>
</xsl:choose>
- <xsl:choose>
- <xsl:when test="ns:mailOptions != ''">
-#$ -m <xsl:value-of select="ns:mailOptions"/>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
+#$ -m beas <xsl:choose>
<xsl:when test="ns:mailAddress != ''">
#$ -M <xsl:value-of select="ns:mailAddress"/>
</xsl:when>
@@ -79,6 +74,5 @@ cd <xsl:text> </xsl:text><xsl:value-of select="ns:workingDirectory"/><xsl:text
<xsl:for-each select="ns:postJobCommands/ns:command">
<xsl:value-of select="."/><xsl:text> </xsl:text>
</xsl:for-each>
- ~/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/f0a2fdee/tools/gsissh/src/main/resources/SGETemplate.xslt
----------------------------------------------------------------------
diff --git a/tools/gsissh/src/main/resources/SGETemplate.xslt b/tools/gsissh/src/main/resources/SGETemplate.xslt
index 3b8557c..5b57265 100644
--- a/tools/gsissh/src/main/resources/SGETemplate.xslt
+++ b/tools/gsissh/src/main/resources/SGETemplate.xslt
@@ -20,12 +20,7 @@
#$ -q <xsl:value-of select="ns:queueName"/>
</xsl:when>
</xsl:choose>
- <xsl:choose>
- <xsl:when test="ns:mailOptions">
-#$ -m <xsl:value-of select="ns:mailOptions"/>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
+#$ -m beas <xsl:choose>
<xsl:when test="ns:acountString">
#$ -A <xsl:value-of select="ns:acountString"/>
</xsl:when>
[2/2] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sh...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/316c7888
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/316c7888
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/316c7888
Branch: refs/heads/master
Commit: 316c7888840b0902cf623f62ad7ddc10194e2d26
Parents: f0a2fde 4117cbc
Author: shamrath <sh...@gmail.com>
Authored: Mon Apr 27 14:02:04 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Mon Apr 27 14:02:04 2015 -0400
----------------------------------------------------------------------
.../server/src/main/resources/airavata-server.properties | 1 +
.../airavata/persistance/registry/jpa/JPAConstants.java | 1 +
.../airavata/persistance/registry/jpa/ResourceUtils.java | 4 ++--
.../airavata/persistance/registry/jpa/resources/Utils.java | 9 +++++++++
4 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------