geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed un-compatible server.xml file problem for Zen.

Browse Source
This commit is contained in:
Juan Carlos Luciani 2007-06-27 16:14:56 +00:00
parent 3f35a10763
commit 8534eb060f
2 changed files with 36 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
CASA-auth-token/server-java/Svc/tomcat5/conf/linux/zen/server.xml
View File

@ -1,5 +1,6 @@
<!-- CASA ATS Server Configuration File --> <!-- 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, <!-- A "Server" is a singleton element that represents the entire JVM,
which may contain one or more "Service" instances. The Server which may contain one or more "Service" instances. The Server
listens for a shutdown command on the indicated port. 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 Note: A "Server" is not itself a "Container", so you may not
define subcomponents such as "Valves" or "Loggers" at this level. define subcomponents such as "Valves" or "Loggers" at this level.
--> -->
<Server port="8585" shutdown="SHUTDOWN">
<Server port="8585" shutdown="SHUTDOWN" debug="0">
<!-- Global JNDI resources --> <!-- Global JNDI resources -->
@ -19,20 +19,7 @@
<!-- Editable user database that can also be used by <!-- Editable user database that can also be used by
UserDatabaseRealm to authenticate users --> UserDatabaseRealm to authenticate users -->
<Resource name="UserDatabase" auth="Container" <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"/>
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> </GlobalNamingResources>
@ -74,25 +61,25 @@
IP address of the remote client. 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. <!-- Note : To use gzip compression you could set the following properties :
These tools expect that the connectors be surrounded by comments containing
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 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 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. --> do not modify these comments to avoid conflicting with the configuration tools. -->
<!-- Define a SSL Coyote HTTP/1.1 Connector on port 2645 --> <!-- Define a SSL Coyote HTTP/1.1 Connector on port 2645 -->
<!-- SSL_CONNECTOR_BEGIN --> <!-- SSL_CONNECTOR_BEGIN -->
<Connector port="2645" <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"/>
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" />
<!-- SSL_CONNECTOR_END --> <!-- SSL_CONNECTOR_END -->
<!-- Define an AJP Connector --> <!-- Define an AJP Connector -->
@ -105,12 +92,12 @@
analyzes the HTTP headers included with the request, and passes them analyzes the HTTP headers included with the request, and passes them
on to the appropriate Host (virtual host). --> on to the appropriate Host (virtual host). -->
<!-- You should set jvmRoute to support load-balancing via JK/JK2 ie : <!-- You should set jvmRoute to support load-balancing via AJP ie :
<Engine name="Standalone" defaultHost="localhost" debug="0" jvmRoute="jvm1"> <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">
--> -->
<!-- Define the top level container in our container hierarchy --> <!-- 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 dumper valve dumps useful debugging information about
the request headers and cookies that were received, and the response the request headers and cookies that were received, and the response
@ -130,26 +117,18 @@
<Valve className="org.apache.catalina.valves.RequestDumperValve"/> <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 --> <!-- Because this Realm is here, an instance will be shared globally -->
<!-- This Realm uses the UserDatabase configured in the global JNDI <!-- This Realm uses the UserDatabase configured in the global JNDI
resources under the key "UserDatabase". Any edits resources under the key "UserDatabase". Any edits
that are performed against this UserDatabase are immediately that are performed against this UserDatabase are immediately
available for use by the Realm. --> available for use by the Realm. -->
<Realm className="org.apache.catalina.realm.UserDatabaseRealm" <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase"/>
debug="0" resourceName="UserDatabase"/>
<!-- Define the default virtual host <!-- Define the default virtual host
Note: XML Schema validation will not work with Xerces 2.2. Note: XML Schema validation will not work with Xerces 2.2.
--> -->
<Host name="localhost" debug="0" appBase="webapps" <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false">
unpackWARs="true" autoDeploy="true"
xmlValidation="false" xmlNamespaceAware="false">
<!-- Access log processes all requests for this virtual host. By <!-- Access log processes all requests for this virtual host. By
default, log files are created in the "logs" directory relative to default, log files are created in the "logs" directory relative to
@ -163,15 +142,19 @@
pattern="common" resolveHosts="false"/> pattern="common" resolveHosts="false"/>
--> -->
<!-- Logger shared by all Contexts related to this virtual host. By <!-- Access log processes all requests for this virtual host. By
default (when using FileLogger), log files are created in the "logs" default, log files are created in the "logs" directory relative to
directory relative to $CATALINA_HOME. If you wish, you can specify $CATALINA_HOME. If you wish, you can specify a different
a different directory with the "directory" attribute. Specify either a directory with the "directory" attribute. Specify either a relative
relative (to $CATALINA_HOME) or absolute path to the desired (to $CATALINA_HOME) or absolute path to the desired directory.
directory.--> This access log implementation is optimized for maximum performance,
<Logger className="org.apache.catalina.logger.FileLogger" but is hardcoded to support only the "common" and "combined" patterns.
directory="logs" prefix="localhost_log" suffix=".txt" -->
timestamp="false"/> <!--
<Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
directory="logs" prefix="localhost_access_log." suffix=".txt"
pattern="common" resolveHosts="false"/>
-->
</Host> </Host>
@ -180,4 +163,3 @@
</Service> </Service>
</Server> </Server>

2
CASA-auth-token/server-java/package/linux/CASA_auth_token_svc_4zen.spec.in
View File

@ -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/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-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-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/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/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 install -m 600 Svc/tomcat5/conf/web.xml %{buildroot}/srv/www/casaats/conf/web.xml