airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject airavata git commit: Cleaning up startup scripts - AIRAVATA-1793
Date Sun, 02 Aug 2015 13:39:46 GMT
Repository: airavata
Updated Branches:
  refs/heads/airavata-0.15-release-branch b8cb3d1a3 -> 25fd43e05


Cleaning up startup scripts - AIRAVATA-1793


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

Branch: refs/heads/airavata-0.15-release-branch
Commit: 25fd43e057c37a321609747296d054d3569fa01c
Parents: b8cb3d1
Author: Suresh Marru <smarru@apache.org>
Authored: Sun Aug 2 09:39:41 2015 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Sun Aug 2 09:39:41 2015 -0400

----------------------------------------------------------------------
 .../conf/airavata-client-properties.ini         |   2 +-
 .../resources/conf/airavata-client.properties   |   8 +-
 .../main/resources/samples/createExperiment.py  |   3 +-
 .../src/main/resources/samples/getProjects.py   |   2 +-
 .../src/main/resources/bin/airavata-server.bat  |   2 +-
 .../src/main/resources/bin/airavata-server.sh   |   2 -
 .../new-dist/src/main/resources/bin/setenv.bat  |   8 -
 .../new-dist/src/main/resources/bin/setenv.sh   |  11 --
 .../src/main/resources/bin/startNetworkServer   |  11 --
 .../src/main/resources/bin/airavata-server.bat  |   9 +-
 .../src/main/resources/bin/airavata-server.sh   |  13 +-
 .../server/src/main/resources/bin/api-server.sh | 118 ------------
 .../server/src/main/resources/bin/derby.sh      |  23 ---
 .../src/main/resources/bin/gfac-server.sh       | 118 ------------
 .../main/resources/bin/orchestrator-server.sh   | 118 ------------
 .../server/src/main/resources/bin/setenv.bat    |  14 +-
 .../server/src/main/resources/bin/setenv.sh     |  35 +---
 .../src/main/resources/bin/startNetworkServer   | 189 -------------------
 .../src/main/resources/bin/workflow-server.sh   | 118 ------------
 19 files changed, 17 insertions(+), 787 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini
b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini
index 7d81637..89a0ac8 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/conf/airavata-client-properties.ini
@@ -28,7 +28,7 @@ AIRAVATA_PHP_STUBS_DIR = "../lib/Airavata/"
 
 ; Host which runs the Airavata Server
 ;AIRAVATA_SERVER = "gw111.iu.xsede.org"
-AIRAVATA_SERVER = "gw154.iu.xsede.org"
+AIRAVATA_SERVER = "gw77.iu.xsede.org"
 ;AIRAVATA_SERVER = "localhost"
 
 ; Airavata Server thrift port

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/conf/airavata-client.properties
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/conf/airavata-client.properties
b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/conf/airavata-client.properties
index e2b1767..7d7afa9 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/conf/airavata-client.properties
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/conf/airavata-client.properties
@@ -27,12 +27,12 @@
 ## Airavata API Thrift Server configurations
 [AiravataServer]
 # Default Local Installation
-#host=localhost
-#port=8930
+host=localhost
+port=8930
 
 # SciGaP Development Server
-host=gw111.iu.xsede.org
-port=9930
+#host=gw111.iu.xsede.org
+#port=9930
 
 ## Gateway Specific Properties
 [GatewayProperties]

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/samples/createExperiment.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/samples/createExperiment.py
b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/samples/createExperiment.py
index f6f61a4..4ed224d 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/samples/createExperiment.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/samples/createExperiment.py
@@ -61,8 +61,7 @@ try:
     #experiment.experimentInputs
 
 
-
-    print 'Created Experiment with Id:', airavataClient.createExperiment("sdsc", experiment)
+    print 'Created Experiment with Id:', airavataClient.createExperiment("php_reference_gateway",
experiment)
 
     print 'Airavata Server Version is:', airavataClient.getAPIVersion()
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/samples/getProjects.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/samples/getProjects.py
b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/samples/getProjects.py
index 9ac115a..6514d30 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/samples/getProjects.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/samples/getProjects.py
@@ -52,7 +52,7 @@ try:
     # Connect to Airavata Server
     transport.open()
 
-    projectLists = airavataClient.getAllUserProjects("sdsc", "smarru");
+    projectLists = airavataClient.getAllUserProjects("php_reference_gateway", "smarru");
 
     print projectLists
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/new-dist/src/main/resources/bin/airavata-server.bat
----------------------------------------------------------------------
diff --git a/modules/distribution/new-dist/src/main/resources/bin/airavata-server.bat b/modules/distribution/new-dist/src/main/resources/bin/airavata-server.bat
index 09752c4..b47c30e 100644
--- a/modules/distribution/new-dist/src/main/resources/bin/airavata-server.bat
+++ b/modules/distribution/new-dist/src/main/resources/bin/airavata-server.bat
@@ -50,6 +50,6 @@ cd "%AIRAVATA_HOME%\bin"
 set LOGO_FILE="logo.txt"
 if exist "%LOGO_FILE%" type "%LOGO_FILE%"
 
-java %JAVA_OPTS% -classpath "%XBAYA_CLASSPATH%" -Djava.endorsed.dirs="%AIRAVATA_HOME%/lib/endorsed":"%JAVA_HOME%/jre/lib/endorsed":"%JAVA_HOME%/lib/endorsed"
org.apache.airavata.server.ServerMain -repo "%AIRAVATA_HOME%"/repository/services -conf "%AIRAVATA_HOME%"/conf/axis2.xml
%*
+java %JAVA_OPTS% -classpath "%XBAYA_CLASSPATH%" org.apache.airavata.server.ServerMain -repo
"%AIRAVATA_HOME%"/repository/services -conf "%AIRAVATA_HOME%"/conf/axis2.xml %*
 
 :end

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/new-dist/src/main/resources/bin/airavata-server.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/new-dist/src/main/resources/bin/airavata-server.sh b/modules/distribution/new-dist/src/main/resources/bin/airavata-server.sh
index 885dcd4..af21923 100755
--- a/modules/distribution/new-dist/src/main/resources/bin/airavata-server.sh
+++ b/modules/distribution/new-dist/src/main/resources/bin/airavata-server.sh
@@ -107,11 +107,9 @@ else
 	if $IS_DAEMON_MODE ; then
 		echo "Starting airavata server in daemon mode..."
 		nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-		    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
 		    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > airavata-server.out
& 
  	else
 		java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-		    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
 		    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
 	fi
 fi

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/new-dist/src/main/resources/bin/setenv.bat
----------------------------------------------------------------------
diff --git a/modules/distribution/new-dist/src/main/resources/bin/setenv.bat b/modules/distribution/new-dist/src/main/resources/bin/setenv.bat
index 223f8cd..924ebcd 100644
--- a/modules/distribution/new-dist/src/main/resources/bin/setenv.bat
+++ b/modules/distribution/new-dist/src/main/resources/bin/setenv.bat
@@ -17,14 +17,6 @@ rem under the License.
 
 @echo off
 
-:checkJava
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-goto initialize
-
-:noJavaHome
-echo You must set the JAVA_HOME environment variable before running Airavata.
-goto end
 
 :initialize
 if "%AIRAVATA_HOME%"=="" set AIRAVATA_HOME=%~sdp0..

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/new-dist/src/main/resources/bin/setenv.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/new-dist/src/main/resources/bin/setenv.sh b/modules/distribution/new-dist/src/main/resources/bin/setenv.sh
index 84673db..5c9a8f6 100755
--- a/modules/distribution/new-dist/src/main/resources/bin/setenv.sh
+++ b/modules/distribution/new-dist/src/main/resources/bin/setenv.sh
@@ -17,14 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-
-# Get standard environment variables
-# if JAVA_HOME is not set we're not happy
-if [ -z "$JAVA_HOME" ]; then
-  echo "You must set the JAVA_HOME variable before running Airavata Scripts."
-  exit 1
-fi
-
 # OS specific support.  $var _must_ be set to either true or false.
 cygwin=false
 os400=false
@@ -68,9 +60,6 @@ done
 
 XBAYA_CLASSPATH="$XBAYA_HOME":"$XBAYA_HOME/conf":"$XBAYA_CLASSPATH":"$CLASSPATH"
 
-
-
-
 export AIRAVATA_HOME
 export XBAYA_CLASSPATH
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/new-dist/src/main/resources/bin/startNetworkServer
----------------------------------------------------------------------
diff --git a/modules/distribution/new-dist/src/main/resources/bin/startNetworkServer b/modules/distribution/new-dist/src/main/resources/bin/startNetworkServer
index 808566c..c2627d1 100644
--- a/modules/distribution/new-dist/src/main/resources/bin/startNetworkServer
+++ b/modules/distribution/new-dist/src/main/resources/bin/startNetworkServer
@@ -21,17 +21,6 @@ if [ -n "$derby_common_debug" ] ; then
   set -x
 fi
 
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  Darwin*) darwin=true
-           if [ -z "$JAVA_HOME" ] ; then
-             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
-           fi
-           ;;
-esac
 
 if [ -z "$DERBY_HOME" -o ! -d "$DERBY_HOME" ] ; then
   ## resolve links - $0 may be a link to derby's home

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/server/src/main/resources/bin/airavata-server.bat
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/airavata-server.bat b/modules/distribution/server/src/main/resources/bin/airavata-server.bat
index 09752c4..a6162c7 100644
--- a/modules/distribution/server/src/main/resources/bin/airavata-server.bat
+++ b/modules/distribution/server/src/main/resources/bin/airavata-server.bat
@@ -22,7 +22,6 @@ call "%~dp0"setenv.bat
 
 :loop
 if ""%1""==""-xdebug"" goto xdebug
-if ""%1""==""-security"" goto security
 if ""%1""=="""" goto run
 goto help
 
@@ -31,17 +30,11 @@ set JAVA_OPTS= %JAVA_OPTS% -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,serve
 shift
 goto loop
 
-:security
-set JAVA_OPTS=%JAVA_OPTS% -Djava.security.manager -Djava.security.policy=%AIRAVATA_HOME%\conf\axis2.policy
-Daxis2.home=%AIRAVATA_HOME%
-shift
-goto loop
-
 :help
 echo  Usage: %0 [-options]
 echo.
 echo  where options include:
 echo   -xdebug    Start Airavata Server under JPDA debugger
-echo   -security  Enable Java 2 security
 echo   -h         Help
 goto end
 
@@ -50,6 +43,6 @@ cd "%AIRAVATA_HOME%\bin"
 set LOGO_FILE="logo.txt"
 if exist "%LOGO_FILE%" type "%LOGO_FILE%"
 
-java %JAVA_OPTS% -classpath "%XBAYA_CLASSPATH%" -Djava.endorsed.dirs="%AIRAVATA_HOME%/lib/endorsed":"%JAVA_HOME%/jre/lib/endorsed":"%JAVA_HOME%/lib/endorsed"
org.apache.airavata.server.ServerMain -repo "%AIRAVATA_HOME%"/repository/services -conf "%AIRAVATA_HOME%"/conf/axis2.xml
%*
+java %JAVA_OPTS% -classpath "%AIRAVATA_CLASSPATH%" org.apache.airavata.server.ServerMain
%*
 
 :end

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/server/src/main/resources/bin/airavata-server.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/airavata-server.sh b/modules/distribution/server/src/main/resources/bin/airavata-server.sh
index 885dcd4..33222ae 100755
--- a/modules/distribution/server/src/main/resources/bin/airavata-server.sh
+++ b/modules/distribution/server/src/main/resources/bin/airavata-server.sh
@@ -27,7 +27,7 @@ IS_DAEMON_MODE=false
 LOGO=true
 STOP=false
 FORCE=false
-#SERVERS="--servers=apiserver,orchestrator,gfac,credentialstore"
+
 for var in "$@"
 do
     case $var in
@@ -36,10 +36,6 @@ do
             JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
             shift
         ;;
-        -security)
-            JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy
-Daxis2.home=$AIRAVATA_HOME"
-            shift
-        ;;
 	start)
 		AIRAVATA_COMMAND="$AIRAVATA_COMMAND"
 	    IS_DAEMON_MODE=true
@@ -67,7 +63,6 @@ do
 	    echo "  --<key>[=<value>]  Server setting(s) to override or introduce (overrides
values in airavata-server.properties)"
             echo "  -nologo            Do not show airavata logo"
             echo "  -xdebug            Start Airavata Server under JPDA debugger"
-            echo "  -security          Enable Java 2 security"
             echo "  -h                 Display this help and exit"
             shift
             exit 0
@@ -106,12 +101,10 @@ then
 else
 	if $IS_DAEMON_MODE ; then
 		echo "Starting airavata server in daemon mode..."
-		nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-		    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
+		nohup java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
 		    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > airavata-server.out
& 
  	else
-		java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-		    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
+		java $JAVA_OPTS -classpath "$AIRAVATA_CLASSPATH" \
 		    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
 	fi
 fi

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/server/src/main/resources/bin/api-server.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/api-server.sh b/modules/distribution/server/src/main/resources/bin/api-server.sh
deleted file mode 100755
index 872c854..0000000
--- a/modules/distribution/server/src/main/resources/bin/api-server.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to 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.
-
-. `dirname $0`/setenv.sh
-cd $AIRAVATA_HOME/bin
-LOGO_FILE="logo.txt"
-
-JAVA_OPTS=""
-AIRAVATA_COMMAND=""
-IS_DAEMON_MODE=false
-LOGO=true
-STOP=false
-FORCE=false
-SERVERS="--servers=apiserver"
-for var in "$@"
-do
-    case $var in
-        -xdebug)
-            JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
-	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
-            shift
-        ;;
-        -security)
-            JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy
-Daxis2.home=$AIRAVATA_HOME"
-            shift
-        ;;
-	start)
-	   AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
-	   IS_DAEMON_MODE=true
-            shift
-        ;;
-	stop)
-	    LOGO=false
-	    STOP=true
-	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var"
-            shift
-        ;;
-	--force)
-	    FORCE=true
-            shift
-        ;;
-	-nologo)
-	    LOGO=false
-            shift
-        ;;
-        -h)
-            echo "Usage: airavata-server.sh [command-options]"
-            echo "command options:"
-	    echo "  start              Start server in daemon mode"
-	    echo "  stop [--force]     Stop all airavata servers."
-	    echo "  --<key>[=<value>]  Server setting(s) to override or introduce (overrides
values in airavata-server.properties)"
-            echo "  -nologo            Do not show airavata logo"
-            echo "  -xdebug            Start Airavata Server under JPDA debugger"
-            echo "  -security          Enable Java 2 security"
-            echo "  -h                 Display this help and exit"
-            shift
-            exit 0
-        ;;
-	*)
-	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var"	    
-            shift
-    esac
-done
-if $LOGO ; then
-	if [ -e $LOGO_FILE ]
-	then
-		cat $LOGO_FILE
-	fi
-fi
-if $STOP && $FORCE ; 
-then
-	for f in `find . -name "server-start_*"`; do 
-		f_split=(${f//_/ });
-		echo "Found process file : $f" 
-		echo -n "    Sending kill signals to process ${f_split[1]}..."
-		out=`kill -9 ${f_split[1]} 2>&1`
-		if [ -z "$out" ]; then
-		    echo "done"
-		else
-		    echo "failed (REASON: $out)"
-		fi
-		echo -n "    Removing process file..."
-		out=`rm $f 2>&1`
-		if [ -z "$out" ]; then
-		    echo "done"
-		else
-		    echo "failed (REASON: $out)"
-		fi
-	done
-else
-	if $IS_DAEMON_MODE ; then
-		echo "Starting airavata server in daemon mode..."
-		nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-		    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
-		    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > api-server.out &

- 	else
-		java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-		    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
-		    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
-	fi
-fi
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/server/src/main/resources/bin/derby.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/derby.sh b/modules/distribution/server/src/main/resources/bin/derby.sh
deleted file mode 100644
index 134f7b9..0000000
--- a/modules/distribution/server/src/main/resources/bin/derby.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-
-#   http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to 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.
-
-. `dirname $0`/setenv.sh
-export DERBY_HOME=$AIRAVATA_HOME/standalone-server
-cd $AIRAVATA_HOME/bin
-./startNetworkServer $*
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/server/src/main/resources/bin/gfac-server.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/gfac-server.sh b/modules/distribution/server/src/main/resources/bin/gfac-server.sh
deleted file mode 100755
index 839ef4e..0000000
--- a/modules/distribution/server/src/main/resources/bin/gfac-server.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to 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.
-
-. `dirname $0`/setenv.sh
-cd $AIRAVATA_HOME/bin
-LOGO_FILE="logo.txt"
-
-JAVA_OPTS=""
-AIRAVATA_COMMAND=""
-IS_DAEMON_MODE=false
-LOGO=true
-STOP=false
-FORCE=false
-SERVERS="--servers=gfac"
-for var in "$@"
-do
-    case $var in
-        -xdebug)
-            JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
-	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
-            shift
-        ;;
-        -security)
-            JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy
-Daxis2.home=$AIRAVATA_HOME"
-            shift
-        ;;
-	start)
-	   AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
-	   IS_DAEMON_MODE=true
-            shift
-        ;;
-	stop)
-	    LOGO=false
-	    STOP=true
-	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var"
-            shift
-        ;;
-	--force)
-	    FORCE=true
-            shift
-        ;;
-	-nologo)
-	    LOGO=false
-            shift
-        ;;
-        -h)
-            echo "Usage: airavata-server.sh [command-options]"
-            echo "command options:"
-	    echo "  start              Start server in daemon mode"
-	    echo "  stop [--force]     Stop all airavata servers."
-	    echo "  --<key>[=<value>]  Server setting(s) to override or introduce (overrides
values in airavata-server.properties)"
-            echo "  -nologo            Do not show airavata logo"
-            echo "  -xdebug            Start Airavata Server under JPDA debugger"
-            echo "  -security          Enable Java 2 security"
-            echo "  -h                 Display this help and exit"
-            shift
-            exit 0
-        ;;
-	*)
-	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var"	    
-            shift
-    esac
-done
-if $LOGO ; then
-	if [ -e $LOGO_FILE ]
-	then
-		cat $LOGO_FILE
-	fi
-fi
-if $STOP && $FORCE ; 
-then
-	for f in `find . -name "server-start_*"`; do 
-		f_split=(${f//_/ });
-		echo "Found process file : $f" 
-		echo -n "    Sending kill signals to process ${f_split[1]}..."
-		out=`kill -9 ${f_split[1]} 2>&1`
-		if [ -z "$out" ]; then
-		    echo "done"
-		else
-		    echo "failed (REASON: $out)"
-		fi
-		echo -n "    Removing process file..."
-		out=`rm $f 2>&1`
-		if [ -z "$out" ]; then
-		    echo "done"
-		else
-		    echo "failed (REASON: $out)"
-		fi
-	done
-else
-	if $IS_DAEMON_MODE ; then
-		echo "Starting airavata server in daemon mode..."
-		nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-		    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
-		    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > gfac-server.out &

- 	else
-		java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-		    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
-		    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
-	fi
-fi
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/server/src/main/resources/bin/orchestrator-server.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/orchestrator-server.sh b/modules/distribution/server/src/main/resources/bin/orchestrator-server.sh
deleted file mode 100755
index 5fa73e7..0000000
--- a/modules/distribution/server/src/main/resources/bin/orchestrator-server.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to 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.
-
-. `dirname $0`/setenv.sh
-cd $AIRAVATA_HOME/bin
-LOGO_FILE="logo.txt"
-
-JAVA_OPTS=""
-AIRAVATA_COMMAND=""
-IS_DAEMON_MODE=false
-LOGO=true
-STOP=false
-FORCE=false
-SERVERS="--servers=orchestrator"
-for var in "$@"
-do
-    case $var in
-        -xdebug)
-            JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
-	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
-            shift
-        ;;
-        -security)
-            JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy
-Daxis2.home=$AIRAVATA_HOME"
-            shift
-        ;;
-	start)
-	   AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
-	   IS_DAEMON_MODE=true
-            shift
-        ;;
-	stop)
-	    LOGO=false
-	    STOP=true
-	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var"
-            shift
-        ;;
-	--force)
-	    FORCE=true
-            shift
-        ;;
-	-nologo)
-	    LOGO=false
-            shift
-        ;;
-        -h)
-            echo "Usage: airavata-server.sh [command-options]"
-            echo "command options:"
-	    echo "  start              Start server in daemon mode"
-	    echo "  stop [--force]     Stop all airavata servers."
-	    echo "  --<key>[=<value>]  Server setting(s) to override or introduce (overrides
values in airavata-server.properties)"
-            echo "  -nologo            Do not show airavata logo"
-            echo "  -xdebug            Start Airavata Server under JPDA debugger"
-            echo "  -security          Enable Java 2 security"
-            echo "  -h                 Display this help and exit"
-            shift
-            exit 0
-        ;;
-	*)
-	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var"	    
-            shift
-    esac
-done
-if $LOGO ; then
-	if [ -e $LOGO_FILE ]
-	then
-		cat $LOGO_FILE
-	fi
-fi
-if $STOP && $FORCE ; 
-then
-	for f in `find . -name "server-start_*"`; do 
-		f_split=(${f//_/ });
-		echo "Found process file : $f" 
-		echo -n "    Sending kill signals to process ${f_split[1]}..."
-		out=`kill -9 ${f_split[1]} 2>&1`
-		if [ -z "$out" ]; then
-		    echo "done"
-		else
-		    echo "failed (REASON: $out)"
-		fi
-		echo -n "    Removing process file..."
-		out=`rm $f 2>&1`
-		if [ -z "$out" ]; then
-		    echo "done"
-		else
-		    echo "failed (REASON: $out)"
-		fi
-	done
-else
-	if $IS_DAEMON_MODE ; then
-		echo "Starting airavata server in daemon mode..."
-		nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-		    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
-		    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > orchestrator-server.out
& 
- 	else
-		java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-		    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
-		    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
-	fi
-fi
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/server/src/main/resources/bin/setenv.bat
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/setenv.bat b/modules/distribution/server/src/main/resources/bin/setenv.bat
index 223f8cd..5f1fda1 100644
--- a/modules/distribution/server/src/main/resources/bin/setenv.bat
+++ b/modules/distribution/server/src/main/resources/bin/setenv.bat
@@ -17,15 +17,6 @@ rem under the License.
 
 @echo off
 
-:checkJava
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-goto initialize
-
-:noJavaHome
-echo You must set the JAVA_HOME environment variable before running Airavata.
-goto end
-
 :initialize
 if "%AIRAVATA_HOME%"=="" set AIRAVATA_HOME=%~sdp0..
 SET curDrive=%cd:~0,1%
@@ -36,8 +27,7 @@ goto updateClasspath
 rem ----- update classpath -----------------------------------------------------
 :updateClasspath
 cd %AIRAVATA_HOME%
-set XBAYA_CLASSPATH=
-FOR %%C in ("%AIRAVATA_HOME%\lib\*.jar") DO set XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\lib\%%~nC%%~xC
-FOR %%C in ("%AIRAVATA_HOME%\repository\services\*.jar") DO set XBAYA_CLASSPATH=!XBAYA_CLASSPATH!;..\repository\services\%%~nC%%~xC
+set AIRAVATA_CLASSPATH=
+FOR %%C in ("%AIRAVATA_HOME%\lib\*.jar") DO set AIRAVATA_CLASSPATH=!AIRAVATA_CLASSPATH!;..\lib\%%~nC%%~xC
 
 :end
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/server/src/main/resources/bin/setenv.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/setenv.sh b/modules/distribution/server/src/main/resources/bin/setenv.sh
index 84673db..1fd1fc1 100755
--- a/modules/distribution/server/src/main/resources/bin/setenv.sh
+++ b/modules/distribution/server/src/main/resources/bin/setenv.sh
@@ -17,22 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-
-# Get standard environment variables
-# if JAVA_HOME is not set we're not happy
-if [ -z "$JAVA_HOME" ]; then
-  echo "You must set the JAVA_HOME variable before running Airavata Scripts."
-  exit 1
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false
-os400=false
-case "`uname`" in
-CYGWIN*) cygwin=true;;
-OS400*) os400=true;;
-esac
-
 # resolve links - $0 may be a softlink
 PRG="$0"
 
@@ -46,32 +30,19 @@ while [ -h "$PRG" ]; do
   fi
 done
 
-
 PRGDIR=`dirname "$PRG"`
 
 # Only set AIRAVATA_HOME if not already set
 [ -z "$AIRAVATA_HOME" ] && AIRAVATA_HOME=`cd "$PRGDIR/.." ; pwd`
 
-XBAYA_CLASSPATH=""
-
-
+AIRAVATA_CLASSPATH=""
 
 for f in "$AIRAVATA_HOME"/lib/*.jar
 do
-  XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f
+  AIRAVATA_CLASSPATH="$AIRAVATA_CLASSPATH":$f
 done
 
-for f in "$AIRAVATA_HOME"/repository/services/*.jar
-do
-  XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f
-done
-
-XBAYA_CLASSPATH="$XBAYA_HOME":"$XBAYA_HOME/conf":"$XBAYA_CLASSPATH":"$CLASSPATH"
-
-
-
-
 export AIRAVATA_HOME
-export XBAYA_CLASSPATH
+export AIRAVATA_CLASSPATH
 
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/server/src/main/resources/bin/startNetworkServer
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/startNetworkServer b/modules/distribution/server/src/main/resources/bin/startNetworkServer
deleted file mode 100644
index 808566c..0000000
--- a/modules/distribution/server/src/main/resources/bin/startNetworkServer
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-
-#   http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to 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.
-
-if [ -n "$derby_common_debug" ] ; then
-  set -x
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  Darwin*) darwin=true
-           if [ -z "$JAVA_HOME" ] ; then
-             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
-           fi
-           ;;
-esac
-
-if [ -z "$DERBY_HOME" -o ! -d "$DERBY_HOME" ] ; then
-  ## resolve links - $0 may be a link to derby's home
-  PRG="$0"
-  progname=`basename "$0"`
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-    PRG="$link"
-    else
-    PRG=`dirname "$PRG"`"/$link"
-    fi
-  done
-
-  DERBY_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  DERBY_HOME=`cd "$DERBY_HOME" && pwd`
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$DERBY_HOME" ] &&
-    DERBY_HOME=`cygpath --unix "$DERBY_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# set DERBY_LIB location
-DERBY_LIB="${DERBY_HOME}/lib"
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD=`which java 2> /dev/null `
-    if [ -z "$JAVACMD" ] ; then
-        JAVACMD=java
-    fi
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit 1
-fi
-
-# set local classpath, don't overwrite the user's
-LOCALCLASSPATH=$DERBY_LIB/derby.jar:$DERBY_LIB/derbynet.jar:$DERBY_LIB/derbytools.jar:$DERBY_LIB/derbyclient.jar
-
-# if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be
-# user CLASSPATH first and derby-found jars after.
-# In that case, the user CLASSPATH will override derby-found jars
-#
-# if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour
-# with derby-found jars first and user CLASSPATH after
-if [ -n "$CLASSPATH" ] ; then
-  # merge local and specified classpath 
-  if [ -z "$LOCALCLASSPATH" ] ; then 
-    LOCALCLASSPATH="$CLASSPATH"
-  elif [ -n "$CLASSPATH_OVERRIDE" ] ; then
-    LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH"
-  else
-    LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
-  fi
-
-  # remove class path from launcher -cp option
-  CLASSPATH=""
-fi
-
-# For Cygwin, switch paths to appropriate format before running java
-# For PATHs convert to unix format first, then to windows format to ensure
-# both formats are supported. Probably this will fail on directories with ;
-# in the name in the path. Let's assume that paths containing ; are more
-# rare than windows style paths on cygwin.
-if $cygwin; then
-  if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
-    format=mixed
-  else
-    format=windows
-  fi
-  DERBY_HOME=`cygpath --$format "$DERBY_HOME"`
-  DERBY_LIB=`cygpath --$format "$DERBY_LIB"`
-  if [ -n "$JAVA_HOME" ]; then
-    JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
-  fi
-  LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
-  LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
-  if [ -n "$CLASSPATH" ] ; then
-    CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
-    CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
-  fi
-  CYGHOME=`cygpath --$format "$HOME"`
-fi
-
-# add a second backslash to variables terminated by a backslash under cygwin
-if $cygwin; then
-  case "$DERBY_HOME" in
-    *\\ )
-    DERBY_HOME="$DERBY_HOME\\"
-    ;;
-  esac
-  case "$CYGHOME" in
-    *\\ )
-    CYGHOME="$CYGHOME\\"
-    ;;
-  esac
-  case "$LOCALCLASSPATH" in
-    *\\ )
-    LOCALCLASSPATH="$LOCALCLASSPATH\\"
-    ;;
-  esac
-  case "$CLASSPATH" in
-    *\\ )
-    CLASSPATH="$CLASSPATH\\"
-    ;;
-  esac
-fi
-
-# Readjust classpath for MKS
-# expr match 
-if [ \( "`expr $SHELL : '.*sh.exe$'`" -gt 0 \) -a \( "$cygwin" = "false" \) ]; then
-  LOCALCLASSPATH=`echo $LOCALCLASSPATH | sed -E 's/([\d\w]*):([\d\w]*)/\1;\2/g
-'`
-fi
-#!/bin/sh
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-
-#   http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to 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.
-
-derby_exec_command="exec \"$JAVACMD\" $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl
start $@"
-eval $derby_exec_command

http://git-wip-us.apache.org/repos/asf/airavata/blob/25fd43e0/modules/distribution/server/src/main/resources/bin/workflow-server.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/server/src/main/resources/bin/workflow-server.sh b/modules/distribution/server/src/main/resources/bin/workflow-server.sh
deleted file mode 100755
index b66e192..0000000
--- a/modules/distribution/server/src/main/resources/bin/workflow-server.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to 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.
-
-. `dirname $0`/setenv.sh
-cd $AIRAVATA_HOME/bin
-LOGO_FILE="logo.txt"
-
-JAVA_OPTS=""
-AIRAVATA_COMMAND=""
-IS_DAEMON_MODE=false
-LOGO=true
-STOP=false
-FORCE=false
-SERVERS="--servers=workflowserver"
-for var in "$@"
-do
-    case $var in
-        -xdebug)
-            JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
-	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
-            shift
-        ;;
-        -security)
-            JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy
-Daxis2.home=$AIRAVATA_HOME"
-            shift
-        ;;
-	start)
-	   AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS"
-	   IS_DAEMON_MODE=true
-            shift
-        ;;
-	stop)
-	    LOGO=false
-	    STOP=true
-	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $var"
-            shift
-        ;;
-	--force)
-	    FORCE=true
-            shift
-        ;;
-	-nologo)
-	    LOGO=false
-            shift
-        ;;
-        -h)
-            echo "Usage: airavata-server.sh [command-options]"
-            echo "command options:"
-	    echo "  start              Start server in daemon mode"
-	    echo "  stop [--force]     Stop all airavata servers."
-	    echo "  --<key>[=<value>]  Server setting(s) to override or introduce (overrides
values in airavata-server.properties)"
-            echo "  -nologo            Do not show airavata logo"
-            echo "  -xdebug            Start Airavata Server under JPDA debugger"
-            echo "  -security          Enable Java 2 security"
-            echo "  -h                 Display this help and exit"
-            shift
-            exit 0
-        ;;
-	*)
-	    AIRAVATA_COMMAND="$AIRAVATA_COMMAND $SERVERS $var"	    
-            shift
-    esac
-done
-if $LOGO ; then
-	if [ -e $LOGO_FILE ]
-	then
-		cat $LOGO_FILE
-	fi
-fi
-if $STOP && $FORCE ; 
-then
-	for f in `find . -name "server-start_*"`; do 
-		f_split=(${f//_/ });
-		echo "Found process file : $f" 
-		echo -n "    Sending kill signals to process ${f_split[1]}..."
-		out=`kill -9 ${f_split[1]} 2>&1`
-		if [ -z "$out" ]; then
-		    echo "done"
-		else
-		    echo "failed (REASON: $out)"
-		fi
-		echo -n "    Removing process file..."
-		out=`rm $f 2>&1`
-		if [ -z "$out" ]; then
-		    echo "done"
-		else
-		    echo "failed (REASON: $out)"
-		fi
-	done
-else
-	if $IS_DAEMON_MODE ; then
-		echo "Starting airavata server in daemon mode..."
-		nohup java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-		    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
-		    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $* > workflow-server.out
& 
- 	else
-		java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
-		    -Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
-		    org.apache.airavata.server.ServerMain $AIRAVATA_COMMAND $*
-	fi
-fi
-


Mime
View raw message