Author: kkolinko
Date: Thu Jun 11 12:29:46 2009
New Revision: 783737
URL: http://svn.apache.org/viewvc?rev=783737&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44943
Reduce copy/paste issues caused by different engine names.
Applying the same fix to exe installations of Tomcat.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 11 12:29:46 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,777464,777466,77
7576,777625,778379,781528,782145,782791
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,777464,77
7466,777576,777625,778379,781528,782145,782791
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=783737&r1=783736&r2=783737&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jun 11 12:29:46 2009
@@ -88,13 +88,6 @@
-0: kkolinko: http://marc.info/?l=tomcat-dev&m=124192105131636&w=2
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44943
- For zip/tgz distributives it was already fixed in 6.0.17, 5.5.27.
- Now, apply the same fix to exe distributive.
- http://svn.apache.org/viewvc?rev=776945&view=rev
- +1: kkolinko, markt,funkman
- -1:
-
* Add missing svn properties
http://people.apache.org/~rjung/patches/tc6-svnprops.patch
+1: rjung, fhanik, markt,funkman
Modified: tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml?rev=783737&r1=783736&r2=783737&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml (original)
+++ tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml Thu Jun 11 12:29:46 2009
@@ -29,7 +29,7 @@
Documentation at /docs/config/engine.html -->
<!-- You should set jvmRoute to support load-balancing via AJP ie :
- <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-->
<Engine name="Catalina" defaultHost="localhost">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=783737&r1=783736&r2=783737&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jun 11 12:29:46 2009
@@ -83,6 +83,10 @@
name. This corrects a regression introduced by the fix for
<bug>42707</bug>. (markt)
</fix>
+ <fix>
+ <bug>44943</bug>: Use the same engine name in server.xml comments to
+ reduce copy and pastes issues. (markt, kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
