Author: jim
Date: Fri Sep 16 17:15:54 2011
New Revision: 1171681
URL: http://svn.apache.org/viewvc?rev=1171681&view=rev
Log:
* Align jpda settings with catalina.sh, tc6.0.x, tc7.0.x and trunk
http://people.apache.org/~markt/patches/2011-08-25-jpda-tc5.patch
+1: markt, kkolinko, jim
-1:
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.bat
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1171681&r1=1171680&r2=1171681&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Sep 16 17:15:54 2011
@@ -24,11 +24,6 @@ $Id$
PATCHES ACCEPTED TO BACKPORT FROM TRUNK/OTHER:
[ start all new proposals below, under PATCHES PROPOSED. ]
-* Align jpda settings with catalina.sh, tc6.0.x, tc7.0.x and trunk
- http://people.apache.org/~markt/patches/2011-08-25-jpda-tc5.patch
- +1: markt, kkolinko, jim
- -1:
-
* Update Tomcat-Native to 1.1.22
s/tomcat-native.version=1.1.20/tomcat-native.version=1.1.22/
in build/build.properties.default
Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.bat?rev=1171681&r1=1171680&r2=1171681&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.bat (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/catalina.bat Fri Sep 16
17:15:54 2011
@@ -43,10 +43,10 @@ rem JAVA_OPTS (Optional) Java ru
rem "stop", or "run" command is executed.
rem
rem JPDA_TRANSPORT (Optional) JPDA transport used when the "jpda start"
-rem command is executed. The default is "dt_shmem".
+rem command is executed. The default is "dt_socket".
rem
rem JPDA_ADDRESS (Optional) Java runtime options used when the "jpda
start"
-rem command is executed. The default is "jdbconn".
+rem command is executed. The default is "8000".
rem
rem JPDA_SUSPEND (Optional) Java runtime options used when the "jpda
start"
rem command is executed. Specifies whether JVM should suspend
@@ -143,10 +143,10 @@ set JPDA=
if not ""%1"" == ""jpda"" goto noJpda
set JPDA=jpda
if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport
-set JPDA_TRANSPORT=dt_shmem
+set JPDA_TRANSPORT=dt_socket
:gotJpdaTransport
if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
-set JPDA_ADDRESS=jdbconn
+set JPDA_ADDRESS=8000
:gotJpdaAddress
if not "%JPDA_SUSPEND%" == "" goto gotJpdaSuspend
set JPDA_SUSPEND=n
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1171681&r1=1171680&r2=1171681&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Sep 16
17:15:54 2011
@@ -43,6 +43,9 @@
<subsection name="General">
<changelog>
<fix>
+ Align jpda settings with catalina.sh, tc6.0.x, tc7.0.x and trunk
+ </fix>
+ <fix>
<bug>51550</bug>: Display error page rather than an empty response for
an IllegalStateException
</fix>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
