You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/06/14 09:40:08 UTC
svn commit: r784518 [5/6] - in /geronimo/server/trunk: ./
framework/buildsupport/car-maven-plugin/ framework/configs/client-system/
framework/configs/client-system/src/main/history/
framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/ ...
Added: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-1.xml?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-1.xml (added)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-1.xml Sun Jun 14 07:40:05 2009
@@ -0,0 +1,149 @@
+<?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.
+-->
+
+ <!-- this is the basic tomcat server.xml -->
+
+<!-- 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.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" />
+
+ <!-- Global JNDI resources
+ Documentation at /docs/jndi-resources-howto.html
+ -->
+ <GlobalNamingResources>
+ <!-- Editable user database that can also be used by
+ UserDatabaseRealm to authenticate users
+ -->
+ <Resource name="UserDatabase" auth="Container"
+ type="org.apache.catalina.UserDatabase"
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
+ </GlobalNamingResources>
+
+ <!-- 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">
+
+ <!--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="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ <!-- 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="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+ <!-- 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="Standalone" 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"/>
+ -->
+
+ <!-- This Realm uses the UserDatabase configured in the global JNDI
+ resources under the key "UserDatabase". Any edits
+ that are performed against this UserDatabase are immediately
+ available for use by the Realm. -->
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+
+ <!-- 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">
+
+ <!-- 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"/>
+ -->
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>
Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/pom.xml?rev=784518&r1=784517&r2=784518&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/pom.xml Sun Jun 14 07:40:05 2009
@@ -21,21 +21,21 @@
<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.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
-
+
<artifactId>tomcat</artifactId>
<name>Geronimo Plugins, Tomcat</name>
<packaging>pom</packaging>
-
+
<description>
Tomcat plugin
</description>
-
+
<modules>
<module>geronimo-tomcat6</module>
<module>geronimo-tomcat6-builder</module>
@@ -48,4 +48,138 @@
<module>tomcat6-clustering-builder-wadi</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Tomcat web container -->
+ <dependency>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>jasper</artifactId>
+ <version>${tomcatVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>juli</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>catalina</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>annotations-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>jasper-el</artifactId>
+ <version>${tomcatVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>juli</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>catalina</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>annotations-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>juli</artifactId>
+ <version>${tomcatVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>catalina</artifactId>
+ <version>${tomcatVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>juli</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>catalina-ha</artifactId>
+ <version>${tomcatVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>juli</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>tribes</artifactId>
+ <version>${tomcatVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${tomcatGroupId}</groupId>
+ <artifactId>juli</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--<dependency>-->
+ <!--<groupId>${tomcatGroupId}</groupId>-->
+ <!--<artifactId>coyote</artifactId>-->
+ <!--<version>${tomcatVersion}</version>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>${tomcatGroupId}</groupId>-->
+ <!--<artifactId>servlet-api</artifactId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<groupId>${tomcatGroupId}</groupId>-->
+ <!--<artifactId>juli</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>${tomcatGroupId}</groupId>-->
+ <!--<artifactId>juli-adapters</artifactId>-->
+ <!--<version>${tomcatVersion}</version>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>${tomcatGroupId}</groupId>-->
+ <!--<artifactId>servlet-api</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
+
+ </dependencies>
+ </dependencyManagement>
+
</project>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009
@@ -7,16 +7,16 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat6-clustering-builder-wadi</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-tomcat6-clustering-builder-wadi</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency start="true">
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-clustering-wadi</artifactId>
<type>car</type>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009
@@ -7,9 +7,9 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>wadi-clustering</artifactId>
- <type>car</type>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -17,8 +17,8 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>wadi-clustering</artifactId>
+ <type>car</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009
@@ -8,12 +8,17 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>j2ee-deployer</artifactId>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
+ <artifactId>connector-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency start="true">
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -21,9 +26,4 @@
<artifactId>geronimo-tomcat6-builder</artifactId>
<type>jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
- <type>car</type>
- </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml?rev=784518&r1=784517&r2=784518&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml Sun Jun 14 07:40:05 2009
@@ -27,7 +27,7 @@
<artifactId>tomcat</artifactId>
<version>2.2-SNAPSHOT</version>
</parent>
-
+
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6</artifactId>
<name>Geronimo Plugins, Tomcat :: Tomcat</name>
@@ -80,34 +80,34 @@
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
+ <groupId>${tomcatGroupId}</groupId>
<artifactId>catalina</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
+ <groupId>${tomcatGroupId}</groupId>
<artifactId>catalina-ha</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
+ <groupId>${tomcatGroupId}</groupId>
<artifactId>tribes</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>coyote</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>${tomcatGroupId}</groupId>-->
+ <!--<artifactId>coyote</artifactId>-->
+ <!--</dependency>-->
<dependency>
- <groupId>org.apache.tomcat.extras</groupId>
+ <groupId>${tomcatGroupId}</groupId>
<artifactId>juli</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.tomcat.extras</groupId>
- <artifactId>juli-adapters</artifactId>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>${tomcatGroupId}</groupId>-->
+ <!--<artifactId>juli-adapters</artifactId>-->
+ <!--</dependency>-->
</dependencies>
<build>
@@ -116,13 +116,13 @@
<directory>${pom.basedir}/src/main/resources</directory>
<filtering>true</filtering>
<includes>
- <include>**/*.xml</include>
+ <include>**/*.xml</include>
</includes>
</resource>
<resource>
<directory>${pom.basedir}/src/main/resources</directory>
<excludes>
- <exclude>**/*.xml</exclude>
+ <exclude>**/*.xml</exclude>
</excludes>
</resource>
</resources>
@@ -142,6 +142,7 @@
</gbean>
<gbean name="AccessLogValve" load="false"></gbean>
-->
+ <!--
<gbean name="TomcatWebConnector">
<attribute name="host">${ServerHostname}</attribute>
<attribute name="port">${HTTPPort + PortOffset}</attribute>
@@ -187,6 +188,7 @@
workDir=work
</attribute>
</gbean>
+ -->
</config-xml-content>
<config-substitution key="HTTPPort">8080</config-substitution>
<config-substitution key="AJPPort">8009</config-substitution>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml?rev=784518&r1=784517&r2=784518&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml Sun Jun 14 07:40:05 2009
@@ -8,52 +8,67 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
+ <artifactId>j2ee-server</artifactId>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>server-security-config</artifactId>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-server</artifactId>
+ <artifactId>transaction</artifactId>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tribes</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-tomcat6</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>transaction</artifactId>
- <type>car</type>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>clustering</artifactId>
+ <type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>server-security-config</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>webservices-common</artifactId>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat6</artifactId>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>catalina</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
<artifactId>catalina-ha</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>webservices-common</artifactId>
+ <artifactId>jasper</artifactId>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>coyote</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>util</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>tribes</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml?rev=784518&r1=784517&r2=784518&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml Sun Jun 14 07:40:05 2009
@@ -33,12 +33,22 @@
<!-- The following is the equivalent of the server.xml file, but done with GBeans -->
+ <gbean name="TomcatServer" class="org.apache.geronimo.tomcat.TomcatServerGBean">
+ <attribute name="serverConfigLocation">var/catalina/server.xml</attribute>
+ <reference name="ServerInfo">
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+
<!-- The TomcatContainer/Service -->
<gbean name="TomcatWebContainer" class="org.apache.geronimo.tomcat.TomcatContainer">
<attribute name="catalinaHome">var/catalina</attribute>
<!--<attribute name="applicationListeners">org.apache.myfaces.webapp.StartupServletContextListener</attribute>-->
- <reference name="EngineGBean">
- <name>TomcatEngine</name>
+ <!--<reference name="EngineGBean">-->
+ <!--<name>TomcatEngine</name>-->
+ <!--</reference>-->
+ <reference name="Server">
+ <name>TomcatServer</name>
</reference>
<reference name="ServerInfo">
<name>ServerInfo</name>
@@ -46,11 +56,11 @@
<reference name="WebManager">
<name>TomcatWebManager</name>
</reference>
- <reference name="LifecycleListenerChain">
- <name>AprLifecycleListener</name>
- </reference>
+ <!--<reference name="LifecycleListenerChain">-->
+ <!--<name>AprLifecycleListener</name>-->
+ <!--</reference>-->
</gbean>
-
+<!--
<gbean name="AprLifecycleListener" class="org.apache.geronimo.tomcat.LifecycleListenerGBean">
<attribute name="className">org.apache.geronimo.tomcat.listener.GeronimoAprLifecycleListener</attribute>
</gbean>
@@ -92,9 +102,6 @@
</reference>
</gbean>
- <!-- SSL support
- NOTE: If keystoreFile is a relative path, it is relative to GERONIMO_HOME
- -->
<gbean name="TomcatWebSSLConnector" class="org.apache.geronimo.tomcat.connector.Https11ConnectorGBean">
<attribute name="name">HTTPS</attribute>
<attribute name="host">${PlanServerHostname}</attribute>
@@ -120,7 +127,6 @@
</reference>
</gbean>
- <!-- Engine -->
<gbean name="TomcatEngine" class="org.apache.geronimo.tomcat.EngineGBean">
<attribute name="className">org.apache.geronimo.tomcat.TomcatEngine</attribute>
<attribute name="initParams">
@@ -138,13 +144,6 @@
<reference name="MBeanServerReference">
<name>MBeanServerReference</name>
</reference>
- <!-- n.b. is you have more hosts, you want them to start before the engine gbean -->
- <!-- ensure this by including dependencies like this -->
- <!--
- <dependency>
- <name>MyAdditionalHost</name>
- </dependency>
- -->
</gbean>
<gbean name="TomcatAccessLogManager" class="org.apache.geronimo.tomcat.TomcatLogManagerImpl">
@@ -158,7 +157,6 @@
</references>
</gbean>
- <!-- Valve -->
<gbean name="AccessLogValve" class="org.apache.geronimo.tomcat.ValveGBean">
<attribute name="className">org.apache.catalina.valves.AccessLogValve</attribute>
<attribute name="initParams">
@@ -166,21 +164,8 @@
suffix=.txt
pattern=common
</attribute>
- <!-- Uncomment this section to add second valve for a chain. This example consists of the Tomcat
- AccessLogValve and SingleSignOn. Notice the dependency that chains the AccessLogValve with the
- SingleSignOnValve. The valves will be added in the order that they are chained.
- <reference name="NextValve"><moduleType>J2EEModule</moduleType><name>SingleSignOnValve</name></reference>
- -->
- </gbean>
- <!-- Uncomment this section to add this valve to the chain. This example consists of the Tomcat
- SingleSignOn.
- <gbean name="SingleSignOnValve" class="org.apache.geronimo.tomcat.ValveGBean">
- <attribute name="className">org.apache.catalina.authenticator.SingleSignOn</attribute>
</gbean>
- -->
- <!-- Realm -->
- <!-- This is an example TomcatJAASRealm, used only if you specify "DefaultJAASRealm" as the security realm name in your geronimo plan -->
<gbean name="TomcatJAASRealm" class="org.apache.geronimo.tomcat.RealmGBean">
<attribute name="className">org.apache.geronimo.tomcat.realm.TomcatJAASRealm</attribute>
<attribute name="initParams">
@@ -193,7 +178,6 @@
</reference>
</gbean>
- <!-- Host -->
<gbean name="TomcatHost" class="org.apache.geronimo.tomcat.HostGBean">
<attribute name="className">org.apache.catalina.core.StandardHost</attribute>
<attribute name="initParams">
@@ -201,24 +185,6 @@
appBase=
workDir=work
</attribute>
- <!-- You may attach a Realm to a Host as well. Only attach to the Engine *or* the Host.
- Attempting to add the same Realm GBeans to the Engine *and* Host at the same time
- will result in an error.
-
- Uncomment this to add the Realm to the Host
- <reference name="RealmGBean">
- <name>TomcatJAASRealm</name>
- </reference>
- -->
- <!-- You may attach a Valve chain to a Host as well. Only attach to the Engine *or* the Host.
- Attempting to add the same valve GBeans to the Engine *and* Host at the same time
- will result in an error.
-
- Uncomment this to add the valve chain to the Host
- <reference name="TomcatValveChain">
- <name>AccessLogValve</name>
- </reference>
- -->
</gbean>
-
+ -->
</module>
Added: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml?rev=784518&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml (added)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml Sun Jun 14 07:40:05 2009
@@ -0,0 +1,149 @@
+<?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.
+-->
+
+ <!-- this is the basic tomcat server.xml -->
+
+<!-- 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.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" />
+
+ <!-- Global JNDI resources
+ Documentation at /docs/jndi-resources-howto.html
+ -->
+ <GlobalNamingResources>
+ <!-- Editable user database that can also be used by
+ UserDatabaseRealm to authenticate users
+ -->
+ <Resource name="UserDatabase" auth="Container"
+ type="org.apache.catalina.UserDatabase"
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
+ </GlobalNamingResources>
+
+ <!-- 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">
+
+ <!--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="8080" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ <!-- 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="8009" protocol="AJP/1.3" redirectPort="8443" />
+
+
+ <!-- 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="Standalone" 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"/>
+ -->
+
+ <!-- This Realm uses the UserDatabase configured in the global JNDI
+ resources under the key "UserDatabase". Any edits
+ that are performed against this UserDatabase are immediately
+ available for use by the Realm. -->
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+
+ <!-- Define the default virtual host
+ Note: XML Schema validation will not work with Xerces 2.2.
+ -->
+ <Host name="localhost" appBase="tomcat-base"
+ unpackWARs="true" autoDeploy="true"
+ xmlValidation="false" xmlNamespaceAware="false">
+
+ <!-- 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"/>
+ -->
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>
Propchange: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml