Author: kkolinko
Date: Sat Jun 20 10:27:46 2009
New Revision: 786788
URL: http://svn.apache.org/viewvc?rev=786788&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.
Applied it to some other comments as well.
Modified:
tomcat/build/tc5.5.x/resources/confinstall/server_2.xml
tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml
tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml
tomcat/container/tc5.5.x/modules/storeconfig-ha/test/conf/server.xml
tomcat/container/tc5.5.x/modules/storeconfig/test/conf/server.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/build/tc5.5.x/resources/confinstall/server_2.xml
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/resources/confinstall/server_2.xml?rev=786788&r1=786787&r2=786788&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/resources/confinstall/server_2.xml (original)
+++ tomcat/build/tc5.5.x/resources/confinstall/server_2.xml Sat Jun 20 10:27:46
2009
@@ -41,7 +41,7 @@
on to the appropriate Host (virtual host). -->
<!-- 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">
-->
<!-- Define the top level container in our container hierarchy -->
Modified: tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml?rev=786788&r1=786787&r2=786788&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/etc/cluster-server.xml Sat Jun 20
10:27:46 2009
@@ -134,7 +134,7 @@
on to the appropriate Host (virtual host). -->
<!-- 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">
-->
<!-- Define the top level container in our container hierarchy -->
Modified: tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml?rev=786788&r1=786787&r2=786788&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml (original)
+++ tomcat/container/tc5.5.x/modules/ha/etc/cluster-server.xml Sat Jun 20
10:27:46 2009
@@ -134,7 +134,7 @@
on to the appropriate Host (virtual host). -->
<!-- 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">
-->
<!-- Define the top level container in our container hierarchy -->
Modified: tomcat/container/tc5.5.x/modules/storeconfig-ha/test/conf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig-ha/test/conf/server.xml?rev=786788&r1=786787&r2=786788&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig-ha/test/conf/server.xml
(original)
+++ tomcat/container/tc5.5.x/modules/storeconfig-ha/test/conf/server.xml Sat
Jun 20 10:27:46 2009
@@ -143,7 +143,7 @@
on to the appropriate Host (virtual host). -->
<!-- You should set jvmRoute to support load-balancing via AJP ie :
- <Engine name="Standalone" defaultHost="localhost" debug="0"
jvmRoute="jvm1">
+ <Engine name="Catalina" defaultHost="localhost" debug="0" jvmRoute="jvm1">
-->
<!-- Define the top level container in our container hierarchy -->
Modified: tomcat/container/tc5.5.x/modules/storeconfig/test/conf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/storeconfig/test/conf/server.xml?rev=786788&r1=786787&r2=786788&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/storeconfig/test/conf/server.xml (original)
+++ tomcat/container/tc5.5.x/modules/storeconfig/test/conf/server.xml Sat Jun
20 10:27:46 2009
@@ -143,7 +143,7 @@
on to the appropriate Host (virtual host). -->
<!-- You should set jvmRoute to support load-balancing via AJP ie :
- <Engine name="Standalone" defaultHost="localhost" debug="0"
jvmRoute="jvm1">
+ <Engine name="Catalina" defaultHost="localhost" debug="0" jvmRoute="jvm1">
-->
<!-- Define the top level container in our container hierarchy -->
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=786788&r1=786787&r2=786788&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Jun 20 10:27:46 2009
@@ -154,6 +154,10 @@
<fix>
Use a better default (webapps) for a Host's appBase. (idarwin/markt)
</fix>
+ <fix>
+ <bug>44943</bug>: Reduce copy/paste issues caused by different engine
+ names in server.xml. (markt, kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=786788&r1=786787&r2=786788&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sat Jun 20 10:27:46 2009
@@ -93,13 +93,6 @@
+0: rjung
rjung: memebrshipMutex -> membershipMutex
-* 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, fhanik, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43343
Concurrency issues with PersistentManager
http://svn.apache.org/viewvc?rev=656751&view=rev (case A fix)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
