geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r535668 - in /geronimo/sandbox/gshell/trunk/gshell-assembly/src/main: assembly/bin.xml scripts/gsh scripts/gsh.bat
Date Sun, 06 May 2007 22:37:10 GMT
Author: jdillon
Date: Sun May  6 15:37:10 2007
New Revision: 535668

URL: http://svn.apache.org/viewvc?view=rev&rev=535668
Log:
Don't require JAVA_HOME to be set, default to java
Strip off version from boot/classworlds.jar to simplify things a wee bit

Modified:
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh
    geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh.bat

Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml?view=diff&rev=535668&r1=535667&r2=535668
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/assembly/bin.xml Sun May  6 15:37:10
2007
@@ -84,6 +84,7 @@
         
         <dependencySet>
             <outputDirectory>lib/boot</outputDirectory>
+            <outputFileNameMapping>classworlds.jar</outputFileNameMapping>
             <includes>
                 <include>classworlds:classworlds</include>
             </includes>

Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh?view=diff&rev=535668&r1=535667&r2=535668
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh Sun May  6 15:37:10
2007
@@ -28,9 +28,6 @@
 # Use the maximum available, or set MAX_FD != -1 to use that
 MAX_FD="maximum"
 
-# The version of classworlds to boot with
-CLASSWORLDS_VERSION="1.1"
-
 warn() {
     echo "${PROGNAME}: $*"
 }
@@ -72,7 +69,7 @@
 if [ -z "$CLASSWORLDS_CONF" ]; then
     CLASSWORLDS_CONF="$GSHELL_HOME/etc/${PROGNAME}.conf"
 fi
-CLASSWORLDS_CLASSPATH="$GSHELL_HOME/lib/boot/classworlds-${CLASSWORLDS_VERSION}.jar"
+CLASSWORLDS_CLASSPATH="$GSHELL_HOME/lib/boot/classworlds.jar"
 
 # Determine the Java command to use to start the JVM
 if [ -z "$JAVACMD" ]; then
@@ -86,12 +83,6 @@
     else
         JAVACMD="java"
     fi
-fi
-if [ ! -x "$JAVACMD" ]; then
-    die "JAVA_HOME is not defined correctly; can not execute: $JAVACMD"
-fi
-if [ -z "$JAVA_HOME" ] ; then
-    warn "JAVA_HOME environment variable is not set"
 fi
 
 # Increase the maximum file descriptors if we can

Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh.bat
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh.bat?view=diff&rev=535668&r1=535667&r2=535668
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh.bat (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/src/main/scripts/gsh.bat Sun May  6 15:37:10
2007
@@ -25,9 +25,6 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem The version of classworlds to boot with
-set CLASSWORLDS_VERSION=1.1
-
 :begin
 @rem Determine what directory it is in.
 set DIRNAME=%~dp0
@@ -99,7 +96,7 @@
 
 :execute
 @rem Setup the command line
-set CLASSWORLDS_CLASSPATH=%GSHELL_HOME%\lib\boot\classworlds-%CLASSWORLDS_VERSION%.jar
+set CLASSWORLDS_CLASSPATH=%GSHELL_HOME%\lib\boot\classworlds.jar
 set CLASSWORLDS_MAIN_CLASS=org.codehaus.classworlds.Launcher
 set CLASSWORLDS_CONF=%GSHELL_HOME%\etc\%PROGNAME%.conf
 



Mime
View raw message