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 2015/08/30 22:52:37 UTC

[1/2] tomee git commit: TOMEE-1628 writing to not use start/stop commands from tomee.sh

Repository: tomee
Updated Branches:
  refs/heads/master 3895b3540 -> 6014cf207


TOMEE-1628 writing to not use start/stop commands from tomee.sh


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6b97067d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6b97067d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6b97067d

Branch: refs/heads/master
Commit: 6b97067da87ce08c62309ea3947beffed447c95c
Parents: 3895b35
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Sun Aug 30 22:50:13 2015 +0200
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Sun Aug 30 22:50:13 2015 +0200

----------------------------------------------------------------------
 tomee/apache-tomee/src/main/resources/tomee.sh | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/6b97067d/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 81c9098..e5e09cf 100644
--- a/tomee/apache-tomee/src/main/resources/tomee.sh
+++ b/tomee/apache-tomee/src/main/resources/tomee.sh
@@ -80,6 +80,9 @@ if [ "$1" = "deploy" ] || [ "$1" = "undeploy" ]; then
     else
         echo "Usage: <tomee.sh> $1 <path>"
     fi
+elif [ "$1" = "start" ] || [ "$1" = "stop" ]; then
+    echo "To start or stop TomEE please use catalina.sh/startup.sh/shutdown.sh instead of tomee.sh"
 else
     $JAVA $DEBUG -Dopenejb.base="$TOMEE_HOME" -cp "\"$CP\"" org.apache.openejb.cli.Bootstrap $*
 fi
+


[2/2] tomee git commit: TOMEE-1628 logging start/stop are not supported from tomee.bat

Posted by rm...@apache.org.
TOMEE-1628 logging start/stop are not supported from tomee.bat


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6014cf20
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6014cf20
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6014cf20

Branch: refs/heads/master
Commit: 6014cf207fd448371a9da18675f1b9c7898f56ed
Parents: 6b97067
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Sun Aug 30 22:52:27 2015 +0200
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Sun Aug 30 22:52:27 2015 +0200

----------------------------------------------------------------------
 tomee/apache-tomee/src/main/resources/tomee.bat | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/6014cf20/tomee/apache-tomee/src/main/resources/tomee.bat
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/main/resources/tomee.bat b/tomee/apache-tomee/src/main/resources/tomee.bat
index 18f82b1..ab1bc04 100644
--- a/tomee/apache-tomee/src/main/resources/tomee.bat
+++ b/tomee/apache-tomee/src/main/resources/tomee.bat
@@ -69,6 +69,8 @@ for %%F in (%lib%/*.jar) do (
 
 if ""%1"" == ""deploy"" goto doDeploy
 if ""%1"" == ""undeploy"" goto doUndeploy
+if ""%1"" == ""start"" goto unsupportedCmd
+if ""%1"" == ""stop"" goto unsupportedCmd
 goto doExec
 
 :doDeploy
@@ -76,6 +78,10 @@ goto doExec
 "%_RUNJAVA%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" org.apache.openejb.cli.Bootstrap %1 -s http://localhost:%port%/tomee/ejb %2
 goto end
 
+:unsupportedCmd
+echo start/stop commands are not compatible with tomee.bat, please use catalina.bar/startup.bat/shutdown.bat
+goto end
+
 :doExec
 "%_RUNJAVA%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" org.apache.openejb.cli.Bootstrap %*
 goto end