You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@batchee.apache.org by rm...@apache.org on 2015/03/24 21:26:31 UTC
incubator-batchee git commit: BATCHEE-61 openejb 4.7.1
Repository: incubator-batchee
Updated Branches:
refs/heads/master 3fa7a949a -> 716954137
BATCHEE-61 openejb 4.7.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/71695413
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/71695413
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/71695413
Branch: refs/heads/master
Commit: 716954137a5f6b99b6def9e7d80d5a482544c63a
Parents: 3fa7a94
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Mar 24 21:26:24 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Mar 24 21:26:24 2015 +0100
----------------------------------------------------------------------
tools/cli/pom.xml | 2 +-
tools/cli/src/main/assembly/bin-openejb.xml | 5 ++---
tools/cli/src/main/resources/batchee | 27 +++++++++++++++++++++++-
3 files changed, 29 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/71695413/tools/cli/pom.xml
----------------------------------------------------------------------
diff --git a/tools/cli/pom.xml b/tools/cli/pom.xml
index 1ee68db..2ddc71c 100644
--- a/tools/cli/pom.xml
+++ b/tools/cli/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/71695413/tools/cli/src/main/assembly/bin-openejb.xml
----------------------------------------------------------------------
diff --git a/tools/cli/src/main/assembly/bin-openejb.xml b/tools/cli/src/main/assembly/bin-openejb.xml
index 4254cde..4f0758f 100644
--- a/tools/cli/src/main/assembly/bin-openejb.xml
+++ b/tools/cli/src/main/assembly/bin-openejb.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/71695413/tools/cli/src/main/resources/batchee
----------------------------------------------------------------------
diff --git a/tools/cli/src/main/resources/batchee b/tools/cli/src/main/resources/batchee
index 463e657..1dd49ac 100644
--- a/tools/cli/src/main/resources/batchee
+++ b/tools/cli/src/main/resources/batchee
@@ -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 $@