donaldp 2003/04/04 02:53:53
Modified: src/script phoenix.sh run.bat
Log:
Tool related jars have moved into a separate $PHOENIX_HOME/tools/lib directory. This
is to continue fixing our classloader hell.
Revision Changes Path
1.6 +9 -5 avalon-phoenix/src/script/phoenix.sh
Index: phoenix.sh
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/script/phoenix.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- phoenix.sh 25 Sep 2002 12:51:36 -0000 1.5
+++ phoenix.sh 4 Apr 2003 10:53:53 -0000 1.6
@@ -8,7 +8,7 @@
#
# Environment Variable Prequisites
#
-# PHOENIX_OPTS (Optional) Java runtime options used when the command is
+# PHOENIX_OPTS (Optional) Java runtime options used when the command is
# executed.
#
# PHOENIX_TMPDIR (Optional) Directory path location of temporary directory
@@ -17,7 +17,7 @@
#
# JAVA_HOME Must point at your Java Development Kit installation.
#
-# PHOENIX_JVM_OPTS (Optional) Java runtime options used when the command is
+# PHOENIX_JVM_OPTS (Optional) Java runtime options used when the command is
# executed.
#
# -----------------------------------------------------------------------------
@@ -110,7 +110,11 @@
# like placing jaxp/jaas/xml-parser jars in ext dir
# thus breaking Phoenix
#
-JVM_OPTS="-Djava.ext.dirs=$PHOENIX_HOME/lib"
+JVM_EXT_DIRS="$PHOENIX_HOME/lib:$PHOENIX_HOME/tools/lib"
+if $cygwin; then
+ JVM_EXT_DIRS=`cygpath --path --windows "$JVM_EXT_DIRS"`
+fi
+JVM_OPTS="-Djava.ext.dirs=$JVM_EXT_DIRS"
if [ "$PHOENIX_SECURE" != "false" ] ; then
# Make phoenix run with security manager enabled
@@ -207,7 +211,7 @@
exec $RUN_CMD
;;
-
+
check)
echo "Checking arguments to Phoenix: "
echo "PHOENIX_HOME: $PHOENIX_HOME"
@@ -226,7 +230,7 @@
fi
exit 1
;;
-
+
*)
usage
;;
1.13 +2 -2 avalon-phoenix/src/script/run.bat
Index: run.bat
===================================================================
RCS file: /home/cvs/avalon-phoenix/src/script/run.bat,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- run.bat 18 Mar 2003 09:01:14 -0000 1.12
+++ run.bat 4 Apr 2003 10:53:53 -0000 1.13
@@ -50,7 +50,7 @@
echo.
echo Error: PHOENIX_HOME environment variable is not set.
-echo This needs to be set manually for Win9x as its command
+echo This needs to be set manually for Win9x as its command
echo prompt scripting does not allow it to be set automatically.
echo.
goto end
@@ -86,6 +86,6 @@
rem set DEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
rem Kicking the tires and lighting the fires!!!
-"%PHOENIX_JAVACMD%" %DEBUG% "-Djava.ext.dirs=%PHOENIX_HOME%\lib"
"-Dphoenix.home=%PHOENIX_HOME%"
"-Djava.security.policy=jar:file:%PHOENIX_HOME%/bin/phoenix-loader.jar!/META-INF/java.policy"
%PHOENIX_JVM_OPTS% %PHOENIX_SM% -jar "%PHOENIX_HOME%\bin\phoenix-loader.jar" %1 %2 %3
%4 %5 %6 %7 %8 %9
+"%PHOENIX_JAVACMD%" %DEBUG%
"-Djava.ext.dirs=%PHOENIX_HOME%\lib;%PHOENIX_HOME%\tools\lib"
"-Dphoenix.home=%PHOENIX_HOME%"
"-Djava.security.policy=jar:file:%PHOENIX_HOME%/bin/phoenix-loader.jar!/META-INF/java.policy"
%PHOENIX_JVM_OPTS% %PHOENIX_SM% -jar "%PHOENIX_HOME%\bin\phoenix-loader.jar" %1 %2 %3
%4 %5 %6 %7 %8 %9
:end
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
