svn commit: r1238759 - in /incubator/oozie/trunk: distro/src/main/bin/oozie-sys.sh distro/src/main/bin/oozied.sh distro/src/main/tomcat/server.xml release-log.txt

[tu...@apache.org]

Author: tucu
Date: Tue Jan 31 19:32:21 2012
New Revision: 1238759

URL: http://svn.apache.org/viewvc?rev=1238759&view=rev
Log:
OOZIE-666 Oozie's Tomcat admin port is hardcoded (tucu)

Modified:
    incubator/oozie/trunk/distro/src/main/bin/oozie-sys.sh
    incubator/oozie/trunk/distro/src/main/bin/oozied.sh
    incubator/oozie/trunk/distro/src/main/tomcat/server.xml
    incubator/oozie/trunk/release-log.txt

Modified: incubator/oozie/trunk/distro/src/main/bin/oozie-sys.sh
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/distro/src/main/bin/oozie-sys.sh?rev=1238759&r1=1238758&r2=1238759&view=diff
==============================================================================
--- incubator/oozie/trunk/distro/src/main/bin/oozie-sys.sh (original)
+++ incubator/oozie/trunk/distro/src/main/bin/oozie-sys.sh Tue Jan 31 19:32:21 2012
@@ -174,6 +174,13 @@ else
   print "Using   OOZIE_HTTP_PORT:     ${OOZIE_HTTP_PORT}"
 fi
 
+if [ "${OOZIE_ADMIN_PORT}" = "" ]; then
+  export OOZIE_ADMIN_PORT=`expr $OOZIE_HTTP_PORT +  1`
+  print "Setting OOZIE_ADMIN_PORT:     ${OOZIE_ADMIN_PORT}"
+else
+  print "Using   OOZIE_ADMIN_PORT:     ${OOZIE_ADMIN_PORT}"
+fi
+
 if [ "${OOZIE_BASE_URL}" = "" ]; then
   export OOZIE_BASE_URL="http://${OOZIE_HTTP_HOSTNAME}:${OOZIE_HTTP_PORT}/oozie"
   print "Setting OOZIE_BASE_URL:      ${OOZIE_BASE_URL}"

Modified: incubator/oozie/trunk/distro/src/main/bin/oozied.sh
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/distro/src/main/bin/oozied.sh?rev=1238759&r1=1238758&r2=1238759&view=diff
==============================================================================
--- incubator/oozie/trunk/distro/src/main/bin/oozied.sh (original)
+++ incubator/oozie/trunk/distro/src/main/bin/oozied.sh Tue Jan 31 19:32:21 2012
@@ -62,6 +62,7 @@ setup_catalina_opts() {
   catalina_opts="${catalina_opts} -Doozie.log4j.reload=${OOZIE_LOG4J_RELOAD}";
 
   catalina_opts="${catalina_opts} -Doozie.http.hostname=${OOZIE_HTTP_HOSTNAME}";
+  catalina_opts="${catalina_opts} -Doozie.admin.port=${OOZIE_ADMIN_PORT}";
   catalina_opts="${catalina_opts} -Doozie.http.port=${OOZIE_HTTP_PORT}";
   catalina_opts="${catalina_opts} -Doozie.base.url=${OOZIE_BASE_URL}";
 
@@ -88,6 +89,11 @@ case $actionCmd in
     $CATALINA $actionCmd "$@"
     ;;
   (stop)
+    setup_catalina_opts
+
+    # A bug in catalina.sh script does not use CATALINA_OPTS for stopping the server
+    export JAVA_OPTS=${CATALINA_OPTS}
+
     $CATALINA $actionCmd "$@"
     ;;
 esac

Modified: incubator/oozie/trunk/distro/src/main/tomcat/server.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/distro/src/main/tomcat/server.xml?rev=1238759&r1=1238758&r2=1238759&view=diff
==============================================================================
--- incubator/oozie/trunk/distro/src/main/tomcat/server.xml (original)
+++ incubator/oozie/trunk/distro/src/main/tomcat/server.xml Tue Jan 31 19:32:21 2012
@@ -20,7 +20,7 @@
      define subcomponents such as "Valves" at this level.
      Documentation at /docs/config/server.html
  -->
-<Server port="8005" shutdown="SHUTDOWN">
+<Server port="${oozie.admin.port}" shutdown="SHUTDOWN">
 
   <!--APR library loader. Documentation at /docs/apr.html -->
   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1238759&r1=1238758&r2=1238759&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Tue Jan 31 19:32:21 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.2.0 release
 
+OOZIE-666 Oozie's Tomcat admin port is hardcoded. (tucu)
 OOZIE-662 Unit test failing: TestHostnameFilter. (tucu)
 OOZIE-651: Coordinator rerun fails due to NPE in some cases.(Virag via Mohammad)
 OOZIE-655: Information added to Oozie help.(Virag via Mohammad)