james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From charl...@apache.org
Subject cvs commit: jakarta-james/res run.bat run.sh
Date Mon, 02 Apr 2001 14:57:12 GMT
charlesb    01/04/02 07:57:12

  Modified:    .        build.xml
               lib      avalonapi.jar phoenix-client.jar phoenix-engine.jar
                        phoenix-loader.jar
               res      run.bat run.sh
  Log:
  Corrected build file to include logkit jar in dist and updated to current phoenix jars.
  
  Revision  Changes    Path
  1.48      +1 -0      jakarta-james/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-james/build.xml,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- build.xml	2001/04/02 02:11:18	1.47
  +++ build.xml	2001/04/02 14:57:06	1.48
  @@ -270,6 +270,7 @@
         <fileset dir="lib">
           <include name="phoenix-client.jar"/>
           <include name="avalonapi.jar"/>
  +        <include name="logkit.jar"/>
           <include name="xerces.jar"/>
         </fileset>
       </copy>
  
  
  
  1.9       +207 -201  jakarta-james/lib/avalonapi.jar
  
  	<<Binary file>>
  
  
  1.3       +19 -23    jakarta-james/lib/phoenix-client.jar
  
  	<<Binary file>>
  
  
  1.3       +213 -197  jakarta-james/lib/phoenix-engine.jar
  
  	<<Binary file>>
  
  
  1.3       +27 -33    jakarta-james/lib/phoenix-loader.jar
  
  	<<Binary file>>
  
  
  1.13      +60 -3     jakarta-james/res/run.bat
  
  Index: run.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-james/res/run.bat,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- run.bat	2001/03/05 11:21:06	1.12
  +++ run.bat	2001/04/02 14:57:11	1.13
  @@ -1,3 +1,60 @@
  -@echo off
  -
  -java %PHOENIX_JVM_OPTS% -jar phoenix-loader.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
  \ No newline at end of file
  +@echo off
  +rem
  +rem Phoenix start script.
  +rem
  +rem Author: Peter Donald [donaldp@apache.org]
  +rem
  +rem The user may choose to supply parameters to the JVM (such as memory settings)
  +rem via setting the environment variable PHOENIX_JVM_OPTS
  +rem
  +
  +rem
  +rem Determine if JAVA_HOME is set and if so then use it
  +rem
  +if not "%JAVA_HOME%"=="" goto found_java
  +
  +set PHOENIX_JAVACMD=java
  +goto file_locate
  +
  +:found_java
  +set PHOENIX_JAVACMD=%JAVA_HOME%\bin\java
  +
  +:file_locate
  +
  +rem
  +rem Locate where phoenix is in filesystem
  +rem
  +if not "%OS%"=="Windows_NT" goto start
  +
  +rem %~dp0 is name of current script under NT
  +set PHOENIX_HOME=%~dp0
  +
  +rem : operator works similar to make : operator
  +set PHOENIX_HOME=%PHOENIX_HOME:\bin\=%
  +
  +:start
  +
  +if not "%PHOENIX_HOME%" == "" goto phoenix_home
  +
  +echo.
  +echo Warning: PHOENIX_HOME environment variable is not set.
  +echo   This needs to be set for Win9x as it's command prompt 
  +echo   scripting bites
  +echo.
  +goto end
  +
  +:phoenix_home
  +
  +rem echo "Home directory: %PHOENIX_HOME%"
  +rem echo "Home ext directory: %PHOENIX_HOME%\lib"
  +
  +rem
  +rem This is needed as some JVM vendors do foolish things
  +rem like placing jaxp/jaas/xml-parser jars in ext dir
  +rem thus breaking Phoenix
  +rem
  +
  +rem Kicking the tires and lighting the fires!!!
  +%PHOENIX_JAVACMD% -Djava.ext.dirs=%PHOENIX_HOME%\lib %PHOENIX_JVM_OPTS% -jar %PHOENIX_HOME%\bin\phoenix-loader.jar
%1 %2 %3 %4 %5 %6 %7 %8 %9
  +
  +:end
  \ No newline at end of file
  
  
  
  1.14      +36 -1     jakarta-james/res/run.sh
  
  Index: run.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-james/res/run.sh,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- run.sh	2001/03/05 11:21:07	1.13
  +++ run.sh	2001/04/02 14:57:11	1.14
  @@ -1,5 +1,15 @@
   #! /bin/sh
  +#
  +# Phoenix start script.
  +#
  +# Author: Peter Donald <donaldp@apache.org>
  +#
  +# The user may choose to supply parameters to the JVM (such as memory settings)
  +# via setting the environment variable PHOENIX_JVM_OPTS
  +#
   
  +# Checking for JAVA_HOME is required on *nix due
  +# to some distributions stupidly including kaffe in /usr/bin
   if [ "$JAVA_HOME" = "" ] ; then
     echo "ERROR: JAVA_HOME not found in your environment."
     echo
  @@ -8,4 +18,29 @@
     exit 1
   fi
   
  -$JAVA_HOME/bin/java $PHOENIX_JVM_OPTS -jar phoenix-loader.jar $*
  +#
  +# Locate where phoenix is in filesystem
  +#
  +THIS_PROG=`dirname $0`
  +
  +if [ "$THIS_PROG" = "." ] ; then
  +  THIS_PROG=$PWD
  +fi
  +
  +PHOENIX_HOME=$THIS_PROG/..
  +unset THIS_PROG
  +
  +# echo "Home directory: $PHOENIX_HOME"
  +# echo "Home ext directory: $PHOENIX_HOME/lib"
  +
  +#
  +# Command to overide JVM ext dir
  +#
  +# This is needed as some JVM vendors do foolish things
  +# like placing jaxp/jaas/xml-parser jars in ext dir
  +# thus breaking Phoenix
  +#
  +JVM_OPTS="-Djava.ext.dirs=$PHOENIX_HOME/lib $PHOENIX_JVM_OPTS"
  +
  +# Kicking the tires and lighting the fires!!!
  +$JAVA_HOME/bin/java $JVM_OPTS -jar $PHOENIX_HOME/bin/phoenix-loader.jar $*
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: james-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: james-dev-help@jakarta.apache.org


Mime
View raw message