Skip to content
Permalink
Browse files
BATCHEE-61 openejb 4.7.1
  • Loading branch information
rmannibucau committed Mar 24, 2015
1 parent 3fa7a94 commit 716954137a5f6b99b6def9e7d80d5a482544c63a
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 5 deletions.
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>4.6.0</version>
<version>4.7.1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -78,13 +78,12 @@
<include>org.apache.openejb:openejb-loader</include>
<include>org.apache.openejb:openejb-jpa-integration</include>
<include>org.apache.openejb:mbean-annotation-api</include>
<include>org.quartz-scheduler:quartz</include>
<include>org.apache.openejb:openejb-shade-quartz</include> <!-- openejb >= 4.6.1 -->
<include>org.apache.openejb.shade:quartz-openejb-shade</include>
<include>org.metatype.sxc:sxc-runtime</include>
<include>org.metatype.sxc:sxc-jaxb-core</include>
<include>org.apache.geronimo.components:geronimo-transaction</include>
<include>org.apache.geronimo.javamail:geronimo-javamail_1.4_mail</include>
<include>org.apache.xbean:xbean-asm4-shaded</include>
<include>org.apache.xbean:xbean-asm5-shaded</include>
<include>org.apache.xbean:xbean-finder-shaded</include>
<!--<include>org.apache.xbean:xbean-reflect</include>--> <!-- already used by batchee -->
<include>org.apache.xbean:xbean-naming</include>
@@ -20,6 +20,31 @@ case "`uname`" in
CYGWIN*) cygwin=true;;
esac

# find JAVA
if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
if $darwin; then
if [ -x '/usr/libexec/java_home' ] ; then
export JAVA_HOME=`/usr/libexec/java_home`
elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home"
fi
else
JAVA_PATH=`which java 2>/dev/null`
if [ "x$JAVA_HOME" != "x" ]; then
JAVA_PATH=`dirname $JAVA_PATH 2>/dev/null`
JAVA_HOME=`dirname $JAVA_PATH 2>/dev/null`
fi
if [ "x$JAVA_HOME" = "x" ]; then
if [ -x /usr/bin/java ]; then
JAVA_HOME=/usr
fi
fi
fi
fi
if [ -z "$_RUNJAVA" ]; then
_RUNJAVA="$JAVA_HOME"/bin/java
fi

if [ -z "$BATCHEE_HOME" -o ! -d "$BATCHEE_HOME" ] ; then
# find batchee
if [ -d /opt/batchee ] ; then
@@ -77,4 +102,4 @@ if [ -f "$logging" ] ; then
BATCHEE_OPTS="$BATCHEE_OPTS -Djava.util.logging.config.file=$logging"
fi

java $BATCHEE_OPTS -cp "$bin" org.apache.batchee.cli.bootstrap.Bootstrap $@
$_RUNJAVA $BATCHEE_OPTS -cp "$bin" org.apache.batchee.cli.bootstrap.Bootstrap $@

0 comments on commit 7169541

Please sign in to comment.