bug 391574: Update the default Lifecycle Listeners to the Apache Tomcat configuration. Remove the shutdown port.
diff --git a/org.eclipse.virgo.apps.repository.test/src/test/resources/config/tomcat-server.xml b/org.eclipse.virgo.apps.repository.test/src/test/resources/config/tomcat-server.xml
index efe20f7..b667e3f 100644
--- a/org.eclipse.virgo.apps.repository.test/src/test/resources/config/tomcat-server.xml
+++ b/org.eclipse.virgo.apps.repository.test/src/test/resources/config/tomcat-server.xml
@@ -19,25 +19,24 @@
define subcomponents such as "Valves" at this level.
Documentation at /docs/config/server.html
-->
-<Server port="8005" shutdown="SHUTDOWN">
-
-
- <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html-->
+<Server>
+ <!--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.JasperListener" />
-
- <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html-->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
-
+ <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
<Listener className="org.eclipse.virgo.web.tomcat.support.ServerLifecycleLoggingListener"/>
-
+
<!-- A "Service" is a collection of one or more "Connectors" that share
- a single "Container" Note: A "Service" is not itself a "Container",
+ 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">
-
-
+
+
<!-- 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)
@@ -45,8 +44,8 @@
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL HTTP/1.1 Connector on port 8080
-->
- <Connector port="8080" protocol="HTTP/1.1"
- connectionTimeout="20000"
+ <Connector port="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
redirectPort="8443" />
<!-- Define an AJP 1.3 Connector on port 8009 -->
@@ -57,22 +56,19 @@
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
--->
+ 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" jvmRoute="jvm1">
+ -->
<Engine name="Catalina" defaultHost="localhost">
- <Valve className="org.eclipse.virgo.web.tomcat.support.ApplicationNameTrackingValve"/>
-
- <!-- Define the default virtual host
- Note: XML Schema validation will not work with Xerces 2.2.
- -->
+ <Valve className="org.eclipse.virgo.web.tomcat.support.ApplicationNameTrackingValve"/>
+
+ <!-- Define the default virtual host -->
<Host name="localhost" deployOnStartup="false" autoDeploy="false"
unpackWARs="false" appBase="" createDirs="false">
- <Listener className="org.eclipse.virgo.web.tomcat.support.ApplicationNameTrackingListener"/>
+ <Listener className="org.eclipse.virgo.web.tomcat.support.ApplicationNameTrackingListener"/>
</Host>
</Engine>
</Service>
