X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.catalina.start%2Fsrc%2Fmain%2Fresources%2Fconf%2Fdefault-server.xml;fp=server%2Fruntime%2Forg.argeo.server.catalina.start%2Fsrc%2Fmain%2Fresources%2Fconf%2Fdefault-server.xml;h=a558e134e6b3e54be5d9e7bdd7bce8e3585b4504;hb=6d06f51b7468bf8fcfd63447bfcf77b9d4268fa9;hp=c8cd5bb7b7278828f673feb271922e0407548440;hpb=15d66f3c17c025e40f833a7164aa34fe69ae9fad;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server.xml b/server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server.xml
index c8cd5bb7b..a558e134e 100644
--- a/server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server.xml
+++ b/server/runtime/org.argeo.server.catalina.start/src/main/resources/conf/default-server.xml
@@ -1,16 +1,41 @@
-<Server port="8005" shutdown="SHUTDOWN">
-
-
-	<Service name="Catalina">
-		<Connector port="8080" />
-
-		<Engine name="Catalina" defaultHost="localhost">
-			<Host name="localhost" unpackWARs="false" autoDeploy="false"
-				liveDeploy="false" deployOnStartup="false" xmlValidation="false"
-				xmlNamespaceAware="false">
-			</Host>
-		</Engine>
-
-
-	</Service>
-</Server>
+<?xml version='1.0' encoding='utf-8'?>
+<Server port="-1" 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. -->
+	<Listener className="org.apache.catalina.core.JasperListener" />
+	<!-- JMX -->
+	<!-- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" 
+		/> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" 
+		/> -->
+
+	<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}" />
+
+		<Engine name="Catalina" defaultHost="localhost">
+			<Host name="localhost" appBase="webapps" unpackWARs="true"
+				autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"
+				workDir="work">
+			</Host>
+		</Engine>
+	</Service>
+</Server>
\ No newline at end of file