- Also copy the policy file.

- server.xml tweaks.
- Remove the minimal server.xml, which isn't that helpful anymore.

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

diff --git a/build.xml b/build.xml
index b455137..d0b3022 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -450,6 +450,7 @@
        <!-- Copy static resource files -->
     <copy todir="${tomcat.build}/conf">
       <fileset dir="conf">
+        <include name="**/*.policy"/>
         <include name="**/*.xml"/>
         <include name="**/*.properties"/>
       </fileset>

diff --git a/conf/catalina.policy b/conf/catalina.policy
index f1638c2..bebf11a 100644 (file)
--- a/conf/catalina.policy
+++ b/conf/catalina.policy
@@ -40,18 +40,13 @@ grant codeBase "file:${java.home}/lib/ext/-" {
 // ========== CATALINA CODE PERMISSIONS =======================================
 
 
-// These permissions apply to the launcher code
-grant codeBase "file:${catalina.home}/bin/commons-launcher.jar" {
-        permission java.security.AllPermission;
-};
-
-// These permissions apply to the daemon code
+/ These permissions apply to the daemon code
 grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
         permission java.security.AllPermission;
 };
 
-// These permissions apply to the commons-logging API
-grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar" {
+// These permissions apply to the logging API
+grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
         permission java.security.AllPermission;
 };
 
@@ -62,16 +57,12 @@ grant codeBase "file:${catalina.home}/bin/bootstrap.jar" {
 
 // These permissions apply to the servlet API classes
 // and those that are shared across all class loaders
-// located in the "common" directory
+// located in the "lib" directory
 grant codeBase "file:${catalina.home}/lib/-" {
         permission java.security.AllPermission;
 };
 
-// The permissions granted to the balancer WEB-INF/classes and WEB-INF/lib directory
-grant codeBase "file:${catalina.home}/webapps/balancer/-" {
-        permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester";
-        permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester.*";
-};
+
 // ========== WEB APPLICATION PERMISSIONS =====================================
 
 

diff --git a/conf/server-minimal.xml b/conf/server-minimal.xml
deleted file mode 100644 (file)
index 7b542b6..0000000
--- a/conf/server-minimal.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Server port="8005" shutdown="SHUTDOWN">
-
-  <GlobalNamingResources>
-    <!-- Used by Manager webapp -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-       description="User database that can be updated and saved"
-           factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-          pathname="conf/tomcat-users.xml" />
-  </GlobalNamingResources>
-
-  <Service name="Catalina">
-    <Connector port="8080" />
-
-    <!-- This is here for compatibility only, not required -->
-    <Connector port="8009" protocol="AJP/1.3" />
-
-    <Engine name="Catalina" defaultHost="localhost">
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-             resourceName="UserDatabase" />
-      <Host name="localhost" appBase="webapps" />
-    </Engine>
-    
-  </Service>
-</Server>

diff --git a/conf/server.xml b/conf/server.xml
index bd2d989..72640dd 100644 (file)
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -1,4 +1,3 @@
-<!-- Example Server Configuration File -->
 <!-- Note:  A "Server" is not itself a "Container", so you may not
      define subcomponents such as "Valves" at this level.
      Documentation at /docs/config/server.html
@@ -12,14 +11,11 @@
   <!-- 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" />
-  <!--<Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>-->
 
   <!-- Global JNDI resources
        Documentation at /docs/jndi-resources-howto.html
   -->
   <GlobalNamingResources>
-    <!-- Test entry for demonstration purposes -->
-    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
     <!-- Editable user database that can also be used by
          UserDatabaseRealm to authenticate users
     -->
@@ -44,7 +40,8 @@
          APR (HTTP/AJP) Connector: /docs/apr.html
          Define a non-SSL HTTP/1.1 Connector on port 8080
     -->
-    <Connector port="8080" maxThreads="150" connectionTimeout="20000" 
+    <Connector port="8080" protocol="HTTP/1.1" 
+               maxThreads="150" connectionTimeout="20000" 
                redirectPort="8443" />
 
     <!-- Define a SSL HTTP/1.1 Connector on port 8443
@@ -52,7 +49,8 @@
          connector should be using the OpenSSL style configuration
          described in the APR documentation -->
     <!--
-    <Connector port="8443" maxThreads="150" scheme="https" secure="true"
+    <Connector port="8443" protocol="HTTP/1.1" 
+               maxThreads="150" scheme="https" secure="true"
                clientAuth="false" sslProtocol="TLS" />
     -->
 
@@ -108,7 +106,7 @@
         <!-- Access log processes all example.
              Documentation at: /docs/config/valve.html -->
         <!--
-        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"  
+        <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" directory="logs"  
                prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
         -->
 

diff --git a/webapps/docs/security-manager-howto.xml b/webapps/docs/security-manager-howto.xml
index 6447b57..a3005fa 100644 (file)
--- a/webapps/docs/security-manager-howto.xml
+++ b/webapps/docs/security-manager-howto.xml
@@ -217,12 +217,6 @@ grant codeBase "file:${catalina.home}/lib/-" {
         permission java.security.AllPermission;
 };
 
-// The permissions granted to the balancer WEB-INF/classes and WEB-INF/lib directory
-grant codeBase "file:${catalina.home}/webapps/balancer/-" {
-        permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester";
-        permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester.*";
-};
-
 
 // ========== WEB APPLICATION PERMISSIONS =====================================