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 2013/02/07 16:31:02 UTC
svn commit: r1443555 - in
/tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources: openejb
openejb.bat
Author: rmannibucau
Date: Thu Feb 7 15:31:02 2013
New Revision: 1443555
URL: http://svn.apache.org/viewvc?rev=1443555&view=rev
Log:
javaee-api is needed to start correctly openejb
Modified:
tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb
tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb.bat
Modified: tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb?rev=1443555&r1=1443554&r2=1443555&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb (original)
+++ tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb Thu Feb 7 15:31:02 2013
@@ -76,10 +76,10 @@ fi
OPTIONS="-Dopenejb.home=$OPENEJB_HOME"
-OPENEJB_CORE_JAR="$OPENEJB_HOME/lib/openejb-core-${version}.jar"
+OPENEJB_CORE_JAR="$OPENEJB_HOME/lib/openejb-core-${version}.jar:$OPENEJB_HOME/lib/$(ls $OPENEJB_HOME/lib | grep javaee-api)"
OPENEJB_JAVAAGENT_JAR="$OPENEJB_HOME/lib/openejb-javaagent-${version}.jar"
## Uncomment for easy debug setup
# OPENEJB_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
-java $OPENEJB_OPTS "-Djava.util.logging.config.file=$OPENEJB_HOME/conf/logging.properties" "-javaagent:$OPENEJB_JAVAAGENT_JAR" -jar "$OPENEJB_CORE_JAR" "$@"
+java $OPENEJB_OPTS "-Djava.util.logging.config.file=$OPENEJB_HOME/conf/logging.properties" "-javaagent:$OPENEJB_JAVAAGENT_JAR" -cp "$OPENEJB_CORE_JAR" org.apache.openejb.cli.Bootstrap "$@"
Modified: tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb.bat
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb.bat?rev=1443555&r1=1443554&r2=1443555&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb.bat (original)
+++ tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb.bat Thu Feb 7 15:31:02 2013
@@ -44,7 +44,7 @@ set "OPENEJB_HOME=%CD%"
REM echo OPENEJB_HOME is: %OPENEJB_HOME%
-set OPENEJB_CORE_JAR="%OPENEJB_HOME%\lib\openejb-core-*.jar"
+set OPENEJB_CORE_JAR="%OPENEJB_HOME%\lib\openejb-core-*.jar;$OPENEJB_HOME/lib/javaee-api-*.jar"
set OPENEJB_JAVAAGENT_JAR="%OPENEJB_HOME%\lib\openejb-javaagent-*.jar"
for %%a in (%OPENEJB_CORE_JAR%) do (
@@ -69,7 +69,7 @@ set OPTIONS=-Dopenejb.home=%OPENEJB_HOME
REM echo %OPENEJB_OPTS% -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% %*
-java %OPENEJB_OPTS% -Djava.util.logging.config.file=%OPENEJB_HOME%/conf/logging.properties -javaagent:%OPENEJB_JAVAAGENT_JAR% -jar %OPENEJB_CORE_JAR% %*
+java %OPENEJB_OPTS% -Djava.util.logging.config.file=%OPENEJB_HOME%/conf/logging.properties -javaagent:%OPENEJB_JAVAAGENT_JAR% -cp %OPENEJB_CORE_JAR% org.apache.openejb.cli.Bootstrap %*
:EOF
ENDLOCAL