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 2014/07/12 03:48:08 UTC
[1/2] git commit: fixing xslt
Repository: airavata
Updated Branches:
refs/heads/master 1c73a8498 -> a563e94ac
fixing xslt
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a6ba1888
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a6ba1888
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a6ba1888
Branch: refs/heads/master
Commit: a6ba18886d528f045b009d3d9cf7975986bd6fb2
Parents: 5d68f7b
Author: lahiru <la...@apache.org>
Authored: Fri Jul 11 21:47:46 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Fri Jul 11 21:47:46 2014 -0400
----------------------------------------------------------------------
.../server/src/main/resources/PBSTemplate.xslt | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a6ba1888/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 6dc9f61..3699514 100644
--- a/modules/configuration/server/src/main/resources/PBSTemplate.xslt
+++ b/modules/configuration/server/src/main/resources/PBSTemplate.xslt
@@ -5,11 +5,11 @@
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:ns="http://airavata.apache.org/gsi/ssh/2012/12">
+<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:output method="text" />
<xsl:template match="/ns:JobDescriptor">
#! /bin/sh
-# PBS batch job submission script generated by Apache Airavata
+# PBS batch job script built by Globus job manager
# <xsl:choose>
<xsl:when test="ns:shellName">
##PBS -S <xsl:value-of select="ns:shellName"/>
@@ -59,12 +59,8 @@ 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="ns:jobSubmitterCommand">
-<xsl:value-of select="ns:jobSubmitterCommand"/><xsl:text> </xsl:text> <xsl:choose>
- <xsl:when test="(ns:cpuCount)">
-<xsl:value-of select="ns:cpuCount"/><xsl:text> </xsl:text>
- </xsl:when>
- </xsl:choose></xsl:when></xsl:choose><xsl:value-of select="ns:executablePath"/><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:for-each select="ns:inputs/ns:input">
<xsl:value-of select="."/><xsl:text> </xsl:text>
</xsl:for-each>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by la...@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/a563e94a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a563e94a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a563e94a
Branch: refs/heads/master
Commit: a563e94ac1488689aaa3ad0e8eb39a4f791b2601
Parents: a6ba188 1c73a84
Author: lahiru <la...@apache.org>
Authored: Fri Jul 11 21:47:54 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Fri Jul 11 21:47:54 2014 -0400
----------------------------------------------------------------------
.../gfac/core/monitor/AiravataExperimentStatusUpdator.java | 2 +-
.../gfac/core/monitor/AiravataWorkflowNodeStatusUpdator.java | 2 +-
.../persistance/registry/jpa/impl/ExperimentRegistry.java | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------