Author: markt
Date: Sun Sep 10 18:29:22 2006
New Revision: 442061
URL: http://svn.apache.org/viewvc?view=rev&rev=442061
Log:
Revert accidental commit. Sorry for the noise.
Modified:
tomcat/container/tc5.5.x/catalina/src/conf/server.xml
tomcat/container/tc5.5.x/catalina/src/conf/tomcat-users.xml
Modified: tomcat/container/tc5.5.x/catalina/src/conf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/conf/server.xml?view=diff&rev=442061&r1=442060&r2=442061
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/conf/server.xml (original)
+++ tomcat/container/tc5.5.x/catalina/src/conf/server.xml Sun Sep 10 18:29:22
2006
@@ -90,11 +90,13 @@
-->
<!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
+ <!--
<Connector port="8443" maxHttpHeaderSize="8192"
maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
enableLookups="false" disableUploadTimeout="true"
acceptCount="100" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS"
keystoreFile="./conf/.localhost" />
+ clientAuth="false" sslProtocol="TLS" />
+ -->
<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009"
@@ -145,14 +147,14 @@
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"
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 -->
@@ -181,17 +183,6 @@
connectionURL="jdbc:odbc:CATALINA"
userTable="users" userNameCol="user_name" userCredCol="user_pass"
userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JNDIRealm"
- connectionURL="ldap://services.dev.local:389";
- connectionName="cn=Manager,dc=dev,dc=local"
- connectionPassword="secret"
- userPattern="cn={0},ou=people,dc=dev,dc=local"
- roleBase="ou=groups,dc=dev,dc=local"
- roleName="cn"
- roleSearch="(uniqueMember={0})" />
-->
<!-- Define the default virtual host
Modified: tomcat/container/tc5.5.x/catalina/src/conf/tomcat-users.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/conf/tomcat-users.xml?view=diff&rev=442061&r1=442060&r2=442061
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/conf/tomcat-users.xml (original)
+++ tomcat/container/tc5.5.x/catalina/src/conf/tomcat-users.xml Sun Sep 10
18:29:22 2006
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?>
+<!--
+ NOTE: By default, no user is included in the "manager" role required
+ to operate the "/manager" web application. If you wish to use this app,
+ you must define such a user - the username and password are arbitrary.
+-->
<tomcat-users>
- <role rolename="tomcat"/>
- <role rolename="role1"/>
- <role rolename="manager"/>
- <role rolename="admin"/>
- <user username="tomcat" password="tomcat" roles="tomcat"/>
- <user username="role1" password="tomcat" roles="role1"/>
- <user username="both" password="tomcat" roles="tomcat,role1,manager,admin"/>
+ <user name="tomcat" password="tomcat" roles="tomcat" />
+ <user name="role1" password="tomcat" roles="role1" />
+ <user name="both" password="tomcat" roles="tomcat,role1" />
</tomcat-users>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
