X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fmodules%2Forg.argeo.server.tomcat%2Fconf%2Fserver.xml;h=b138b46a5ddf2aa56e55ef47d8f757d471283c8f;hb=15d66f3c17c025e40f833a7164aa34fe69ae9fad;hp=507e0febd7f97ac2163378f94fd3e3b98f2b0a18;hpb=e93a2022d143fbb0ff91af11ad1b7206966a3d3e;p=lgpl%2Fargeo-commons.git

diff --git a/server/modules/org.argeo.server.tomcat/conf/server.xml b/server/modules/org.argeo.server.tomcat/conf/server.xml
index 507e0febd..b138b46a5 100644
--- a/server/modules/org.argeo.server.tomcat/conf/server.xml
+++ b/server/modules/org.argeo.server.tomcat/conf/server.xml
@@ -1,151 +1,41 @@
 <?xml version='1.0' encoding='utf-8'?>
-	<!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to You under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-		applicable law or agreed to in writing, software distributed under the
-		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-		CONDITIONS OF ANY KIND, either express or implied. See the License for
-		the specific language governing permissions and limitations under the
-		License.
-	-->
-	<!--
-		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
-	-->
 <Server port="8005" shutdown="SHUTDOWN">
-
 	<!--APR library loader. Documentation at /docs/apr.html -->
-	<Listener className="org.apache.catalina.core.AprLifecycleListener"
-		SSLEngine="on" />
-	<!--
-		Initialize Jasper prior to webapps are loaded. Documentation at
-		/docs/jasper-howto.html
-	-->
+	<!-- <Listener className="org.apache.catalina.core.AprLifecycleListener" 
+		SSLEngine="on" /> -->
+	<!-- Initialize Jasper prior to webapps are loaded. -->
 	<Listener className="org.apache.catalina.core.JasperListener" />
-	<!--
-		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" />
+	<!-- JMX -->
+	<!-- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" 
+		/> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" 
+		/> -->
 
-
-	<!--
-		A "Service" is a collection of one or more "Connectors" that share a
-		single "Container" Note: A "Service" is not itself a "Container", so
-		you may not define subcomponents such as "Valves" at this level.
-		Documentation at /docs/config/service.html
-	-->
 	<Service name="Catalina">
+		<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+			maxThreads="150" minSpareThreads="4" />
+
+		<!-- HTTP -->
+		<Connector executor="tomcatThreadPool" port="${argeo.server.port.http}"
+			protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="${argeo.server.port.https}"
+			secure="${argeo.server.http.secure}" proxyName="${argeo.server.http.proxyName}"
+			proxyPort="${argeo.server.http.proxyPort}" />
+		<!-- HTTPS
+		<Connector port="${argeo.server.port.https}" protocol="HTTP/1.1"
+			SSLEnabled="true" scheme="https" secure="true" sslProtocol="TLS"
+			keystoreFile="${argeo.server.keystoreFile}" keystoreType="JKS"
+			keystorePass="${argeo.server.keystorePass}" truststoreFile="${argeo.server.truststoreFile}"
+			truststoreType="JKS" truststorePass="${argeo.server.truststorePass}"
+			clientAuth="${argeo.server.https.clientAuth}" />
+			 -->
+		<!-- AJP (for proxying with httpd) -->
+		<Connector port="${argeo.server.port.ajp}" protocol="AJP/1.3"
+			redirectPort="${argeo.server.port.https}" />
 
-		<!--
-			The connectors can use a shared executor, you can define one or more
-			named thread pools
-		-->
-		<!--
-			<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
-			maxThreads="150" minSpareThreads="4"/>
-		-->
-
-
-		<!--
-			A "Connector" represents an endpoint by which requests are received
-			and responses are returned. Documentation at : Java HTTP Connector:
-			/docs/config/http.html (blocking & non-blocking) Java AJP Connector:
-			/docs/config/ajp.html APR (HTTP/AJP) Connector: /docs/apr.html Define
-			a non-SSL HTTP/1.1 Connector on port 8080
-		-->
-		<Connector port="${server.port.http}" protocol="HTTP/1.1"
-			connectionTimeout="20000" redirectPort="${server.port.https}" />
-		<!-- A "Connector" using the shared thread pool-->
-		<!--
-			<Connector executor="tomcatThreadPool" port="8080"
-			protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" />
-		-->
-		<!--
-			Define a SSL HTTP/1.1 Connector on port 8443 This connector uses the
-			JSSE configuration, when using APR, the connector should be using the
-			OpenSSL style configuration described in the APR documentation
-		-->
-		<!--
-			<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
-			maxThreads="150" scheme="https" secure="true" clientAuth="false"
-			sslProtocol="TLS" />
-		-->
-
-		<!-- Define an AJP 1.3 Connector on port 8009 -->
-		<Connector port="${server.port.ajp}" protocol="AJP/1.3"
-			redirectPort="${server.port.https}" />
-
-
-		<!--
-			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
-			on to the appropriate Host (virtual host). Documentation at
-			/docs/config/engine.html
-		-->
-
-		<!--
-			You should set jvmRoute to support load-balancing via AJP ie :
-			<Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-		-->
 		<Engine name="Catalina" defaultHost="localhost">
-
-			<!--
-				For clustering, please take a look at documentation at:
-				/docs/cluster-howto.html (simple how to) /docs/config/cluster.html
-				(reference documentation)
-			-->
-			<!--
-				<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-			-->
-
-			<!--
-				The request dumper valve dumps useful debugging information about
-				the request and response data received and sent by Tomcat.
-				Documentation at: /docs/config/valve.html
-			-->
-			<!--
-				<Valve className="org.apache.catalina.valves.RequestDumperValve"/>
-			-->
-
-
-			<!--
-				Define the default virtual host Note: XML Schema validation will not
-				work with Xerces 2.2.
-			-->
 			<Host name="localhost" appBase="webapps" unpackWARs="true"
 				autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"
-				workDir="${slc.osgi.dataDir}/tomcat/work">
-
-				<!--
-					SingleSignOn valve, share authentication between web applications
-					Documentation at: /docs/config/valve.html
-				-->
-				<!--
-					<Valve className="org.apache.catalina.authenticator.SingleSignOn"
-					/>
-				-->
-
-				<!--
-					Access log processes all example. Documentation at:
-					/docs/config/valve.html
-				-->
-				<!--
-					<Valve className="org.apache.catalina.valves.AccessLogValve"
-					directory="logs" prefix="localhost_access_log." suffix=".txt"
-					pattern="common" resolveHosts="false"/>
-				-->
-
+				workDir="work">
 			</Host>
 		</Engine>
 	</Service>
-</Server>
+</Server>
\ No newline at end of file