Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1617362 - in /tomcat/trunk: bin/setclasspath.bat
 bin/setclasspath.sh webapps/docs/changelog.xml
Date: Mon, 11 Aug 2014 21:29:47 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
Message-Id: <20140811212948.1116823888D2@eris.apache.org>

Author: markt
Date: Mon Aug 11 21:29:47 2014
New Revision: 1617362

URL: http://svn.apache.org/r1617362
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56829
Add the ability for users to define their own values for _RUNJAVA and _RUNJBD. Based on a patch by Neeme Praks.

Modified:
    tomcat/trunk/bin/setclasspath.bat
    tomcat/trunk/bin/setclasspath.sh
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/bin/setclasspath.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=1617362&r1=1617361&r2=1617362&view=diff
==============================================================================
--- tomcat/trunk/bin/setclasspath.bat (original)
+++ tomcat/trunk/bin/setclasspath.bat Mon Aug 11 21:29:47 2014
@@ -71,11 +71,18 @@ rem Set the default -Djava.endorsed.dirs
 set "JAVA_ENDORSED_DIRS=%CATALINA_HOME%\endorsed"
 :gotEndorseddir
 
+rem Don't override _RUNJAVA if the user has set it previously
+if not "%_RUNJAVA%" == "" goto gotRunJava
 rem Set standard command for invoking Java.
 rem Note that NT requires a window name argument when using start.
 rem Also note the quoting as JAVA_HOME may contain spaces.
 set _RUNJAVA="%JRE_HOME%\bin\java"
+:gotRunJava
+
+rem Don't override _RUNJDB if the user has set it previously
+if not "%_RUNJAVA%" == "" goto gotRunJdb
 set _RUNJDB="%JAVA_HOME%\bin\jdb"
+:gotRunJdb
 
 goto end
 

Modified: tomcat/trunk/bin/setclasspath.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=1617362&r1=1617361&r2=1617362&view=diff
==============================================================================
--- tomcat/trunk/bin/setclasspath.sh (original)
+++ tomcat/trunk/bin/setclasspath.sh Mon Aug 11 21:29:47 2014
@@ -83,8 +83,12 @@ if [ -z "$JAVA_ENDORSED_DIRS" ]; then
   JAVA_ENDORSED_DIRS="$CATALINA_HOME"/endorsed
 fi
 
-# Set standard commands for invoking Java.
-_RUNJAVA="$JRE_HOME"/bin/java
-if [ "$os400" != "true" ]; then
-  _RUNJDB="$JAVA_HOME"/bin/jdb
+# Set standard commands for invoking Java, if not already set.
+if [ -z "$_RUNJAVA" ]; then
+  _RUNJAVA="$JRE_HOME"/bin/java
 fi
+if [ "$os400" != "true" ]; then
+  if [ -z "$_RUNJDB" ]; then
+    _RUNJDB="$JAVA_HOME"/bin/jdb
+  fi
+fi
\ No newline at end of file

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1617362&r1=1617361&r2=1617362&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Aug 11 21:29:47 2014
@@ -209,6 +209,11 @@
         applications when installed via the Windows installer package. Patch
         provided by Alexandre Garnier. (markt)
       </add>
+      <add>
+        <bug>56829</bug>: Add the ability for users to define their own values
+        for <code>_RUNJAVA</code> and <code>_RUNJBD</code>. Based on a patch by
+        Neeme Praks. (markt)
+      </add>
     </changelog>
   </subsection>
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org