You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/07/22 08:03:00 UTC
[2/2] tomee git commit: TOMEE-1882 add tomcat-juli to tomee scripts
classpath
TOMEE-1882 add tomcat-juli to tomee scripts classpath
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f38677d1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f38677d1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f38677d1
Branch: refs/heads/master
Commit: f38677d1418a79a7e09c072d67480d1270a70ff0
Parents: c6f737d
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Fri Jul 22 10:02:39 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Fri Jul 22 10:02:39 2016 +0200
----------------------------------------------------------------------
tomee/apache-tomee/src/main/resources/tomee.bat | 19 +++++++++++++++----
tomee/apache-tomee/src/main/resources/tomee.sh | 4 +++-
2 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f38677d1/tomee/apache-tomee/src/main/resources/tomee.bat
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/main/resources/tomee.bat b/tomee/apache-tomee/src/main/resources/tomee.bat
index cf7c357..e69b78d 100644
--- a/tomee/apache-tomee/src/main/resources/tomee.bat
+++ b/tomee/apache-tomee/src/main/resources/tomee.bat
@@ -10,7 +10,7 @@ rem U.S. Copyright Office.
rem
-if "%OS%" == "Windows_NT" setlocal
+setlocal
set port=8080
@@ -39,6 +39,13 @@ rem Ensure that any user defined CLASSPATH variables are not used on startup,
rem but allow them to be specified in setenv.bat, in rare case when it is needed.
set CLASSPATH=
+if not exist "%CATALINA_BASE%\bin\tomcat-juli.jar" goto juliClasspathHome
+set "CLASSPATH=%CLASSPATH%;%CATALINA_BASE%\bin\tomcat-juli.jar"
+goto juliClasspathDone
+:juliClasspathHome
+set "CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\tomcat-juli.jar"
+:juliClasspathDone
+
rem Get standard Java environment variables
if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath
echo Cannot find "%CATALINA_HOME%\bin\setclasspath.bat"
@@ -52,9 +59,13 @@ if DEFINED CATALINA_TMPDIR goto gotTmpdir
set "CATALINA_TMPDIR=%CATALINA_BASE%\temp"
:gotTmpdir
-
-rem create classpath
-set "CLASSPATH=%CATALINA_HOME%\lib\*"
+if not exist %CATALINA_BASE% goto :libClasspathHome
+set CLASSPATH=%CLASSPATH%;%CATALINA_BASE%\lib\*
+if "%CATALINA_BASE%" equ %CATALINA_HOME% goto :libClasspathDone
+:libClasspathHome
+if not exist %CATALINA_HOME% goto :libClasspathDone
+set CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\lib\*
+:libClasspathDone
set DEBUG=
set "args=%*"
http://git-wip-us.apache.org/repos/asf/tomee/blob/f38677d1/tomee/apache-tomee/src/main/resources/tomee.sh
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/main/resources/tomee.sh b/tomee/apache-tomee/src/main/resources/tomee.sh
index 7461d6e..1a02897 100644
--- a/tomee/apache-tomee/src/main/resources/tomee.sh
+++ b/tomee/apache-tomee/src/main/resources/tomee.sh
@@ -79,6 +79,7 @@ fi
if [ ! -z "$CLASSPATH" ] ; then
CLASSPATH="$CLASSPATH":
fi
+CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar
if [ -r "$CATALINA_BASE/bin/tomcat-juli.jar" ] ; then
CLASSPATH=$CLASSPATH:$CATALINA_BASE/bin/tomcat-juli.jar
@@ -99,7 +100,7 @@ if [ -z "$JSSE_OPTS" ] ; then
fi
JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS"
-CLASSPATH="$CATALINA_HOME/lib"
+CLASSPATH="$CLASSPATH:$CATALINA_HOME/lib"
for i in "$CATALINA_HOME"/lib/*.jar; do
CLASSPATH="$CLASSPATH:$i"
done
@@ -131,3 +132,4 @@ elif [ "$1" = "start" ] || [ "$1" = "stop" ]; then
else
"$_RUNJAVA" $DEBUG $LOGGING_MANAGER -Dopenejb.base="$CATALINA_BASE" -cp "$CLASSPATH" org.apache.openejb.cli.Bootstrap $*
fi
+