Sync Windows installer config files with 'normal' versions

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@946148 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/confinstall/server_1.xml b/res/confinstall/server_1.xml
index 3661018..974883e 100644 (file)
--- a/res/confinstall/server_1.xml
+++ b/res/confinstall/server_1.xml
@@ -27,8 +27,6 @@
   <Listener className="org.apache.catalina.core.JasperListener" />
   <!-- Prevent memory leaks due to use of particular java/javax APIs-->
   <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-  <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
-  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
 
   <!-- Global JNDI resources

diff --git a/res/confinstall/server_2.xml b/res/confinstall/server_2.xml
index e070cea..0d8b92f 100644 (file)
--- a/res/confinstall/server_2.xml
+++ b/res/confinstall/server_2.xml
@@ -40,13 +40,6 @@
       <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
       -->        
 
-      <!-- The request dumper valve dumps useful debugging information about
-           the request and response data received and sent by Tomcat.
-           Documentation at: /docs/config/valve.html -->
-      <!--
-      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
-      -->
-
       <!-- This Realm uses the UserDatabase configured in the global JNDI
            resources under the key "UserDatabase".  Any edits
            that are performed against this UserDatabase are immediately
@@ -58,8 +51,7 @@
            Note: XML Schema validation will not work with Xerces 2.2.
        -->
       <Host name="localhost"  appBase="webapps"
-            unpackWARs="true" autoDeploy="true"
-            xmlValidation="false" xmlNamespaceAware="false">
+            unpackWARs="true" autoDeploy="true">
 
         <!-- SingleSignOn valve, share authentication between web applications
              Documentation at: /docs/config/valve.html -->

diff --git a/res/confinstall/tomcat-users_2.xml b/res/confinstall/tomcat-users_2.xml
index 452c172..8251027 100644 (file)
--- a/res/confinstall/tomcat-users_2.xml
+++ b/res/confinstall/tomcat-users_2.xml
@@ -1,4 +1,9 @@
 <!--
+  NOTE:  By default, no user is included in the "manager-gui" role required
+  to operate the "/manager/html" web application.  If you wish to use this app,
+  you must define such a user - the username and password are arbitrary.
+-->
+<!--
   NOTE:  The sample user and role entries below are wrapped in a comment
   and thus are ignored when reading this file. Do not forget to remove
   <!.. ..> that surrounds them.