Repository: tomee Updated Branches: refs/heads/master f02b0f4b3 -> b07065c30
supporting plain java + adding lib/ in cp as tomcat does + fixing effective-tomee command removing the iphen (all fixes are for tomee.sh) Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fd847242 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fd847242 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fd847242 Branch: refs/heads/master Commit: fd847242f52481152940518d092cfc370ce68f2d Parents: f02b0f4 Author: Romain Manni-Bucau <[email protected]> Authored: Sat Apr 4 00:51:40 2015 +0200 Committer: Romain Manni-Bucau <[email protected]> Committed: Sat Apr 4 00:51:40 2015 +0200 ---------------------------------------------------------------------- .../apache/openejb/config/EffectiveTomEEXml.java | 2 +- .../org.apache.openejb.cli/effective-tomee | 18 ------------------ tomee/apache-tomee/src/main/resources/tomee.sh | 8 ++++---- 3 files changed, 5 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/fd847242/container/openejb-core/src/main/java/org/apache/openejb/config/EffectiveTomEEXml.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/EffectiveTomEEXml.java b/container/openejb-core/src/main/java/org/apache/openejb/config/EffectiveTomEEXml.java index 499d1f6..958b5ca 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/EffectiveTomEEXml.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/EffectiveTomEEXml.java @@ -104,7 +104,7 @@ public final class EffectiveTomEEXml { } private static void help(final Options options) { - new HelpFormatter().printHelp("effective-tomee [options] <value>", "\n", options, "\n"); + new HelpFormatter().printHelp("effectivetomee [options] <value>", "\n", options, "\n"); } private EffectiveTomEEXml() { http://git-wip-us.apache.org/repos/asf/tomee/blob/fd847242/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/effective-tomee ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/effective-tomee b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/effective-tomee deleted file mode 100644 index 00cc635..0000000 --- a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.cli/effective-tomee +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -main.class = org.apache.openejb.config.EffectiveTomEEXml -name = effective-tomee -description = Shows properties TomEE will use for resources http://git-wip-us.apache.org/repos/asf/tomee/blob/fd847242/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 4c1c338..3ea5279 100644 --- a/tomee/apache-tomee/src/main/resources/tomee.sh +++ b/tomee/apache-tomee/src/main/resources/tomee.sh @@ -62,13 +62,13 @@ PRGDIR=`dirname "$PRG"` . "$TOMEE_HOME"/bin/setclasspath.sh -if [ -d $JAVA_HOME ]; then - JAVA=$JAVA_HOME"/bin/java" -else +if [ -z $JAVA_HOME ]; then JAVA="java" +else + JAVA=$JAVA_HOME"/bin/java" fi -CP="" +CP="$TOMEE_HOME/lib" for i in $TOMEE_HOME/lib/*.jar; do CP="$CP:$i" done
