tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r377093 - /tomcat/container/branches/tc4.1.x/catalina/src/conf/server-noexamples.xml.config
Date Sun, 12 Feb 2006 00:06:08 GMT
Author: markt
Date: Sat Feb 11 16:06:06 2006
New Revision: 377093

URL: http://svn.apache.org/viewcvs?rev=377093&view=rev
Log:
Align no-examples config with standard config

Modified:
    tomcat/container/branches/tc4.1.x/catalina/src/conf/server-noexamples.xml.config

Modified: tomcat/container/branches/tc4.1.x/catalina/src/conf/server-noexamples.xml.config
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/conf/server-noexamples.xml.config?rev=377093&r1=377092&r2=377093&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/conf/server-noexamples.xml.config (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/conf/server-noexamples.xml.config Sat Feb
11 16:06:06 2006
@@ -13,12 +13,41 @@
 <Server port="8005" shutdown="SHUTDOWN" debug="0">
 
 
-  <!-- Uncomment this entry to enable JMX MBeans support -->
+  <!-- Uncomment these entries to enable JMX MBeans support -->
+  <!-- You may also configure custom components (e.g. Valves/Realms) by
+       including your own mbean-descriptor file(s), and setting the
+       "descriptors" attribute to point to a ';' seperated list of paths
+       (in the ClassLoader sense) of files to add to the default list.
+       e.g. descriptors="/com/myfirm/mypackage/mbean-descriptor.xml"
+  -->
 <!--
   <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
-                debug="0" port="-1" login="admin" password="admin"/>
+            debug="0"/>
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"
+            debug="0"/>
 -->
 
+  <!-- Global JNDI resources -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+       description="User database that can be updated and saved">
+    </Resource>
+    <ResourceParams name="UserDatabase">
+      <parameter>
+        <name>factory</name>
+        <value>org.apache.catalina.users.MemoryUserDatabaseFactory</value>
+      </parameter>
+      <parameter>
+        <name>pathname</name>
+        <value>conf/tomcat-users.xml</value>
+      </parameter>
+    </ResourceParams>
+
+  </GlobalNamingResources>
+
 
   <!-- A "Service" is a collection of one or more "Connectors" that share
        a single "Container" (and therefore the web applications visible
@@ -96,21 +125,29 @@
                acceptCount="10" debug="0"/>
     -->
 
-    <!-- Define a Proxied HTTP/1.1 Connector on port 8081 -->
+    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
     <!-- See proxy documentation for more information about using this. -->
     <!--
     <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
-               port="8081" minProcessors="5" maxProcessors="75"
+               port="8082" minProcessors="5" maxProcessors="75"
                enableLookups="true"
                acceptCount="100" debug="0" connectionTimeout="20000"
                proxyPort="80" useURIValidationHack="false"
                disableUploadTimeout="true" />
     -->
 
-    <!-- Define a non-SSL HTTP/1.0 Test Connector on port 8082 -->
+    <!-- Define a non-SSL legacy HTTP/1.1 Test Connector on port 8083 -->
+    <!--
+    <Connector className="org.apache.catalina.connector.http.HttpConnector"
+               port="8083" minProcessors="5" maxProcessors="75"
+               enableLookups="true" redirectPort="8443"
+               acceptCount="10" debug="0" />
+    -->
+
+    <!-- Define a non-SSL HTTP/1.0 Test Connector on port 8084 -->
     <!--
     <Connector className="org.apache.catalina.connector.http10.HttpConnector"
-               port="8082" minProcessors="5" maxProcessors="75"
+               port="8084" minProcessors="5" maxProcessors="75"
                enableLookups="true" redirectPort="8443"
                acceptCount="10" debug="0"/>
     -->
@@ -120,6 +157,10 @@
          analyzes the HTTP headers included with the request, and passes them
          on to the appropriate Host (virtual host). -->
 
+    <!-- You should set jvmRoute to support load-balancing via JK/JK2 ie :
+    <Engine name="Standalone" defaultHost="localhost" debug="0" jvmRoute="jvm1">
+    -->
+
     <!-- Define the top level container in our container hierarchy -->
     <Engine name="Standalone" defaultHost="localhost" debug="0">
 
@@ -148,7 +189,18 @@
 
       <!-- Because this Realm is here, an instance will be shared globally -->
 
+      <!-- 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
+           available for use by the Realm.  -->
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+                 debug="0" resourceName="UserDatabase"/>
+
+      <!-- Comment out the old realm but leave here for now in case we
+           need to go back quickly -->
+      <!--
       <Realm className="org.apache.catalina.realm.MemoryRealm" />
+      -->
 
       <!-- Replace the above Realm with one of the following to get a Realm
            stored in a database and accessed via JDBC -->
@@ -225,48 +277,6 @@
         -->
 
       </Host>
-
-    </Engine>
-
-  </Service>
-
-  <!-- The MOD_WEBAPP connector is used to connect Apache 1.3 with Tomcat 4.0
-       as its servlet container. Please read the README.txt file coming with
-       the WebApp Module distribution on how to build it.
-       (Or check out the "jakarta-tomcat-connectors/webapp" CVS repository)
-
-       To configure the Apache side, you must ensure that you have the
-       "ServerName" and "Port" directives defined in "httpd.conf".  Then,
-       lines like these to the bottom of your "httpd.conf" file:
-
-         LoadModule webapp_module libexec/mod_webapp.so
-         WebAppConnection warpConnection warp localhost:8008
-         WebAppDeploy examples warpConnection /examples/
-
-       The next time you restart Apache (after restarting Tomcat, if needed)
-       the connection will be established, and all applications you make
-       visible via "WebAppDeploy" directives can be accessed through Apache.
-  -->
-
-  <!-- Define an Apache-Connector Service -->
-  <Service name="Tomcat-Apache">
-
-    <Connector className="org.apache.catalina.connector.warp.WarpConnector"
-     port="8008" minProcessors="5" maxProcessors="75"
-     enableLookups="true"
-     acceptCount="10" debug="0"/>
-
-    <!-- Replace "localhost" with what your Apache "ServerName" is set to -->
-    <Engine className="org.apache.catalina.connector.warp.WarpEngine"
-     name="Apache" debug="0" appBase="webapps">
-
-      <!-- Global logger unless overridden at lower levels -->
-      <Logger className="org.apache.catalina.logger.FileLogger"
-              prefix="apache_log." suffix=".txt"
-              timestamp="true"/>
-
-      <!-- Because this Realm is here, an instance will be shared globally -->
-      <Realm className="org.apache.catalina.realm.MemoryRealm" />
 
     </Engine>
 



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


Mime
View raw message