tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1555689 - /tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb
Date Mon, 06 Jan 2014 06:34:59 GMT
Author: rmannibucau
Date: Mon Jan  6 06:34:59 2014
New Revision: 1555689

URL: http://svn.apache.org/r1555689
Log:
OPENEJB-2065 better openejb patch from Bill Cole

Modified:
    tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb

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=1555689&r1=1555688&r2=1555689&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb (original)
+++ tomee/tomee/trunk/assembly/openejb-standalone/src/main/resources/openejb Mon Jan  6 06:34:59
2014
@@ -51,7 +51,7 @@ if [ -z "$OPENEJB_HOME" -o ! -d "$OPENEJ
   progname=`basename "$0"`
 
   # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
+  while [ -L "$PRG" ] ; do
     ls=`ls -ld "$PRG"`
     link=`expr "$ls" : '.*-> \(.*\)$'`
     if expr "$link" : '/.*' > /dev/null; then
@@ -74,15 +74,15 @@ fi
 
 #echo OPENEJB_HOME = $OPENEJB_HOME
 
-OPTIONS="-Dopenejb.home=$OPENEJB_HOME"
-
-OPENEJB_CORE_JAR="$OPENEJB_HOME/lib/openejb-core-${version}.jar:$OPENEJB_HOME/lib/$(ls $OPENEJB_HOME/lib
| grep javaee-api)"
+OPENEJB_CORE_JAR="$OPENEJB_HOME/lib/openejb-core-${version}.jar"
+OPENEJB_JAVAEE_JAR=$(echo "$OPENEJB_HOME"/lib/javaee-api*)
+OPENEJB_CP="$OPENEJB_CORE_JAR:$OPENEJB_JAVAEE_JAR"
 OPENEJB_JAVAAGENT_JAR="$OPENEJB_HOME/lib/openejb-javaagent-${version}.jar"
 
 args="$@"
-if [ "x$1" = "xdebug" ]; then
+if [ "$1" = "debug" ]; then
     OPENEJB_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
$OPENEJB_OPTS"
 	args="start"
 fi
 
-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
"$args"
+java $OPENEJB_OPTS  "-Djava.util.logging.config.file=$OPENEJB_HOME/conf/logging.properties"
"-javaagent:$OPENEJB_JAVAAGENT_JAR" -cp "$OPENEJB_CP"  org.apache.openejb.cli.Bootstrap $args



Mime
View raw message