RSCH

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@99 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 36 insertions, 22 deletions

diff --git a/id.server/data/deploy/tomcat/server.xml b/id.server/data/deploy/tomcat/server.xml
index c99136fa2..2fd7b6439 100644
--- a/id.server/data/deploy/tomcat/server.xml
+++ b/id.server/data/deploy/tomcat/server.xml
@@ -50,18 +50,22 @@
          IP address of the remote client.
     -->
 		<!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->
-		<Connector className="org.apache.coyote.tomcat4.CoyoteConnector" port="8080" minProcessors="5" maxProcessors="75" enableLookups="true" redirectPort="8443" acceptCount="100" debug="0" connectionTimeout="20000" useURIValidationHack="false" disableUploadTimeout="true"/>
-		<!-- Note : To disable connection timeouts, set connectionTimeout value 
-     to -1 -->
+		<Connector className="org.apache.coyote.tomcat4.CoyoteConnector" 
+			port="8080" minProcessors="5" maxProcessors="75" 
+			enableLookups="true" redirectPort="8443" acceptCount="100" 
+			debug="0" connectionTimeout="20000" useURIValidationHack="false" 
+			disableUploadTimeout="true"/>
+		<!-- Note : To disable connection timeouts, set connectionTimeout value to -1 -->
 		<!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
-    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
-               port="8443" minProcessors="5" maxProcessors="75"
-               enableLookups="uri"
-	       acceptCount="100" debug="0" scheme="https" secure="true"
-               useURIValidationHack="false" disableUploadTimeout="true">
-      <Factory className="org.apache.coyote.tomcat4.CoyoteServerSocketFactory"
-               clientAuth="false" protocol="TLS"/>
-    </Connector>
+		<Connector className="org.apache.coyote.tomcat4.CoyoteConnector" 
+			port="8443" minProcessors="5" maxProcessors="75" 
+			enableLookups="uri" acceptCount="100" debug="0" scheme="https" 
+			secure="true" useURIValidationHack="false" 
+			disableUploadTimeout="true">
+			<Factory 
+				className="org.apache.coyote.tomcat4.CoyoteServerSocketFactory" 
+				clientAuth="false" protocol="TLS"/>
+		</Connector>
 		<!-- An Engine represents the entry point (within Catalina) that processes
          every request.  The Engine implementation for Tomcat stand alone
          analyzes the HTTP headers included with the request, and passes them
@@ -83,14 +87,16 @@
            Request dumping is disabled by default.  Uncomment the following
            element to enable it. -->
 			<!--
-      <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="true"/>
+			<Logger className="org.apache.catalina.logger.FileLogger" 
+				prefix="catalina_log." suffix=".txt" timestamp="true"/>
 			<!-- Because this Realm is here, an instance will be shared globally -->
 			<Realm className="org.apache.catalina.realm.MemoryRealm"/>
 			<!-- Define the default virtual host -->
-			<Host name="localhost" debug="0" appBase="webapps" unpackWARs="true" autoDeploy="true">
+			<Host name="localhost" debug="0" appBase="webapps" 
+				unpackWARs="true" autoDeploy="true">
 				<!-- Normally, users must authenticate themselves to each web app
              individually.  Uncomment the following entry if you would like
              a user to be authenticated the first time they encounter a
@@ -107,19 +113,23 @@
              directory with the "directory" attribute.  Specify either a relative
              (to $CATALINA_HOME) or absolute path to the desired directory.
         -->
-				<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" prefix="localhost_access_log." suffix=".txt" pattern="common"/>
+				<Valve className="org.apache.catalina.valves.AccessLogValve" 
+					directory="logs" prefix="localhost_access_log." 
+					suffix=".txt" pattern="common"/>
 				<!-- 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="true"/>
+				<Logger className="org.apache.catalina.logger.FileLogger" 
+					directory="logs" prefix="localhost_log." suffix=".txt" 
+					timestamp="true"/>
 				<!-- Define properties for each web application.  This is only needed
              if you want to set non-default properties, or have web application
              document roots in places other than the virtual host's appBase
              directory.  -->
-	<!-- Tomcat Root Context -->
+				<!-- Tomcat Root Context -->
 				<!--
           <Context path="" docBase="../moa-id-proxy.war" debug="0"/>
         -->
@@ -145,13 +155,17 @@
   -->
 	<!-- 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"/>
+		<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">
+		<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"/>
+			<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>
 	</Service>
-</Server>
+</Server>
\ No newline at end of file