From 8534eb060fa19adbc6d0df5e849f4eafc1396d24 Mon Sep 17 00:00:00 2001
From: Juan Carlos Luciani <jluciani@novell.com>
Date: Wed, 27 Jun 2007 16:14:56 +0000
Subject: [PATCH] Fixed un-compatible server.xml file problem for Zen.

---
 .../Svc/tomcat5/conf/linux/zen/server.xml     | 88 ++++++++-----------
 .../linux/CASA_auth_token_svc_4zen.spec.in    |  2 +-
 2 files changed, 36 insertions(+), 54 deletions(-)

diff --git a/CASA-auth-token/server-java/Svc/tomcat5/conf/linux/zen/server.xml b/CASA-auth-token/server-java/Svc/tomcat5/conf/linux/zen/server.xml
index dcce8ce2..457eceba 100644
--- a/CASA-auth-token/server-java/Svc/tomcat5/conf/linux/zen/server.xml
+++ b/CASA-auth-token/server-java/Svc/tomcat5/conf/linux/zen/server.xml
@@ -1,5 +1,6 @@
 <!-- CASA ATS Server Configuration File -->
-
+<!-- Note that component elements are nested corresponding to their
+     parent-child relationships with each other -->
 <!-- A "Server" is a singleton element that represents the entire JVM,
      which may contain one or more "Service" instances.  The Server
      listens for a shutdown command on the indicated port.
@@ -7,8 +8,7 @@
      Note:  A "Server" is not itself a "Container", so you may not
      define subcomponents such as "Valves" or "Loggers" at this level.
  -->
-
-<Server port="8585" shutdown="SHUTDOWN" debug="0">
+<Server port="8585" shutdown="SHUTDOWN">
 
 
   <!-- Global JNDI resources -->
@@ -19,20 +19,7 @@
 
     <!-- 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>
+    <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>
 
@@ -74,25 +61,25 @@
          IP address of the remote client.
     -->
 
-    <!-- Note : To disable connection timeouts, set connectionTimeout value
-     to 0 -->
 	
-      <!-- Important Note : The ATS uses configuration tools to enable and disable  connectors.
-            These tools expect that the connectors be surrounded by  comments containing
+	<!-- Note : To use gzip compression you could set the following properties :
+	
+			   compression="on" 
+			   compressionMinSize="2048" 
+			   noCompressionUserAgents="gozilla, traviata" 
+			   compressableMimeType="text/html,text/xml"
+	-->
+
+     <!-- Important Note : The ATS uses configuration tools to enable and disable  connectors.
+           These tools expect that the connectors be surrounded by  comments containing
             XX_CONNECTOR_YYY or XXX_CONNECTOR_COMMENT_YYY  where XXX refers
             to the type of connector (SSL or AJP) and YYY refers to either BEGIN  or END.  Please
             do not modify these comments to avoid conflicting with the configuration tools.  -->
 
+
     <!-- Define a SSL Coyote HTTP/1.1 Connector on port 2645 -->
     <!-- SSL_CONNECTOR_BEGIN -->
-    <Connector port="2645" 
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" disableUploadTimeout="true"
-               maxPostSize="16384" connectionTimeout="10000"
-               acceptCount="100" debug="0" scheme="https" secure="true"
-               clientAuth="false" sslProtocol="TLS"
-               keystoreFile="/etc/CASA/authtoken/keys/server/jks-store"
-               keystorePass="secret" algorithm="SunX509" />
+    <Connector port="2645" maxThreads="150" minSpareThreads="25" maxSpareThreads="75" enableLookups="false" disableUploadTimeout="true" acceptCount="100" debug="0" scheme="https" secure="true" clientAuth="false" sslProtocol="TLS" keystoreFile="/etc/CASA/authtoken/keys/server/jks-store" keystorePass="secret" algorithm="SunX509"/>
     <!-- SSL_CONNECTOR_END -->
 
     <!-- Define an AJP Connector -->
@@ -105,12 +92,12 @@
          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">         
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">         
     --> 
          
     <!-- Define the top level container in our container hierarchy -->
-    <Engine name="Catalina" defaultHost="localhost" debug="0">
+    <Engine name="Catalina" defaultHost="localhost">
 
       <!-- The request dumper valve dumps useful debugging information about
            the request headers and cookies that were received, and the response
@@ -130,26 +117,18 @@
       <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
       -->
 
-      <!-- Global logger unless overridden at lower levels -->
-      <Logger className="org.apache.catalina.logger.FileLogger"
-              prefix="catalina_log" suffix=".txt"
-              timestamp="false"/>
-
       <!-- 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"/>
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase"/>
 
       <!-- Define the default virtual host
            Note: XML Schema validation will not work with Xerces 2.2.
        -->
-      <Host name="localhost" debug="0" appBase="webapps"
-       unpackWARs="true" autoDeploy="true"
-       xmlValidation="false" xmlNamespaceAware="false">
+      <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false">
 
         <!-- Access log processes all requests for this virtual host.  By
              default, log files are created in the "logs" directory relative to
@@ -163,15 +142,19 @@
                  pattern="common" resolveHosts="false"/>
         -->
 
-        <!-- Logger shared by all Contexts related to this virtual host.  By
-             default (when using FileLogger), log files are created in the "logs"
-             directory relative to $CATALINA_HOME.  If you wish, you can specify
-             a different directory with the "directory" attribute.  Specify either a
-             relative (to $CATALINA_HOME) or absolute path to the desired
-             directory.-->
-        <Logger className="org.apache.catalina.logger.FileLogger"
-                 directory="logs"  prefix="localhost_log" suffix=".txt"
-            timestamp="false"/>
+        <!-- Access log processes all requests for this virtual host.  By
+             default, log files are created in the "logs" directory relative to
+             $CATALINA_HOME.  If you wish, you can specify a different
+             directory with the "directory" attribute.  Specify either a relative
+             (to $CATALINA_HOME) or absolute path to the desired directory.
+             This access log implementation is optimized for maximum performance,
+             but is hardcoded to support only the "common" and "combined" patterns.
+        -->
+        <!--
+        <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common" resolveHosts="false"/>
+        -->
 
       </Host>
 
@@ -179,5 +162,4 @@
 
   </Service>
 
-</Server>
-
+</Server>
\ No newline at end of file
diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc_4zen.spec.in b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc_4zen.spec.in
index cc7bafe4..c36dd358 100644
--- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc_4zen.spec.in
+++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc_4zen.spec.in
@@ -191,7 +191,7 @@ install -m 600 Svc/tomcat5/conf/catalina.properties %{buildroot}/srv/www/casaats
 install -m 600 Svc/tomcat5/conf/jk2.properties %{buildroot}/srv/www/casaats/conf/jk2.properties
 install -m 600 Svc/tomcat5/conf/linux/server-ibm.xml %{buildroot}/srv/www/casaats/conf/server-ibm.xml
 install -m 600 Svc/tomcat5/conf/linux/server-pkcs12-ibm.xml %{buildroot}/srv/www/casaats/conf/server-pkcs12-ibm.xml
-install -m 600 Svc/tomcat5/conf/linux/server-sun.xml %{buildroot}/srv/www/casaats/conf/server-sun.xml
+install -m 600 Svc/tomcat5/conf/linux/zen/server.xml %{buildroot}/srv/www/casaats/conf/server-sun.xml
 install -m 600 Svc/tomcat5/conf/linux/server-pkcs12-sun.xml %{buildroot}/srv/www/casaats/conf/server-pkcs12-sun.xml
 install -m 600 Svc/tomcat5/conf/tomcat-users.xml %{buildroot}/srv/www/casaats/conf/tomcat-users.xml
 install -m 600 Svc/tomcat5/conf/web.xml %{buildroot}/srv/www/casaats/conf/web.xml