svn commit: r1198890 - in /incubator/airavata/trunk/modules/distribution/resources/bin: jackrabbit-server.sh setenv.sh xbaya-gui.sh

[la...@apache.org]

Author: lahiru
Date: Mon Nov  7 19:37:34 2011
New Revision: 1198890

URL: http://svn.apache.org/viewvc?rev=1198890&view=rev
Log:
fixing startup script issues.

Modified:
    incubator/airavata/trunk/modules/distribution/resources/bin/jackrabbit-server.sh
    incubator/airavata/trunk/modules/distribution/resources/bin/setenv.sh
    incubator/airavata/trunk/modules/distribution/resources/bin/xbaya-gui.sh

Modified: incubator/airavata/trunk/modules/distribution/resources/bin/jackrabbit-server.sh
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/resources/bin/jackrabbit-server.sh?rev=1198890&r1=1198889&r2=1198890&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/resources/bin/jackrabbit-server.sh (original)
+++ incubator/airavata/trunk/modules/distribution/resources/bin/jackrabbit-server.sh Mon Nov  7 19:37:34 2011
@@ -19,4 +19,4 @@
 
 . `dirname $0`/setenv.sh
 
-java -jar $AIRAVATA_HOME/lib/jackrabbit-standalone-2.2.7.jar -p 8081 $*
+$JAVA_HOME/bin/java -jar $AIRAVATA_HOME/lib/jackrabbit-standalone-2.2.7.jar -p 8081 $*

Modified: incubator/airavata/trunk/modules/distribution/resources/bin/setenv.sh
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/resources/bin/setenv.sh?rev=1198890&r1=1198889&r2=1198890&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/resources/bin/setenv.sh (original)
+++ incubator/airavata/trunk/modules/distribution/resources/bin/setenv.sh Mon Nov  7 19:37:34 2011
@@ -19,6 +19,34 @@
 
 
 # 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"
+
+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
+
+
 PRGDIR=`dirname "$PRG"`
 
 # Only set AIRAVATA_HOME if not already set
@@ -29,7 +57,6 @@ for f in "$AIRAVATA_HOME"/lib/*.jar
 do
   XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f
 done
-XBAYA_CLASSPATH="$XBAYA_HOME":"$XBAYA_HOME/conf":"$JAVA_HOME/lib/tools.jar":"$XBAYA_CLASSPATH":"$CLASSPATH"
 
 for f in "$AIRAVATA_HOME"/standalone-server/lib/*.jar
 do

Modified: incubator/airavata/trunk/modules/distribution/resources/bin/xbaya-gui.sh
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/resources/bin/xbaya-gui.sh?rev=1198890&r1=1198889&r2=1198890&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/resources/bin/xbaya-gui.sh (original)
+++ incubator/airavata/trunk/modules/distribution/resources/bin/xbaya-gui.sh Mon Nov  7 19:37:34 2011
@@ -18,5 +18,5 @@
 # under the License.
 
 . `dirname $0`/setenv.sh
-java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
+$JAVA_HOME/bin/java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
     org.apache.airavata.xbaya.XBaya $*