Mailing-List: contact commits-help@ode.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ode.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sathwik@apache.org
To: commits@ode.apache.org
Date: Thu, 03 Nov 2016 07:42:10 -0000
Message-Id: <b87945c47c84443b96133726df2efabd@git.apache.org>
Subject: [1/3] ode git commit: tomee startup scripts added
archived-at: Thu, 03 Nov 2016 07:42:12 -0000

Repository: ode
Updated Branches:
  refs/heads/ode-1.3.x e268c5336 -> 31564a738


tomee startup scripts added


Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/5a91d268
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/5a91d268
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/5a91d268

Branch: refs/heads/ode-1.3.x
Commit: 5a91d268750a38150b53dcf46597aab9c166b407
Parents: e268c53
Author: sathwik <sathwik@apache.org>
Authored: Thu Nov 3 13:10:06 2016 +0530
Committer: sathwik <sathwik@apache.org>
Committed: Thu Nov 3 13:10:06 2016 +0530

----------------------------------------------------------------------
 tomee-server/src/main/server/bin/start.bat |  66 ++++++++++++++
 tomee-server/src/main/server/bin/start.sh  | 115 +++++++++++++++++++++---
 2 files changed, 168 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/5a91d268/tomee-server/src/main/server/bin/start.bat
----------------------------------------------------------------------
diff --git a/tomee-server/src/main/server/bin/start.bat b/tomee-server/src/main/server/bin/start.bat
new file mode 100644
index 0000000..b4cad16
--- /dev/null
+++ b/tomee-server/src/main/server/bin/start.bat
@@ -0,0 +1,66 @@
+@echo off
+rem
+rem    Licensed to the Apache Software Foundation (ASF) under one or more
+rem    contributor license agreements.  See the NOTICE file distributed with
+rem    this work for additional information regarding copyright ownership.
+rem    The ASF licenses this file to You under the Apache License, Version 2.0
+rem    (the "License"); you may not use this file except in compliance with
+rem    the License.  You may obtain a copy of the License at
+rem
+rem       http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem    Unless required by applicable law or agreed to in writing, software
+rem    distributed under the License is distributed on an "AS IS" BASIS,
+rem    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem    See the License for the specific language governing permissions and
+rem    limitations under the License.
+rem
+
+if not "%OS%"=="Windows_NT" goto wrongOS
+
+@setlocal
+
+set command=%0
+set progname=%~n0
+
+set ODE_SERVER_HOME=%~dp0..
+set ODE_SERVER_LIB=%~dp0..\lib
+set ODE_SERVER_CONF=%~dp0..\conf
+
+set ODE_SERVER_JAVAOPTS=%JAVA_OPTS%
+set ODE_SERVER_JAVAOPTS=%ODE_SERVER_JAVAOPTS% -Dode.server.home=%ODE_SERVER_HOME% -Dderby.syste.home=%ODE_SERVER_HOME%
+set ODE_SERVER_JAVAOPTS=%ODE_SERVER_JAVAOPTS% -Djava.naming.factory.initial=org.apache.openejb.core.LocalInitialContextFactory
+
+if "%JAVA_HOME%"=="" goto noJavaHome
+if not exist "%JAVA_HOME%"\bin\java.exe goto noJava
+
+set JAVACMD="%JAVA_HOME%\bin\java.exe"
+
+set LOCALCLASSPATH=%ODE_SERVER_CONF%;%ODE_SERVER_LIB%\*
+
+
+%JAVACMD% %ODE_SERVER_JAVAOPTS% -cp %LOCALCLASSPATH% org.apache.ode.tomee.Main
+goto end
+
+=====================================================================
+                              ERRORS
+=====================================================================
+
+
+:wrongOS
+echo ERROR: ODE requires WindowsNT/XP. Aborting.
+goto end
+
+:noJavaHome
+echo ERROR: JAVA_HOME not set! Aborting.
+goto end
+
+:noJava
+echo ERROR: The Java VM (java.exe) was not found in %JAVA_HOME%\bin! Aborting
+goto end
+
+REM ================================================================
+REM                             END
+REM ================================================================
+:end
+@endlocal
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ode/blob/5a91d268/tomee-server/src/main/server/bin/start.sh
----------------------------------------------------------------------
diff --git a/tomee-server/src/main/server/bin/start.sh b/tomee-server/src/main/server/bin/start.sh
index f3dbaef..6d4a0b6 100755
--- a/tomee-server/src/main/server/bin/start.sh
+++ b/tomee-server/src/main/server/bin/start.sh
@@ -1,23 +1,112 @@
 #!/bin/sh
+#
+#    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.
 
-PRG="$0"
+cygwin=false;
+darwin=false;
+case "`uname`" in
+    Darwin*)
+	darwin=true
+	if [ -z "$JAVA_HOME" ] ; then
+	    JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+	fi
+	;;
+    CYGWIN*)
+	cygwin=true
+	;;
+esac
 
-PRGDIR=`dirname "$PRG"`
+## Try to find our home directory
+command="$0"
+progname=`basename "$0"`
+# need this for relative symlinks
+while [ -h "$command" ] ; do
+    ls=`ls -ld "$command"`
+    link=`expr "$command" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+	command="$link"
+    else
+	command=`dirname "$command"`"/$link"
+    fi
+done
 
-ODE_SERVER_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
+ODE_SERVER_BIN=`dirname "$command"`
+ODE_SERVER_BIN=`cd "$ODE_SERVER_BIN" && pwd`
 
-JAVA_OPTS="$JAVA_OPTS \
--Dode.server.home=$ODE_SERVER_HOME \
--Djava.naming.factory.initial=org.apache.openejb.core.LocalInitialContextFactory \
--Dderby.system.home=$ODE_SERVER_HOME"
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+    [ -n "$ODE_SERVER_BIN" ] && ODE_SERVER_BIN=`cygpath --unix "$ODE_SERVER_BIN"`
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+ODE_SERVER_HOME=`cd "$ODE_SERVER_BIN/.." && pwd`
+ODE_SERVER_LIB="$ODE_SERVER_HOME/lib"
+ODE_SERVER_CONF="$ODE_SERVER_HOME/conf"
+
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD=`which java 2> /dev/null `
+    if [ -z "$JAVACMD" ] ; then
+        JAVACMD=java
+    fi
+  fi
+fi
 
-JPDA_OPTS=""
-# JPDA_OPTS="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n"
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly."
+  echo "  We cannot execute $JAVACMD"
+  exit 1
+fi
 
-CLASSPATH="$CLASSPATH":"$ODE_SERVER_HOME/conf"
+if [ ! -d "$JAVA_HOME" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly (no such directory)."
+ exit 1
+fi
 
-for i in "$ODE_SERVER_HOME/lib"/*.jar; do
-      CLASSPATH="$CLASSPATH":"$i"
+# Add user-specified classpath.
+LOCALCLASSPATH="$ODE_SERVER_CONF"
+
+# Add tomee libraries
+for f in $ODE_SERVER_LIB/*.jar
+do
+  LOCALCLASSPATH=$LOCALCLASSPATH:$f
 done
 
-java $JAVA_OPTS $JPDA_OPTS -classpath $CLASSPATH org.apache.ode.tomee.Main
\ No newline at end of file
+ODE_SERVER_JAVAOPTS="$JAVA_OPTS \
+-Dode.server.home=$ODE_SERVER_HOME \
+-Dderby.system.home=$ODE_SERVER_HOME \
+-Djava.naming.factory.initial=org.apache.openejb.core.LocalInitialContextFactory"
+
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+    ODE_SERVER_HOME=`cygpath --windows "$ODE_SERVER_HOME"`
+    JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
+    LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+    CYGHOME=`cygpath --windows "$HOME"`
+    ODE_SERVER_LIB=`cygpath --windows "$ODE_SERVER_LIB"`
+    ODE_SERVER_BIN=`cygpath --windows "$ODE_SERVER_BIN"`
+fi
+
+exec "$JAVACMD" $ODE_SERVER_JAVAOPTS -cp "$LOCALCLASSPATH" org.apache.ode.tomee.Main