You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/05/13 15:17:45 UTC
incubator-taverna-server git commit: TAVERNA-968 Replacement scripts
no longer needed
Repository: incubator-taverna-server
Updated Branches:
refs/heads/master 2ec80f786 -> 1590003fe
TAVERNA-968 Replacement scripts no longer needed
environment variable parsing added to taverna-commandline
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/1590003f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/1590003f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/1590003f
Branch: refs/heads/master
Commit: 1590003fef3d71919c2156fedd970a0bde1ee9a7
Parents: 2ec80f7
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri May 13 16:17:06 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri May 13 16:17:06 2016 +0100
----------------------------------------------------------------------
taverna-server-webapp/pom.xml | 4 +-
.../main/replacementscripts/executeworkflow.bat | 25 -------
.../main/replacementscripts/executeworkflow.sh | 72 --------------------
3 files changed, 3 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/1590003f/taverna-server-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/pom.xml b/taverna-server-webapp/pom.xml
index e5a44d9..65c4467 100644
--- a/taverna-server-webapp/pom.xml
+++ b/taverna-server-webapp/pom.xml
@@ -603,7 +603,7 @@ limitations under the License.
<artifactItems>
<artifactItem>
<groupId>org.apache.taverna.commandline</groupId>
- <artifactId>taverna-command-line-product</artifactId>
+ <artifactId>taverna-commandline-product</artifactId>
<version>${taverna.commandline.version}</version>
<classifier>nightly</classifier>
<type>zip</type>
@@ -780,6 +780,7 @@ limitations under the License.
<nosuffix>true</nosuffix>
</configuration>
</plugin>
+<!-- No longer needed (TAVERNA-968)
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@@ -803,6 +804,7 @@ limitations under the License.
</execution>
</executions>
</plugin>
+-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/1590003f/taverna-server-webapp/src/main/replacementscripts/executeworkflow.bat
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/replacementscripts/executeworkflow.bat b/taverna-server-webapp/src/main/replacementscripts/executeworkflow.bat
deleted file mode 100644
index c678855..0000000
--- a/taverna-server-webapp/src/main/replacementscripts/executeworkflow.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@ECHO OFF
-
-REM Taverna startup script
-
-REM distribution directory
-set TAVERNA_HOME=%~dp0
-
-REM 300 MB memory, 140 MB for classes
-set ARGS=-Xmx300m -XX:MaxPermSize=140m
-
-REM Taverna system properties
-set ARGS=%ARGS% "-Draven.profile=file:%TAVERNA_HOME%conf/current-profile.xml"
-set ARGS=%ARGS% -Djava.system.class.loader=net.sf.taverna.raven.prelauncher.BootstrapClassLoader
-set ARGS=%ARGS% -Draven.launcher.app.main=net.sf.taverna.t2.commandline.CommandLineLauncher
-set ARGS=%ARGS% -Draven.launcher.show_splashscreen=false
-set ARGS=%ARGS% -Djava.awt.headless=true
-set ARGS=%ARGS% "-Dtaverna.startup=%TAVERNA_HOME%."
-IF NOT x%RAVEN_APPHOME%==x SET ARGS=%ARGS% "-Draven.launcher.app.home=%RAVEN_APPHOME%"
-IF NOT x%TAVERNA_RUN_ID%==x SET ARGS=%ARGS% "-Dtaverna.runid=%TAVERNA_RUN_ID%"
-IF NOT x%INTERACTION_HOST%==x SET ARGS=%ARGS% "-Dtaverna.interaction.host=%INTERACTION_HOST%"
-IF NOT x%INTERACTION_PORT%==x SET ARGS=%ARGS% "-Dtaverna.interaction.port=%INTERACTION_PORT%"
-IF NOT x%INTERACTION_WEBDAV%==x SET ARGS=%ARGS% "-Dtaverna.interaction.webdav_path=%INTERACTION_WEBDAV%"
-IF NOT x%INTERACTION_FEED%==x SET ARGS=%ARGS% "-Dtaverna.interaction.feed_path=%INTERACTION_FEED%"
-
-java %ARGS% -jar "%TAVERNA_HOME%lib\prelauncher-2.3.jar" %*
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/1590003f/taverna-server-webapp/src/main/replacementscripts/executeworkflow.sh
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/replacementscripts/executeworkflow.sh b/taverna-server-webapp/src/main/replacementscripts/executeworkflow.sh
deleted file mode 100644
index e9e1d36..0000000
--- a/taverna-server-webapp/src/main/replacementscripts/executeworkflow.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# 300 MB memory, 140 MB for classes
-memlimit=-Xmx300m
-permsize=-XX:MaxPermSize=140m
-
-## Parse the command line to extract the pieces to move around to before or
-## after the JAR filename...
-pre=-Djava.awt.headless=true
-post=
-for arg
-do
- case $arg in
- -JXmx*) memlimit=`echo $arg | sed 's/-JX/-X/'` ;;
- -JXX:MaxPermSize=*) permsize=`echo $arg | sed 's/-JXX/-XX/'` ;;
- -J*) pre="$pre `echo $arg | sed 's/-J/-/'`" ;;
- -D*) pre="$pre $arg" ;;
- *) post="$post \"$arg\"" ;;
- esac
-done
-if test "xx" = "x${post}x"; then
- echo "Missing arguments! Bug in argument processing?" >&2
- exit 1
-fi
-eval set x $post
-shift
-
-## resolve links - $0 may be a symlink
-prog="$0"
-
-real_path() {
- readlink -m "$1" 2>/dev/null || python -c 'import os,sys;print os.path.realpath(sys.argv[1])' "$1"
-}
-
-realprog=`real_path "$prog"`
-taverna_home=`dirname "$realprog"`
-javabin=java
-if test -x "$JAVA_HOME/bin/java"; then
- javabin="$JAVA_HOME/bin/java"
-fi
-APPHOME_PROP=
-if test x != "x$TAVERNA_APPHOME"; then
- APPHOME_PROP="-Dtaverna.app.home=$TAVERNA_APPHOME"
-fi
-RUNID_PROP=
-if test x != "x$TAVERNA_RUN_ID"; then
- RUNID_PROP="-Dtaverna.runid=$TAVERNA_RUN_ID"
-fi
-INTERACTION_PROPS=-Dtaverna.interaction.ignore_requests=true
-if test x != "x$INTERACTION_HOST"; then
- INTERACTION_PROPS="$INTERACTION_PROPS -Dtaverna.interaction.host=$INTERACTION_HOST"
- INTERACTION_PROPS="$INTERACTION_PROPS -Dtaverna.interaction.port=$INTERACTION_PORT"
- INTERACTION_PROPS="$INTERACTION_PROPS -Dtaverna.interaction.webdav_path=$INTERACTION_WEBDAV"
- INTERACTION_PROPS="$INTERACTION_PROPS -Dtaverna.interaction.feed_path=$INTERACTION_FEED"
- if test x != "x$INTERACTION_PUBLISH"; then
- INTERACTION_PROPS="$INTERACTION_PROPS -Dtaverna.interaction.publishAddressOverride=$INTERACTION_PUBLISH"
- fi
-fi
-
-MainClass=net.sf.taverna.t2.commandline.CommandLineLauncher
-
-echo "pid:$$"
-exec "$javabin" $memlimit $permsize \
- "-Dlog4j.configuration=file://$taverna_home/conf/log4j.properties " \
- "-Djava.util.logging.config.file=$taverna_home/conf/logging.properties " \
- "-Dtaverna.app.startup=$taverna_home" -Dtaverna.interaction.ignore_requests=true \
- $APPHOME_PROP $RUNID_PROP $INTERACTION_PROPS -Djava.awt.headless=true \
- -Dcom.sun.net.ssl.enableECC=false -Djsse.enableSNIExtension=false $pre \
- -jar "$taverna_home/lib/taverna-command-line-0.1.1.jar" \
- ${1+"$@"}