From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 11 Dec 2012 10:56:21 +0000 (+0000)
Subject: Make Tomcat much easier to configure.
X-Git-Tag: argeo-commons-2.1.30~704
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=6d06f51b7468bf8fcfd63447bfcf77b9d4268fa9;p=lgpl%2Fargeo-commons.git

Make Tomcat much easier to configure.

git-svn-id: https://svn.argeo.org/commons/trunk@5951 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/demo/argeo_node_rcp.properties b/demo/argeo_node_rcp.properties
index df2da86e6..a2e7105a2 100644
--- a/demo/argeo_node_rcp.properties
+++ b/demo/argeo_node_rcp.properties
@@ -3,7 +3,7 @@ org.springframework.osgi.extender,\
 org.argeo.node.repo.jackrabbit,\
 org.argeo.security.dao.os,\
 
-#org.argeo.dep.osgi.catalina.start,\
+#org.argeo.server.catalina.start,\
 #org.springframework.osgi.web.extender,\
 #org.argeo.jackrabbit.webapp,\
 
diff --git a/demo/argeo_node_web.properties b/demo/argeo_node_web.properties
index 02bb77564..1d8ad752f 100644
--- a/demo/argeo_node_web.properties
+++ b/demo/argeo_node_web.properties
@@ -9,7 +9,7 @@ org.argeo.security.dao.ldap,\
 argeo.osgi.start.4.node=\
 org.argeo.jackrabbit.webapp,\
 org.argeo.server.rap.webapp,\
-org.argeo.dep.osgi.catalina.start,\
+org.argeo.server.catalina.start,\
 org.eclipse.equinox.http.registry,\
 org.springframework.osgi.web.extender,\
 
@@ -18,6 +18,7 @@ org.springframework.osgi.web.extender,\
 #org.argeo.security.ui.initialPerspective=org.argeo.jcr.ui.explorer.perspective
 
 log4j.configuration=file:../../log4j.properties
+argeo.server.tomcat.config=file:../../tomcat-server-ssl.xml
 
 argeo.i18n.availableLocales=en,fr,de,ru,ar
 eclipse.registry.MultiLanguage=true
diff --git a/demo/tomcat-server-ssl.xml b/demo/tomcat-server-ssl.xml
new file mode 100644
index 000000000..0417b7c9c
--- /dev/null
+++ b/demo/tomcat-server-ssl.xml
@@ -0,0 +1,41 @@
+<?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
diff --git a/pom.xml b/pom.xml
index b0a237e6a..3b54e6091 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,27 @@ limitations under the License.
 				<version>2.2</version>
 			</extension>
 		</extensions>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>plugin.xml</include>
+					<include>META-INF/**</include>
+					<include>WEB-INF/**</include>
+					<include>icons/**</include>
+					<include>branding/**</include>
+					<include>*.properties</include>
+					<include>properties/*.properties</include>
+					<include>p2.inf</include>
+				</includes>
+				<excludes>
+					<exclude>build.properties</exclude>
+				</excludes>
+			</resource>
+		</resources>
 		<pluginManagement>
 			<plugins>
 				<!-- Maven -->
@@ -341,27 +362,6 @@ limitations under the License.
 				</plugin>
 			</plugins>
 		</pluginManagement>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>plugin.xml</include>
-					<include>META-INF/**</include>
-					<include>WEB-INF/**</include>
-					<include>icons/**</include>
-					<include>branding/**</include>
-					<include>*.properties</include>
-					<include>properties/*.properties</include>
-					<include>p2.inf</include>
-				</includes>
-				<excludes>
-					<exclude>build.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index f0d26e550..88950f74f 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -217,13 +217,6 @@
 			<version>1.1.9-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Default Tomcat conf -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.tomcat</artifactId>
-			<version>1.1.9-SNAPSHOT</version>
-		</dependency>
-
 		<!-- DB drivers -->
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index 5d5b393f7..54dd542df 100644
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons.server</groupId>
@@ -24,11 +26,11 @@
 			<artifactId>org.argeo.server.catalina</artifactId>
 			<version>1.1.9-SNAPSHOT</version>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.commons.server</groupId> -->
-<!-- 			<artifactId>org.argeo.server.tomcat</artifactId> -->
-<!-- 			<version>0.3.1-SNAPSHOT</version> -->
-<!-- 		</dependency> -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.catalina.start</artifactId>
+			<version>1.1.9-SNAPSHOT</version>
+		</dependency>
 
 		<!-- JEE -->
 		<dependency>
@@ -71,10 +73,6 @@
 		</dependency>
 
 		<!-- Tomcat -->
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.apache.coyote</artifactId>
@@ -98,14 +96,14 @@
 			<artifactId>org.apache.xmlcommons</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
-						<!-- OSGi test -->
-				<dependency>
-					<groupId>org.argeo.commons.base</groupId>
-					<artifactId>org.argeo.osgi.boot</artifactId>
-					<version>1.1.9-SNAPSHOT</version>
-					<scope>test</scope>
-				</dependency>
-		
+
+		<!-- OSGi test -->
+		<dependency>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>1.1.9-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.tomcat/pom.xml b/server/modules/org.argeo.server.tomcat/pom.xml
index c8b285e04..7b458b3f0 100644
--- a/server/modules/org.argeo.server.tomcat/pom.xml
+++ b/server/modules/org.argeo.server.tomcat/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons.server</groupId>
@@ -16,7 +17,7 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
 					<instructions>
-						<Fragment-Host>org.argeo.dep.osgi.catalina.start</Fragment-Host>
+						<Fragment-Host>org.argeo.catalina.start</Fragment-Host>
 					</instructions>
 				</configuration>
 			</plugin>
diff --git a/server/modules/pom.xml b/server/modules/pom.xml
index 27fd306a6..c6a4c1fb0 100644
--- a/server/modules/pom.xml
+++ b/server/modules/pom.xml
@@ -21,7 +21,7 @@
 		<module>org.argeo.server.catalina</module>
 		<module>org.argeo.server.jdbc</module>
 		<module>org.argeo.server.rap.webapp</module>
-		<module>org.argeo.server.tomcat</module>
+<!-- 		<module>org.argeo.server.tomcat</module> -->
 	</modules>
 	<build>
 		<resources>
diff --git a/server/runtime/org.argeo.server.catalina.start/META-INF/MANIFEST.MF b/server/runtime/org.argeo.server.catalina.start/META-INF/MANIFEST.MF
index 2b322c770..bea8a29cb 100644
--- a/server/runtime/org.argeo.server.catalina.start/META-INF/MANIFEST.MF
+++ b/server/runtime/org.argeo.server.catalina.start/META-INF/MANIFEST.MF
@@ -1,18 +1,26 @@
-Bundle-Activator: org.argeo.dep.osgi.catalina.start.CatalinaActivator
-Created-By: Argeo
-Import-Package: javax.management;resolution:=optional,
- org.apache.catalina,
- org.apache.catalina.connector,
- org.apache.catalina.core,
- org.apache.catalina.startup,
- org.apache.catalina.util,
- org.apache.commons.io,
- org.apache.commons.logging;resolution:=optional,
- org.apache.naming.resources,
- org.osgi.framework;version="1.3",
- org.osgi.service.url;version="1.0"
-Bundle-Version: 1.0.0.0009
-Bundle-Name: Tomcat Catalina OSGi Activator (Argeo)
-Bundle-Description: Tomcat Catalina OSGi Activator with Argeo addons
-Bundle-SymbolicName: org.argeo.dep.osgi.catalina.start
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0
+Bnd-LastModified: 1355222632573
+Build-Jdk: 1.6.0_24
+Built-By: mbaudier
+Bundle-Activator: org.argeo.catalina.start.CatalinaActivator
+Bundle-Description: Catalina starter hacked from Spring DM sandbox
+Bundle-DocURL: http://www.argeo.org
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: Commons Catalina starter
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-SymbolicName: org.argeo.server.catalina.start
+Bundle-Vendor: Argeo
+Bundle-Version: 1.1.9.SNAPSHOT-r121211_1143
+Created-By: Apache Maven Bundle Plugin
+Export-Package: org.argeo.catalina.start;uses:="org.osgi.framework,org.a
+ pache.commons.io";version="1.1.9.SNAPSHOT-r121211_1143"
+Import-Package: javax.management;version="0.0.0",org.apache.catalina;ver
+ sion="[6.0,7)",org.apache.catalina.connector;version="[6.0,7)",org.apac
+ he.catalina.core;version="[6.0,7)",org.apache.catalina.startup;version=
+ "[6.0,7)",org.apache.catalina.util;version="[6.0,7)",org.apache.commons
+ .io;version="[1.4,2)",org.apache.commons.logging;version="[1.1,2)",org.
+ apache.naming.resources;version="[6.0,7)",org.osgi.framework;version="[
+ 1.5,2)",org.osgi.service.url;version="[1.0,2)"
+SLC-GroupId: org.argeo.commons.server
+Tool: Bnd-1.50.0
diff --git a/server/runtime/org.argeo.server.catalina.start/pom.xml b/server/runtime/org.argeo.server.catalina.start/pom.xml
index 7a405ebba..9e6cf2ad1 100644
--- a/server/runtime/org.argeo.server.catalina.start/pom.xml
+++ b/server/runtime/org.argeo.server.catalina.start/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.commons.server</groupId>
 		<version>1.1.9-SNAPSHOT</version>
-		<artifactId>modules</artifactId>
+		<artifactId>runtime</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.server.catalina.start</artifactId>
@@ -17,7 +17,11 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
 					<instructions>
-						<Bundle-Activator>org.argeo.dep.osgi.catalina.start.CatalinaActivator</Bundle-Activator>
+						<Bundle-Activator>org.argeo.catalina.start.CatalinaActivator</Bundle-Activator>
+						<Import-Package>
+							javax.management;version="0.0.0",
+							*
+						</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -25,7 +29,7 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
+			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
 		</dependency>
 		<dependency>
diff --git a/server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/catalina/start/CatalinaActivator.java b/server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/catalina/start/CatalinaActivator.java
new file mode 100644
index 000000000..2656490fd
--- /dev/null
+++ b/server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/catalina/start/CatalinaActivator.java
@@ -0,0 +1,93 @@
+package org.argeo.catalina.start;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Properties;
+
+import org.apache.commons.io.IOUtils;
+import org.osgi.framework.BundleContext;
+import org.springframework.osgi.web.tomcat.internal.Activator;
+
+/** Starts Catalina (hacked from Spring OSGi 1.0) */
+public class CatalinaActivator extends Activator {
+	private final static String ARGEO_OSGI_DATA_DIR = "argeo.osgi.data.dir";
+	/** System properties used to override Tomcat XML config URL */
+	public final static String ARGEO_SERVER_TOMCAT_CONFIG = "argeo.server.tomcat.config";
+
+	public void start(BundleContext context) throws Exception {
+		if (!System.getProperties().containsKey(ARGEO_OSGI_DATA_DIR)) {
+			String osgiInstanceArea = System.getProperty("osgi.instance.area");
+			String osgiInstanceAreaDefault = System
+					.getProperty("osgi.instance.area.default");
+			String tempDir = System.getProperty("java.io.tmpdir");
+
+			File dataDir = null;
+			if (osgiInstanceArea != null) {
+				// within OSGi with -data specified
+				osgiInstanceArea = removeFilePrefix(osgiInstanceArea);
+				dataDir = new File(osgiInstanceArea);
+			} else if (osgiInstanceAreaDefault != null) {
+				// within OSGi without -data specified
+				osgiInstanceAreaDefault = removeFilePrefix(osgiInstanceAreaDefault);
+				dataDir = new File(osgiInstanceAreaDefault);
+			} else {// outside OSGi
+				dataDir = new File(tempDir + File.separator + "osgiData");
+			}
+
+			System.setProperty(ARGEO_OSGI_DATA_DIR, dataDir.getAbsolutePath());
+		}
+
+		// Load config properties and put them in system properties so that they
+		// can be used in tomcat conf
+		Properties confProps = new Properties();
+		URL propsUrl = context.getBundle().getResource("tomcat.properties");
+		if (propsUrl != null) {
+			InputStream in = null;
+			try {
+				in = propsUrl.openStream();
+				confProps.load(in);
+			} catch (Exception e) {
+				throw new RuntimeException("Cannot read catalina properties.",
+						e);
+			} finally {
+				IOUtils.closeQuietly(in);
+			}
+
+			for (Object key : confProps.keySet()) {
+				// System properties have priority
+				if (!System.getProperties().containsKey(key)) {
+					System.setProperty(key.toString(),
+							confProps.getProperty(key.toString()));
+				}
+			}
+		}
+
+		// calling Catalina.setCatalinaHome(String) or
+		// Catalina.setCatalinaBase(String) does the same
+		if (System.getProperty("catalina.home") == null)
+			System.setProperty("catalina.home",
+					System.getProperty(ARGEO_OSGI_DATA_DIR) + "/tomcat");
+		if (System.getProperty("catalina.base") == null)
+			System.setProperty("catalina.base",
+					System.getProperty(ARGEO_OSGI_DATA_DIR) + "/tomcat");
+
+		// Call Spring starter
+		super.start(context);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+	}
+
+	protected String removeFilePrefix(String url) {
+		if (url.startsWith("file:"))
+			return url.substring("file:".length());
+		else if (url.startsWith("reference:file:"))
+			return url.substring("reference:file:".length());
+		else
+			return url;
+	}
+
+}
diff --git a/server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/dep/osgi/catalina/start/CatalinaActivator.java b/server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/dep/osgi/catalina/start/CatalinaActivator.java
deleted file mode 100644
index 5c1df1acd..000000000
--- a/server/runtime/org.argeo.server.catalina.start/src/main/java/org/argeo/dep/osgi/catalina/start/CatalinaActivator.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.argeo.dep.osgi.catalina.start;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
-
-import org.apache.commons.io.IOUtils;
-import org.osgi.framework.BundleContext;
-import org.springframework.osgi.web.tomcat.internal.Activator;
-
-/** Starts Catalina (hacked from Spring OSGi 1.0) */
-public class CatalinaActivator extends Activator {
-	private final static String ARGEO_OSGI_DATA_DIR = "argeo.osgi.data.dir";
-
-	public void start(BundleContext context) throws Exception {
-		if (!System.getProperties().containsKey(ARGEO_OSGI_DATA_DIR)) {
-			String osgiInstanceArea = System.getProperty("osgi.instance.area");
-			String osgiInstanceAreaDefault = System
-					.getProperty("osgi.instance.area.default");
-			String tempDir = System.getProperty("java.io.tmpdir");
-
-			File dataDir = null;
-			if (osgiInstanceArea != null) {
-				// within OSGi with -data specified
-				osgiInstanceArea = removeFilePrefix(osgiInstanceArea);
-				dataDir = new File(osgiInstanceArea);
-			} else if (osgiInstanceAreaDefault != null) {
-				// within OSGi without -data specified
-				osgiInstanceAreaDefault = removeFilePrefix(osgiInstanceAreaDefault);
-				dataDir = new File(osgiInstanceAreaDefault);
-			} else {// outside OSGi
-				dataDir = new File(tempDir + File.separator + "osgiData");
-			}
-
-			System.setProperty(ARGEO_OSGI_DATA_DIR, dataDir.getAbsolutePath());
-		}
-
-		// Load config properties and put them in system properties so that they
-		// can be used in tomcat conf
-		Properties confProps = new Properties();
-		URL propsUrl = context.getBundle().getResource("tomcat.properties");
-		if (propsUrl != null) {
-			InputStream in = null;
-			try {
-				in = propsUrl.openStream();
-				confProps.load(in);
-			} catch (Exception e) {
-				throw new RuntimeException("Cannot read catalina properties.",
-						e);
-			} finally {
-				IOUtils.closeQuietly(in);
-			}
-
-			for (Object key : confProps.keySet()) {
-				// System properties have priority
-				if (!System.getProperties().containsKey(key)) {
-					System.setProperty(key.toString(),
-							confProps.getProperty(key.toString()));
-				}
-			}
-		}
-
-		// calling Catalina.setCatalinaHome(String) or
-		// Catalina.setCatalinaBase(String) does the same
-		if (System.getProperty("catalina.home") == null)
-			System.setProperty("catalina.home",
-					System.getProperty(ARGEO_OSGI_DATA_DIR) + "/tomcat");
-		if (System.getProperty("catalina.base") == null)
-			System.setProperty("catalina.base",
-					System.getProperty(ARGEO_OSGI_DATA_DIR) + "/tomcat");
-
-		// Call Spring starter
-		super.start(context);
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-
-	protected String removeFilePrefix(String url) {
-		if (url.startsWith("file:"))
-			return url.substring("file:".length());
-		else if (url.startsWith("reference:file:"))
-			return url.substring("reference:file:".length());
-		else
-			return url;
-	}
-
-}
diff --git a/server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/Activator.java b/server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/Activator.java
index 70284fe18..9481f3158 100644
--- a/server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/Activator.java
+++ b/server/runtime/org.argeo.server.catalina.start/src/main/java/org/springframework/osgi/web/tomcat/internal/Activator.java
@@ -36,6 +36,7 @@ import org.apache.catalina.util.ServerInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.naming.resources.DirContextURLStreamHandler;
+import org.argeo.catalina.start.CatalinaActivator;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -49,9 +50,10 @@ import org.osgi.service.url.URLStreamHandlerService;
  * Simple activator for starting Apache Tomcat Catalina container inside OSGi
  * using Tomcat's XML configuration files.
  * 
- * <p/> This activator looks initially for a <code>conf/server.xml</code> file
- * falling back to <code>conf/default-server.xml</code>. This allows the
- * default configuration to be tweaked through fragments for example.
+ * <p/>
+ * This activator looks initially for a <code>conf/server.xml</code> file
+ * falling back to <code>conf/default-server.xml</code>. This allows the default
+ * configuration to be tweaked through fragments for example.
  * 
  * @author Costin Leau
  */
@@ -74,7 +76,6 @@ public class Activator implements BundleActivator {
 
 	private Thread startupThread;
 
-
 	public void start(BundleContext context) throws Exception {
 		this.bundleContext = context;
 		// do the initialization on a different thread
@@ -99,22 +100,22 @@ public class Activator implements BundleActivator {
 					Connector[] connectors = server.findConnectors();
 					for (int i = 0; i < connectors.length; i++) {
 						Connector conn = connectors[i];
-						log.info("Succesfully started " + ServerInfo.getServerInfo() + " @ " + conn.getDomain() + ":"
-								+ conn.getPort());
+						log.info("Succesfully started "
+								+ ServerInfo.getServerInfo() + " @ "
+								+ conn.getDomain() + ":" + conn.getPort());
 					}
 
 					// register URL service
 					urlRegistration = registerTomcatJNDIUrlService();
 					// publish server as an OSGi service
 					registration = publishServerAsAService(server);
-					log.info("Published " + ServerInfo.getServerInfo() + " as an OSGi service");
-				}
-				catch (Exception ex) {
+					log.info("Published " + ServerInfo.getServerInfo()
+							+ " as an OSGi service");
+				} catch (Exception ex) {
 					String msg = "Cannot start " + ServerInfo.getServerInfo();
 					log.error(msg, ex);
 					throw new RuntimeException(msg, ex);
-				}
-				finally {
+				} finally {
 					current.setContextClassLoader(old);
 				}
 			}
@@ -137,29 +138,33 @@ public class Activator implements BundleActivator {
 
 		try {
 			current.setContextClassLoader(cl);
-			//reset CCL 
+			// reset CCL
 			// current.setContextClassLoader(null);
 			log.info("Stopping " + ServerInfo.getServerInfo() + " ...");
 			server.stop();
 			log.info("Succesfully stopped " + ServerInfo.getServerInfo());
-		}
-		catch (Exception ex) {
+		} catch (Exception ex) {
 			log.error("Cannot stop " + ServerInfo.getServerInfo(), ex);
 			throw ex;
-		}
-		finally {
+		} finally {
 			current.setContextClassLoader(old);
 		}
 	}
 
-	private StandardService createCatalinaServer(Bundle bundle) throws Exception {
-		// first try to use the XML file
-		URL xmlConfiguration = bundle.getResource(XML_CONF_LOCATION);
+	private StandardService createCatalinaServer(Bundle bundle)
+			throws Exception {
+		URL xmlConfiguration = null;
+
+		if (System.getProperty(CatalinaActivator.ARGEO_SERVER_TOMCAT_CONFIG) != null)
+			xmlConfiguration = new URL(
+					System.getProperty(CatalinaActivator.ARGEO_SERVER_TOMCAT_CONFIG));
+		else
+			// fragment
+			xmlConfiguration = bundle.getResource(XML_CONF_LOCATION);
 
 		if (xmlConfiguration != null) {
 			log.info("Using custom XML configuration " + xmlConfiguration);
-		}
-		else {
+		} else {
 			xmlConfiguration = bundle.getResource(DEFAULT_XML_CONF_LOCATION);
 			if (xmlConfiguration == null)
 				log.error("No XML configuration found; bailing out...");
@@ -170,20 +175,25 @@ public class Activator implements BundleActivator {
 		return createServerFromXML(xmlConfiguration);
 	}
 
-	private StandardService createServerFromXML(URL xmlConfiguration) throws IOException {
+	private StandardService createServerFromXML(URL xmlConfiguration)
+			throws IOException {
 		OsgiCatalina catalina = new OsgiCatalina();
 		catalina.setAwait(false);
 		catalina.setUseShutdownHook(false);
 		catalina.setName("Catalina");
-		catalina.setParentClassLoader(Thread.currentThread().getContextClassLoader());
+		catalina.setParentClassLoader(Thread.currentThread()
+				.getContextClassLoader());
 
-		// copy the URL file to a local temporary file (since Catalina doesn't use URL unfortunately)
+		// copy the URL file to a local temporary file (since Catalina doesn't
+		// use URL unfortunately)
 		File configTempFile = File.createTempFile("dm.catalina", ".cfg.xml");
 		configTempFile.deleteOnExit();
 
 		// copy URL to temporary file
-		copyURLToFile(xmlConfiguration.openStream(), new FileOutputStream(configTempFile));
-		log.debug("Copied configuration " + xmlConfiguration + " to temporary file " + configTempFile);
+		copyURLToFile(xmlConfiguration.openStream(), new FileOutputStream(
+				configTempFile));
+		log.debug("Copied configuration " + xmlConfiguration
+				+ " to temporary file " + configTempFile);
 
 		catalina.setConfigFile(configTempFile.getAbsolutePath());
 
@@ -202,20 +212,17 @@ public class Activator implements BundleActivator {
 			while ((bytesRead = inStream.read(buf)) >= 0) {
 				outStream.write(buf, 0, bytesRead);
 			}
-		}
-		catch (IOException ex) {
-			throw (RuntimeException) new IllegalStateException("Cannot copy URL to file").initCause(ex);
-		}
-		finally {
+		} catch (IOException ex) {
+			throw (RuntimeException) new IllegalStateException(
+					"Cannot copy URL to file").initCause(ex);
+		} finally {
 			try {
 				inStream.close();
-			}
-			catch (IOException ignore) {
+			} catch (IOException ignore) {
 			}
 			try {
 				outStream.close();
-			}
-			catch (IOException ignore) {
+			} catch (IOException ignore) {
 			}
 		}
 	}
@@ -226,14 +233,17 @@ public class Activator implements BundleActivator {
 		props.put(Constants.SERVICE_VENDOR, "Spring Dynamic Modules");
 		props.put(Constants.SERVICE_DESCRIPTION, ServerInfo.getServerInfo());
 		props.put(Constants.BUNDLE_VERSION, ServerInfo.getServerNumber());
-		props.put(Constants.BUNDLE_NAME, bundleContext.getBundle().getSymbolicName());
+		props.put(Constants.BUNDLE_NAME, bundleContext.getBundle()
+				.getSymbolicName());
 
 		// spring-dm specific property
 		props.put("org.springframework.osgi.bean.name", "tomcat-server");
 
-		// publish just the interfaces and the major classes (server/handlerWrapper)
-		String[] classes = new String[] { StandardService.class.getName(), Service.class.getName(),
-			MBeanRegistration.class.getName(), Lifecycle.class.getName() };
+		// publish just the interfaces and the major classes
+		// (server/handlerWrapper)
+		String[] classes = new String[] { StandardService.class.getName(),
+				Service.class.getName(), MBeanRegistration.class.getName(),
+				Lifecycle.class.getName() };
 
 		return bundleContext.registerService(classes, server, props);
 	}
@@ -243,15 +253,17 @@ public class Activator implements BundleActivator {
 		properties.put(URLConstants.URL_HANDLER_PROTOCOL, "jndi");
 		final URLStreamHandler handler = new DirContextURLStreamHandler();
 
-		return bundleContext.registerService(URLStreamHandlerService.class.getName(),
-			new AbstractURLStreamHandlerService() {
+		return bundleContext.registerService(
+				URLStreamHandlerService.class.getName(),
+				new AbstractURLStreamHandlerService() {
 
-				private final static String EMPTY_STRING = "";
+					private final static String EMPTY_STRING = "";
 
-
-				public URLConnection openConnection(URL u) throws IOException {
-					return new URL(u, EMPTY_STRING, handler).openConnection();
-				}
-			}, properties);
+					public URLConnection openConnection(URL u)
+							throws IOException {
+						return new URL(u, EMPTY_STRING, handler)
+								.openConnection();
+					}
+				}, properties);
 	}
 }
\ No newline at end of file
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
diff --git a/server/runtime/org.argeo.server.catalina.start/tomcat.properties b/server/runtime/org.argeo.server.catalina.start/tomcat.properties
new file mode 100644
index 000000000..5e6a5f17b
--- /dev/null
+++ b/server/runtime/org.argeo.server.catalina.start/tomcat.properties
@@ -0,0 +1,14 @@
+argeo.server.port.http=7070
+argeo.server.port.https=7073
+argeo.server.port.ajp=7079
+
+# Used only when SSL is activated (uncommented in server.xml)
+argeo.server.keystoreFile=../../../../ssl/server.ks
+argeo.server.keystorePass=changeit
+argeo.server.truststoreFile=../../../../ssl/server.ts
+argeo.server.truststorePass=changeit
+argeo.server.https.clientAuth=want
+
+argeo.server.http.proxyName=
+argeo.server.http.proxyPort=
+argeo.server.http.secure=false
\ No newline at end of file
diff --git a/server/runtime/pom.xml b/server/runtime/pom.xml
index ac2525529..82be322f9 100644
--- a/server/runtime/pom.xml
+++ b/server/runtime/pom.xml
@@ -14,6 +14,7 @@
 	<modules>
 		<module>org.argeo.server.core</module>
 		<module>org.argeo.server.json</module>
+		<module>org.argeo.server.catalina.start</module>
 		<module>org.argeo.server.webextender</module>
 		<module>org.argeo.server.jxl</module>
 		<module>org.argeo.server.hibernate</module>