geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject cvs commit: incubator-geronimo/modules/twiddle/src/conf classworlds.conf forehead.conf
Date Mon, 25 Aug 2003 15:44:54 GMT
jdillon     2003/08/25 08:44:54

  Modified:    modules/twiddle project.xml
               modules/core/src/bin start
               modules/twiddle/src/bin twiddle
  Added:       modules/core/src/bin start.bat
               modules/twiddle/src/bin twiddle.bat
               modules/twiddle/src/conf classworlds.conf
  Removed:     modules/twiddle/src/conf forehead.conf
  Log:
   o Using Classwords instead of Forehead
   o Added windows scripts
  
  Revision  Changes    Path
  1.9       +13 -15    incubator-geronimo/modules/twiddle/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/twiddle/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	24 Aug 2003 20:09:25 -0000	1.8
  +++ project.xml	25 Aug 2003 15:44:54 -0000	1.9
  @@ -54,18 +54,9 @@
       -->
       
       <dependency>
  -      <id>forehead</id>
  -      <version>SNAPSHOT</version>
  -      <url>http://forehead.werken.com</url>
  -      <properties>
  -        <runtime>true</runtime>
  -      </properties>
  -    </dependency>
  -    
  -    <dependency>
         <id>classworlds</id>
         <version>SNAPSHOT</version>
  -      <url>http://werken.com</url>
  +      <url>http://classworlds.codehaus.org</url>
         <properties>
           <runtime>true</runtime>
         </properties>
  @@ -93,7 +84,7 @@
         <id>xml-apis</id>
         <version>1.0.b2</version>
         <properties>
  -        <runtime>true</runtime>
  +        <runtime>false</runtime>
         </properties>
       </dependency>
       
  @@ -106,16 +97,23 @@
         </properties>
       </dependency>
       
  -    <!-- Will need this soon
       <dependency>
         <id>commons-beanutils</id>
  -      <version>1.6.1</version>
  +      <version>SNAPSHOT</version>
         <url>http://jakarta.apache.org/commons/beanutils.html</url>
         <properties>
           <runtime>true</runtime>
         </properties>
       </dependency>
  -    -->
  +    
  +    <dependency>
  +      <id>commons-collections</id>
  +      <version>SNAPSHOT</version>
  +      <url>http://jakarta.apache.org/commons/collections.html</url>
  +      <properties>
  +        <runtime>true</runtime>
  +      </properties>
  +    </dependency>
       
       <dependency>
         <id>commons-logging</id>
  
  
  
  1.2       +2 -8      incubator-geronimo/modules/core/src/bin/start
  
  Index: start
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/bin/start,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- start	24 Aug 2003 11:23:14 -0000	1.1
  +++ start	25 Aug 2003 15:44:54 -0000	1.2
  @@ -1,7 +1,7 @@
   #!/bin/sh
   ##############################################################################
   ##                                                                          ##
  -##  Twiddle Proxy                                                           ##
  +##  Twiddle Proxy for UN*X                                                  ##
   ##                                                                          ##
   ##############################################################################
   
  @@ -9,13 +9,7 @@
   ## $Revision$ $Date$
   ##
   
  -PROGNAME=`basename $0`
   DIRNAME=`dirname $0`
  -
   COMMAND_PATH="geronimo/start"
  -
  -if [ -n "$TWIDDLE_OPTS" ]; then
  -    TWIDDLE_OPTS=""
  -fi
   
   exec $DIRNAME/twiddle $TWIDDLE_OPTS $COMMAND_PATH -- "$@"
  
  
  
  1.1                  incubator-geronimo/modules/core/src/bin/start.bat
  
  Index: start.bat
  ===================================================================
  @if "%DEBUG%" == "" @echo off
  @rem ##########################################################################
  @rem                                                                         ##
  @rem  Twiddle Proxy for Windowz                                              ##
  @rem                                                                         ##
  @rem ##########################################################################
  
  @rem 
  @rem $Revision: 1.1 $ $Date: 2003/08/25 15:44:54 $
  @rem 
  
  @rem Set local scope for the variables with windows NT shell
  if "%OS%"=="Windows_NT" setlocal
  
  @rem The path of the command to execute
  set COMMAND_PATH="geronimo/start"
  
  :begin
  @rem Determine what directory it is in.
  set DIRNAME=%~dp0
  if "%DIRNAME%" == "" set DIRNAME=.\
  
  :init
  @rem Get command-line arguments, handling Windowz variants
  if not "%OS%" == "Windows_NT" goto win9xME_args
  if "%eval[2+2]" == "4" goto 4NT_args
  
  @rem Regular WinNT shell
  set CMD_LINE_ARGS=%*
  goto execute
  
  :win9xME_args
  @rem Slurp the command line arguments.
  set CMD_LINE_ARGS=
  
  :win9xME_args_slurp
  if "x%1" == "x" goto execute
  set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
  shift
  goto win9xME_args_slurp
  
  :4NT_args
  @rem Get arguments from the 4NT Shell from JP Software
  set CMD_LINE_ARGS=%$
  
  :execute
  @rem Setup the command line
  set TWIDDLE_CMD="%DIRNAME%/twiddle.bat"
  
  @rem Execute Twiddle
  call %TWIDDLE_CMD% %TWIDDLE_OPTS% geronimo/start -- %CMD_LINE_ARGS%
  
  :end
  @rem End local scope for the variables with windows NT shell
  if "%OS%"=="Windows_NT" endlocal
  
  
  
  
  1.2       +13 -15    incubator-geronimo/modules/twiddle/src/bin/twiddle
  
  Index: twiddle
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/twiddle/src/bin/twiddle,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- twiddle	24 Aug 2003 09:27:44 -0000	1.1
  +++ twiddle	25 Aug 2003 15:44:54 -0000	1.2
  @@ -1,7 +1,7 @@
   #!/bin/sh
   ##############################################################################
   ##                                                                          ##
  -##  Twiddle JVM Bootstrap                                                   ##
  +##  Twiddle JVM Bootstrap for UN*X                                          ##
   ##                                                                          ##
   ##############################################################################
   
  @@ -15,8 +15,8 @@
   # Use the maximum available, or set MAX_FD != -1 to use that
   MAX_FD="maximum"
   
  -# The version of forehead to boot with
  -FOREHEAD_VERSION="SNAPSHOT"
  +# The version of classworlds to boot with
  +CLASSWORLDS_VERSION="SNAPSHOT"
   
   warn() {
       echo "${PROGNAME}: $*"
  @@ -55,11 +55,11 @@
       TWIDDLE_HOME=`cd $DIRNAME/..; pwd`
   fi
   
  -# Use default forehead config
  -if [ -z "$FOREHEAD_CONF" ]; then
  -    FOREHEAD_CONF="$TWIDDLE_HOME/etc/forehead.conf"
  +# Use default classworlds config
  +if [ -z "$CLASSWORLDS_CONF" ]; then
  +    CLASSWORLDS_CONF="$TWIDDLE_HOME/etc/classworlds.conf"
   fi
  -FOREHEAD_CLASSPATH="$TWIDDLE_HOME/lib/forehead-${FOREHEAD_VERSION}.jar"
  +CLASSWORLDS_CLASSPATH="$TWIDDLE_HOME/lib/classworlds-${CLASSWORLDS_VERSION}.jar"
   
   # Determine the Java command to use to start the JVM
   if [ -z "$JAVACMD" ]; then
  @@ -74,11 +74,9 @@
           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
  @@ -122,8 +120,8 @@
   if $cygwin; then
       TWIDDLE_HOME=`cygpath --path --windows "$TWIDDLE_HOME"`
       JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
  -    FOREHEAD_CONF=`cygpath --path --windows "$FOREHEAD_CONF"`
  -    FOREHEAD_CLASSPATH=`cygpath --path --windows "$FOREHEAD_CLASSPATH"`
  +    CLASSWORLDS_CONF=`cygpath --path --windows "$CLASSWORLDS_CONF"`
  +    CLASSWORLDS_CLASSPATH=`cygpath --path --windows "$CLASSWORLDS_CLASSPATH"`
       TOOLS_JAR=`cygpath --path --windows "$TOOLS_JAR"`
   fi
   
  @@ -132,10 +130,10 @@
       runProfiler
   else
       exec $JAVACMD $JAVA_OPTS \
  -        -classpath "$FOREHEAD_CLASSPATH" \
  +        -classpath "$CLASSWORLDS_CLASSPATH" \
           -Dprogram.name="$PROGNAME" \
  -        -Dforehead.conf.file="$FOREHEAD_CONF" \
  +        -Dclassworlds.conf="$CLASSWORLDS_CONF" \
           -Dtwiddle.home="$TWIDDLE_HOME" \
           -Dtools.jar="$TOOLS_JAR" \
  -        com.werken.forehead.Forehead "$@"
  +        com.werken.classworlds.Launcher "$@"
   fi
  
  
  
  1.1                  incubator-geronimo/modules/twiddle/src/bin/twiddle.bat
  
  Index: twiddle.bat
  ===================================================================
  @if "%DEBUG%" == "" @echo off
  @rem ##########################################################################
  @rem                                                                         ##
  @rem  Twiddle JVM Bootstrap for Windowz                                      ##
  @rem                                                                         ##
  @rem ##########################################################################
  
  @rem 
  @rem $Revision: 1.1 $ $Date: 2003/08/25 15:44:54 $
  @rem 
  
  @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="SNAPSHOT"
  
  :begin
  @rem Determine what directory it is in.
  set DIRNAME=%~dp0
  if "%DIRNAME%" == "" set DIRNAME=.\
  
  @rem Determine the command interpreter to execute the "CD" later
  set COMMAND_COM="cmd.exe"
  if exist "%SystemRoot%\system32\cmd.exe" set COMMAND_COM="%SystemRoot%\system32\cmd.exe"
  if exist "%SystemRoot%\command.com" set COMMAND_COM="%SystemRoot%\command.com"
  
  @rem Use explicit find.exe to prevent cygwin and others find.exe from being used
  set FIND_EXE="find.exe"
  if exist "%SystemRoot%\system32\find.exe" set FIND_EXE="%SystemRoot%\system32\find.exe"
  if exist "%SystemRoot%\command\find.exe" set FIND_EXE="%SystemRoot%\command\find.exe"
  
  :check_JAVA_HOME
  @rem Make sure we have a valid JAVA_HOME
  if not "%JAVA_HOME%" == "" goto have_JAVA_HOME
  
  echo.
  echo ERROR: Environment variable JAVA_HOME has not been set.
  echo.
  echo Please set the JAVA_HOME variable in your environment to match the
  echo location of your Java installation.
  echo.
  goto end
  
  :have_JAVA_HOME
  @rem Validate JAVA_HOME
  %COMMAND_COM% /C DIR "%JAVA_HOME%" 2>&1 | %FIND_EXE% /I /C "%JAVA_HOME%" >nul
  if not errorlevel 1 goto check_TWIDDLE_HOME
  
  echo.
  echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
  echo.
  echo Please set the JAVA_HOME variable in your environment to match the
  echo location of your Java installation.
  echo.
  goto end
  
  :check_TWIDDLE_HOME
  @rem Define TWIDDLE_HOME if not set
  if "%TWIDDLE_HOME%" == "" set TWIDDLE_HOME=%DIRNAME%..
  
  :init
  @rem Get command-line arguments, handling Windowz variants
  if not "%OS%" == "Windows_NT" goto win9xME_args
  if "%eval[2+2]" == "4" goto 4NT_args
  
  @rem Regular WinNT shell
  set CMD_LINE_ARGS=%*
  goto execute
  
  :win9xME_args
  @rem Slurp the command line arguments.  This loop allows for an unlimited number
  set CMD_LINE_ARGS=
  
  :win9xME_args_slurp
  if "x%1" == "x" goto execute
  set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
  shift
  goto win9xME_args_slurp
  
  :4NT_args
  @rem Get arguments from the 4NT Shell from JP Software
  set CMD_LINE_ARGS=%$
  
  :execute
  @rem Setup the command line
  set CLASSWORLDS_CLASSPATH="%TWIDDLE_HOME%\lib\classworlds-%CLASSWORLDS_VERSION%.jar"
  set CLASSWORLDS_MAIN_CLASS="com.werken.classworlds.Launcher"
  set CLASSWORLDS_CONF="%TWIDDLE_HOME%\etc\classworlds.conf"
  
  if "%JAVA_OPTS%" == "" set JAVA_OPTS="-Xmx128m"
  set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
  set JAVA_OPTS=%JAVA_OPTS% -Dtwiddle.home=%TWIDDLE_HOME%
  set JAVA_OPTS=%JAVA_OPTS% -Dtools.jar=%TOOLS_JAR%
  set JAVA_OPTS=%JAVA_OPTS% -Dclassworlds.conf=%CLASSWORLDS_CONF%
  
  set JAVA_EXE="%JAVA_HOME%\bin\java.exe"
  set TOOLS_JAR="%JAVA_HOME%\lib\tools.jar"
  
  @rem Execute Twiddle
  %JAVA_EXE% %JAVA_OPTS% -classpath %CLASSWORLDS_CLASSPATH% %CLASSWORLDS_MAIN_CLASS% %CMD_LINE_ARGS%
  
  :end
  @rem End local scope for the variables with windows NT shell
  if "%OS%"=="Windows_NT" endlocal
  
  @rem Optional pause the batch file
  if "%TWIDDLE_BATCH_PAUSE%" == "on" pause
  
  
  
  
  1.1                  incubator-geronimo/modules/twiddle/src/conf/classworlds.conf
  
  Index: classworlds.conf
  ===================================================================
  ##############################################################################
  ##                                                                          ##
  ##  Twiddle Classworlds Configuration                                       ##
  ##                                                                          ##
  ##############################################################################
  
  ##
  ## $Revision: 1.1 $ $Date: 2003/08/25 15:44:54 $
  ##
  
  # The main entry-point
  main is org.apache.geronimo.twiddle.cli.Main from twiddle 
  
  #
  # TODO: Fix me, so that the class realm only contains the basic
  #       libraries, but for now this works
  #
  
  [twiddle]
      load ${twiddle.home}/lib/xerces-*.jar
      load ${twiddle.home}/lib/castor-*.jar
      load ${twiddle.home}/lib/log4j-*.jar
      load ${twiddle.home}/lib/commons-logging-*.jar
      load ${twiddle.home}/lib/commons-cli-*.jar
      load ${twiddle.home}/lib/commons-lang-*.jar
      load ${twiddle.home}/lib/commons-jexl-*.jar
      load ${twiddle.home}/lib/geronimo-common-*.jar
      load ${twiddle.home}/lib/geronimo-twiddle-*.jar
      
      # Logging adapter is currently in here
      load ${twiddle.home}/lib/geronimo-core-*.jar
      
      # Required to boot Geronimo since it does not do any bootstrap classloading
      load ${twiddle.home}/lib/*.jar
  
  
  

Mime
View raw message