geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r219408 - in /geronimo/trunk/modules/assembly: ./ src/plan/
Date Sun, 17 Jul 2005 22:29:46 GMT
Author: jgenender
Date: Sun Jul 17 15:29:43 2005
New Revision: 219408

URL: http://svn.apache.org/viewcvs?rev=219408&view=rev
Log:
Added ability to change Jetty/Tomcat builds

Added:
    geronimo/trunk/modules/assembly/src/plan/jetty-config.xml
    geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml
    geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml
    geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml   (with props)
    geronimo/trunk/modules/assembly/src/plan/tomcat-deployer-config.xml
    geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml
Removed:
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-tomcat-plan.xml
Modified:
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=219408&r1=219407&r2=219408&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Sun Jul 17 15:29:43 2005
@@ -172,7 +172,13 @@
         <ant:copy todir="${distDir}/var">
             <ant:fileset dir="src/var"/>
         </ant:copy>
-        <ant:copy todir="${distDir}/var/catalina/conf" file="${project.root}/modules/tomcat/src/var/web.xml"/>
+
+        <j:if test="${context.getVariable('geronimo.web.container').equals('tomcat')}">
+            <ant:copy todir="${distDir}/var/catalina/conf" file="${project.root}/modules/tomcat/src/var/web.xml"/>
+            <ant:copy todir="${distDir}/var/catalina/ROOT">
+                <ant:fileset dir="${project.root}/modules/tomcat/src/var/ROOT"/>
+            </ant:copy>
+        </j:if>
 
         <!-- Pre-load the server's repository -->
         <ant:mkdir dir="${distDir}/repository"/>
@@ -267,15 +273,31 @@
         <j:set var="PlanORBPort" value="2001" />
         <j:set var="PlanCOSNamingPort" value="1050" />
         <j:set var="PlanClientAddresses" value="127.0.0.1" />
-        <j:set var="PlanJettyHTTPPort" value="8080" />
-        <j:set var="PlanJettyHTTPSPort" value="8443" />
+        <j:set var="PlanHTTPPort" value="8080" />
+        <j:set var="PlanHTTPSPort" value="8443" />
         <j:set var="PlanOpenEJBPort" value="4201" />
-        <j:set var="PlanTomcatHTTPPort" value="8090" />
-        <j:set var="PlanTomcatHTTPSPort" value="8443" />
-        <j:set var="PlanTomcatAJPPort" value="8009" />
+        <j:set var="PlanAJPPort" value="8009" />
         <j:set var="PlanActiveMQPort" value="61616" />
         <j:set var="PlanDerbyPort" value="1527" />
 
+        <!-- Prepare the web container -->
+        <ant:mkdir dir="${basedir}/target/tmp"/>
+        <velocity:merge
+            basedir="${basedir}/src/plan"
+            template="${geronimo.web.container}-config.xml"
+            name="${basedir}/target/tmp/${geronimo.web.container}-config.xml"/>
+        <loadfile property="webcontainer" srcFile="${basedir}/target/tmp/${geronimo.web.container}-config.xml"/>
+        <velocity:merge
+            basedir="${basedir}/src/plan"
+            template="${geronimo.web.container}-deployer-config.xml"
+            name="${basedir}/target/tmp/${geronimo.web.container}-deployer-config.xml"/>
+        <loadfile property="webdeployer" srcFile="${basedir}/target/tmp/${geronimo.web.container}-deployer-config.xml"/>
+        <velocity:merge
+            basedir="${basedir}/src/plan"
+            template="${geronimo.web.container}-runtime-deployer-config.xml"
+            name="${basedir}/target/tmp/${geronimo.web.container}-runtime-deployer-config.xml"/>
+        <loadfile property="webruntimedeployer" srcFile="${basedir}/target/tmp/${geronimo.web.container}-runtime-deployer-config.xml"/>
+
         <ant:mkdir dir="${basedir}/target/plan"/>
         <j:forEach var="plan" items="${plans.iterator()}">
             <j:set var="planName" value="${plan.name}"/>
@@ -489,18 +511,6 @@
                 <ant:arg value="manager"/>
                 <ant:arg value="distribute"/>
                 <ant:arg value="target/plan/j2ee-client-plan.xml"/>
-            </ant:java>
-
-            <!-- build the J2EEServer with Apache Tomcat (as the web container) configuration -->
-            <ant:echo>Building Apache Tomcat server configuration</ant:echo>
-            <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
-                <ant:jvmarg value="-ea"/>
-                <ant:arg value="--user"/>
-                <ant:arg value="system"/>
-                <ant:arg value="--password"/>
-                <ant:arg value="manager"/>
-                <ant:arg value="distribute"/>
-                <ant:arg value="target/plan/j2ee-server-tomcat-plan.xml"/>
             </ant:java>
 
             <!-- build the Demo configuration -->

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?rev=219408&r1=219407&r2=219408&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Sun Jul 17 15:29:43 2005
@@ -52,9 +52,6 @@
         <uri>geronimo/jars/geronimo-naming-builder-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
         <uri>geronimo/jars/geronimo-web-builder-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
@@ -99,9 +96,6 @@
         <uri>geronimo/jars/geronimo-security-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
         <uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
@@ -154,30 +148,7 @@
         <uri>geronimo/jars/geronimo-servicemix-builder-${geronimo_version}.jar</uri>
     </dependency>
 
-
-    <!--
-   - Uncomment this to deploy webapps to Apache Tomcat
-   -
-    <dependency>
-        <uri>geronimo/jars/geronimo-tomcat-builder-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/catalina-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/naming-resources-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/tomcat-coyote-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/tomcat-util-${tomcat_version}.jar</uri>
-    </dependency>
--->
-
+    ${webdeployer}
 
     <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
         <reference name="Builders"><name>*</name></reference>
@@ -220,84 +191,6 @@
         <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
         <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
     </gbean>
-
-   <!--
-   - Comment this section to deploy webapps to Apache Tomcat
-   -
-   -->
-    <gbean name="WebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
-        <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
-        <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
-        <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
-        <attribute name="defaultServlets">geronimo.deployer:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/J2EEDeployer,*</attribute>
-        <reference name="WebServiceBuilder"><name>WebServiceBuilder</name></reference>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-    </gbean>
-
-<!--
-   - Uncomment this to deploy webapps to Apache Tomcat
-   -
-    <gbean name="WebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Tomcat</attribute>
-        <attribute name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
-        <reference name="WebServiceBuilder"><name>WebServiceBuilder</name></reference>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-    </gbean>
-   -->
-
-   <!--
-   - Comment this section to deploy webapps to Apache Tomcat
-   -
-   -->
-    <gbean name="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
-        <attribute name="servletName">default</attribute>
-        <attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
-        <attribute name="loadOnStartup">0</attribute>
-        <attribute name="initParams">
- acceptRanges=true
- dirAllowed=true
- putAllowed=false
- delAllowed=false
- redirectWelcome=false
- minGzipLength=8192</attribute>
-        <attribute name="servletMappings">/</attribute>
-    </gbean>
-
-   <!--
-   - Comment this section to deploy webapps to Apache Tomcat
-   -
-   -->
-    <gbean name="JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder">
-        <attribute name="servletName">jsp</attribute>
-        <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
-        <attribute name="loadOnStartup">0</attribute>
-        <attribute name="initParams">
- logVerbosityLevel=DEBUG
- fork=false
- xpoweredBy=false</attribute>
-        <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
-    </gbean>
-
-   <!--
-   - Comment this section to deploy webapps to Apache Tomcat
-   -
-   -->
-    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
-        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-    </gbean>
-
-<!--
-   - Uncomment this to deploy webapps to Apache Tomcat
-   -
-    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
-        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-    </gbean>
-    -->
 
     <gbean name="ClientEJBReferenceBuilder" class="org.openejb.deployment.RemoteEJBReferenceBuilder">
     </gbean>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml?rev=219408&r1=219407&r2=219408&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml Sun Jul 17 15:29:43 2005
@@ -46,9 +46,6 @@
         <uri>geronimo/jars/geronimo-naming-builder-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
         <uri>geronimo/jars/geronimo-web-builder-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
@@ -87,28 +84,7 @@
         <uri>geronimo/jars/geronimo-servicemix-builder-${geronimo_version}.jar</uri>
     </dependency>
 
-    <!--
-    - Uncomment this section to deploy webapps to Apache Tomcat
-    -
-    <dependency>
-        <uri>geronimo/jars/geronimo-tomcat-builder-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/catalina-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/naming-resources-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/tomcat-coyote-${tomcat_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>tomcat/jars/tomcat-util-${tomcat_version}.jar</uri>
-    </dependency>
-    -->
+    ${webruntimedeployer}
 
     <!-- deployer gbeans -->
     <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
@@ -145,95 +121,6 @@
         <reference name="AppClientConfigBuilder"><name>AppClientBuilder</name></reference>
         <reference name="ServiceReferenceBuilder"><name>WebServiceBuilder</name></reference>
     </gbean>
-
-    <!--
-    - Uncomment this section to deploy webapps to Apache Tomcat
-    -
-
-    <gbean name="WebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Tomcat</attribute>
-        <attribute name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
-        <reference name="WebServiceBuilder"><name>WebServiceBuilder</name></reference>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-    </gbean>
-    -->
-
-    <!--
-    - Comment this section to deploy webapps to Apache Tomcat
-    -
-    -->
-    <gbean name="WebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
-        <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
-        <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
-        <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
-        <attribute name="defaultServlets">geronimo.server:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</attribute>
-        <attribute name="pojoWebServiceTemplate">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/RuntimeDeployer,J2EEServer=geronimo,j2eeType=ServletWebServiceTemplate,name=POJOTemplate</attribute>
-        <reference name="WebServiceBuilder"><name>WebServiceBuilder</name></reference>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-    </gbean>
-
-    <!--
-    - Comment this section to deploy webapps to Apache Tomcat
-    -
-    -->
-    <gbean name="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
-        <attribute name="servletName">default</attribute>
-        <attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
-        <attribute name="loadOnStartup">0</attribute>
-        <attribute name="initParams">
-            acceptRanges=true
-            dirAllowed=true
-            putAllowed=false
-            delAllowed=false
-            redirectWelcome=false
-            minGzipLength=8192</attribute>
-        <attribute name="servletMappings">/</attribute>
-    </gbean>
-
-    <!--
-    - Comment this section to deploy webapps to Apache Tomcat
-    -
-    -->
-    <gbean name="JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder">
-        <attribute name="servletName">jsp</attribute>
-        <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
-        <attribute name="loadOnStartup">0</attribute>
-        <attribute name="initParams">
-            logVerbosityLevel=DEBUG
-            fork=false
-            xpoweredBy=false</attribute>
-        <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
-    </gbean>
-
-    <!--
-    - Comment this section to deploy webapps to Apache Tomcat
-    -
-    -->
-    <gbean name="POJOTemplate" class="org.apache.geronimo.jetty.JettyPOJOWebServiceHolder">
-        <attribute name="servletName">dummy</attribute>
-    </gbean>
-
-    <!--
-    - Comment this section to deploy webapps to Apache Tomcat
-    -
-    -->
-    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
-        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-    </gbean>
-
-    <!--
-    - Uncomment this section to deploy webapps to Apache Tomcat
-    -
-
-    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
-        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-    </gbean>
-    -->
 
     <gbean name="ClientEJBReferenceBuilder" class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
 

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?rev=219408&r1=219407&r2=219408&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Sun Jul 17 15:29:43 2005
@@ -75,9 +75,6 @@
         <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
         <uri>geronimo/jars/geronimo-jmxremoting-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
@@ -124,6 +121,9 @@
         <uri>geronimo/jars/geronimo-servicemix-${geronimo_version}.jar</uri>
     </dependency>
 
+
+    ${webcontainer}
+
     <!-- Default security realm using properties files -->
     <gbean name="properties-login"
         class="org.apache.geronimo.security.jaas.LoginModuleGBean">
@@ -224,38 +224,6 @@
         <reference name="XidImporter"><name>TransactionManager</name></reference>
     </gbean>
 
-
-    <!-- default WAR container using Jetty -->
-    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl">
-    </gbean>
-
-    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
-        <reference name="JettyContainer"><name>JettyWebContainer</name></reference>
-        <reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
-        <attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
-        <attribute name="logDateFormat">dd/MMM/yyyy:HH:mm:ss ZZZ</attribute>
-        <attribute name="logTimeZone">GMT</attribute>
-    </gbean>
-
-    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty.connector.HTTPConnector">
-        <attribute name="port">${PlanJettyHTTPPort}</attribute>
-        <reference name="JettyContainer"><name>JettyWebContainer</name></reference>
-        <!--        <attribute name="MaxConnections">10</attribute>-->
-        <!--        <attribute name="MaxIdleTime">10</attribute>-->
-    </gbean>
-
-    <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty.connector.HTTPSConnector">
-        <attribute name="port">${PlanJettyHTTPSPort}</attribute>
-        <attribute name="keystore">var/security/keystore</attribute>
-        <attribute name="keystoreType">JKS</attribute>
-        <attribute name="password">secret</attribute>
-        <attribute name="keyPassword">secret</attribute>
-        <attribute name="needClientAuth">false</attribute>
-        <attribute name="protocol">TLS</attribute>
-        <reference name="JettyContainer"><name>JettyWebContainer</name></reference>
-        <reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
-    </gbean>
-
     <!-- EJB Protocol -->
     <gbean gbeanName="openejb:type=NetworkService,name=EJB" class="org.openejb.server.StandardServiceStackGBean">
         <attribute name="name">EJB</attribute>
@@ -278,9 +246,6 @@
             <pattern><gbean-name>geronimo.server:j2eeType=EntityBean,*</gbean-name></pattern>
         </references>
     </gbean>
-
-
-    <!-- HTTP/SOAP Protocol is now run through jetty-->
 
     <!-- JSR77 Management Objects -->
     <gbean gbeanName="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>

Added: geronimo/trunk/modules/assembly/src/plan/jetty-config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/jetty-config.xml?rev=219408&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/jetty-config.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/jetty-config.xml Sun Jul 17 15:29:43 2005
@@ -0,0 +1,59 @@
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed 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.
+-->
+
+<!-- $Rev: 201775 $ $Date: 2005-06-25 11:59:41 -0600 (Sat, 25 Jun 2005) $ -->
+
+<!--
+Configuration for the main ring of a Geronimo server.
+
+This configuration should contain those services normally provided
+by the server.
+-->
+    <dependency>
+        <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
+    </dependency>
+
+    <!-- default WAR container using Jetty -->
+    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl">
+    </gbean>
+
+    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
+        <reference name="JettyContainer"><name>JettyWebContainer</name></reference>
+        <reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
+        <attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
+        <attribute name="logDateFormat">dd/MMM/yyyy:HH:mm:ss ZZZ</attribute>
+        <attribute name="logTimeZone">GMT</attribute>
+    </gbean>
+
+    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty.connector.HTTPConnector">
+        <attribute name="port">${PlanHTTPPort}</attribute>
+        <reference name="JettyContainer"><name>JettyWebContainer</name></reference>
+        <!--        <attribute name="MaxConnections">10</attribute>-->
+        <!--        <attribute name="MaxIdleTime">10</attribute>-->
+    </gbean>
+
+    <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty.connector.HTTPSConnector">
+        <attribute name="port">${PlanHTTPSPort}</attribute>
+        <attribute name="keystore">var/security/keystore</attribute>
+        <attribute name="keystoreType">JKS</attribute>
+        <attribute name="password">secret</attribute>
+        <attribute name="keyPassword">secret</attribute>
+        <attribute name="needClientAuth">false</attribute>
+        <attribute name="protocol">TLS</attribute>
+        <reference name="JettyContainer"><name>JettyWebContainer</name></reference>
+        <reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
+    </gbean>

Added: geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml?rev=219408&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml Sun Jul 17 15:29:43 2005
@@ -0,0 +1,67 @@
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed 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.
+-->
+
+<!-- $Rev: 216115 $ $Date: 2005-07-12 23:22:18 -0600 (Tue, 12 Jul 2005) $ -->
+
+    <dependency>
+        <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
+    </dependency>
+
+    <gbean name="WebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
+        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
+        <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
+        <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
+        <attribute name="defaultServlets">geronimo.deployer:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/J2EEDeployer,*</attribute>
+        <reference name="WebServiceBuilder"><name>WebServiceBuilder</name></reference>
+        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+    </gbean>
+
+    <gbean name="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
+        <attribute name="servletName">default</attribute>
+        <attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
+        <attribute name="loadOnStartup">0</attribute>
+        <attribute name="initParams">
+ acceptRanges=true
+ dirAllowed=true
+ putAllowed=false
+ delAllowed=false
+ redirectWelcome=false
+ minGzipLength=8192</attribute>
+        <attribute name="servletMappings">/</attribute>
+    </gbean>
+
+    <gbean name="JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder">
+        <attribute name="servletName">jsp</attribute>
+        <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
+        <attribute name="loadOnStartup">0</attribute>
+        <attribute name="initParams">
+ logVerbosityLevel=DEBUG
+ fork=false
+ xpoweredBy=false</attribute>
+        <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
+    </gbean>
+
+    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
+        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
+        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+    </gbean>
+

Added: geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml?rev=219408&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml Sun Jul 17 15:29:43 2005
@@ -0,0 +1,71 @@
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed 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.
+-->
+
+<!-- $Rev: 216115 $ $Date: 2005-07-12 23:22:18 -0600 (Tue, 12 Jul 2005) $ -->
+
+    <dependency>
+        <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
+    </dependency>
+
+    <gbean name="WebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
+        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
+        <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
+        <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
+        <attribute name="defaultServlets">geronimo.deployer:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/J2EEDeployer,*</attribute>
+        <reference name="WebServiceBuilder"><name>WebServiceBuilder</name></reference>
+        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+    </gbean>
+
+    <gbean name="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
+        <attribute name="servletName">default</attribute>
+        <attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
+        <attribute name="loadOnStartup">0</attribute>
+        <attribute name="initParams">
+ acceptRanges=true
+ dirAllowed=true
+ putAllowed=false
+ delAllowed=false
+ redirectWelcome=false
+ minGzipLength=8192</attribute>
+        <attribute name="servletMappings">/</attribute>
+    </gbean>
+
+    <gbean name="JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder">
+        <attribute name="servletName">jsp</attribute>
+        <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
+        <attribute name="loadOnStartup">0</attribute>
+        <attribute name="initParams">
+ logVerbosityLevel=DEBUG
+ fork=false
+ xpoweredBy=false</attribute>
+        <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
+    </gbean>
+
+    <gbean name="POJOTemplate" class="org.apache.geronimo.jetty.JettyPOJOWebServiceHolder">
+        <attribute name="servletName">dummy</attribute>
+    </gbean>
+
+    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
+        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
+        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+    </gbean>
+

Added: geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml?rev=219408&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml Sun Jul 17 15:29:43 2005
@@ -0,0 +1,270 @@
+<!--
+
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+-->
+
+<!-- $Rev: 111627 $ $Date: 2004-12-12 03:15:11 +0100 (Sun, 12 Dec 2004) $ -->
+
+<!--
+Configuration for the main ring of a Geronimo server.
+
+This configuration should contain those services normally provided
+by the server.
+-->
+    <dependency>
+        <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/catalina-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/catalina-optional-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/tomcat-coyote-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/tomcat-http-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/tomcat-util-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/naming-resources-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/servlets-default-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/servlets-invoker-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-beanutils/jars/commons-beanutils-${commons_beanutils_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-collections/jars/commons-collections-${commons_collections_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-digester/jars/commons-digester-${commons_digester_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-modeler/jars/commons-modeler-${commons_modeler_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>mx4j/jars/mx4j-${mx4j_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/jasper-compiler-${jasper_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/jasper-compiler-jdt-${jasper_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/jasper-runtime-${jasper_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/tomcat-ajp-${tomcat_ajp_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
+    </dependency>
+
+    <!-- JAAS Geronimo Login Configuration -->
+    <gbean name="tomcat-properties-realm"
+        class="org.apache.geronimo.security.realm.GenericSecurityRealm">
+        <attribute name="realmName">Geronimo</attribute>
+        <reference name="LoginModuleConfiguration">
+            <name>tomcat-properties</name>
+        </reference>
+        <reference name="ServerInfo">
+            <module>org/apache/geronimo/System</module>
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <gbean name="tomcat-properties" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
+        <attribute name="controlFlag">REQUIRED</attribute>
+        <reference name="LoginModule">
+            <name>properties-login</name>
+        </reference>
+    </gbean>
+
+    <!-- The following is the equivalent of the server.xml file, but done with GBeans -->
+
+    <!-- The TomcatContainer/Service -->
+    <gbean name="TomcatWebContainer" class="org.apache.geronimo.tomcat.TomcatContainer">
+        <attribute name="catalinaHome">var/catalina</attribute>
+        <reference name="engineGBean">
+            <name>TomcatEngine</name>
+        </reference>
+        <reference name="ServerInfo">
+            <module>org/apache/geronimo/System</module>
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <gbean name="TomcatWebConnector" class="org.apache.geronimo.tomcat.ConnectorGBean">
+        <attribute name="name">HTTP</attribute>
+        <attribute name="initParams">
+            address=0.0.0.0
+            port=${PlanHTTPPort}
+            maxHttpHeaderSize=8192
+            maxThreads=150
+            minSpareThreads=25
+            maxSpareThreads=75
+            enableLookups=false
+            redirectPort=${PlanHTTPSPort}
+            acceptCount=100
+            connectionTimeout=20000
+            disableUploadTimeout=true
+        </attribute>
+        <reference name="TomcatContainer">
+            <name>TomcatWebContainer</name>
+        </reference>
+        <reference name="ServerInfo">
+            <module>org/apache/geronimo/System</module>
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <gbean name="TomcatAJPConnector" class="org.apache.geronimo.tomcat.ConnectorGBean">
+        <attribute name="protocol">AJP/1.3</attribute>
+        <attribute name="name">AJP</attribute>
+        <attribute name="initParams">
+            address=0.0.0.0
+            port=${PlanAJPPort}
+            enableLookups=false
+            redirectPort=${PlanHTTPSPort}
+        </attribute>
+        <reference name="TomcatContainer">
+            <name>TomcatWebContainer</name>
+        </reference>
+        <reference name="ServerInfo">
+            <module>org/apache/geronimo/System</module>
+            <name>ServerInfo</name>
+        </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.ConnectorGBean">
+        <attribute name="name">HTTPS</attribute>
+        <attribute name="initParams">
+            address=0.0.0.0
+            port=${PlanHTTPSPort}
+            maxHttpHeaderSize=8192
+            maxThreads=150
+            minSpareThreads=25
+            maxSpareThreads=75
+            enableLookups=false
+            disableUploadTimeout=true
+            acceptCount=100
+            scheme=https
+            secure=true
+            clientAuth=false
+            sslProtocol=TLS
+            keystoreFile=var/security/keystore
+            keystorePass=secret
+        </attribute>
+        <reference name="TomcatContainer"><name>TomcatWebContainer</name></reference>
+        <reference name="ServerInfo">
+            <module>org/apache/geronimo/System</module>
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <!-- Engine -->
+    <gbean name="TomcatEngine" class="org.apache.geronimo.tomcat.EngineGBean">
+        <attribute name="className">org.apache.geronimo.tomcat.TomcatEngine</attribute>
+        <attribute name="initParams">
+            name=Geronimo
+            defaultHost=${PlanServerHostname}
+        </attribute>
+        <references name="hosts">
+            <pattern><gbean-name>geronimo.server:j2eeType=Host,*</gbean-name></pattern>
+        </references>
+        <reference name="realmGBean">
+            <name>TomcatJAASRealm</name>
+        </reference>
+        <reference name="TomcatValveChain">
+            <name>FirstValve</name>
+        </reference> 
+    </gbean>
+
+    <!-- Valve -->
+    <gbean name="FirstValve" class="org.apache.geronimo.tomcat.ValveGBean">
+        <attribute name="className">org.apache.catalina.valves.AccessLogValve</attribute>
+        <attribute name="initParams">
+            prefix=${PlanServerHostname}_access_log.
+            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 FirstValve with the
+          SecondValve.  The valves will be added in the order that they are chained.
+        <reference name="NextValve"><moduleType>J2EEModule</moduleType><name>SecondValve</name></reference>
+    -->
+    </gbean>
+    <!-- Uncomment this section to add this valve  to the chain.  This example consists of the Tomcat
+          SingleSignOn. 
+    <gbean name="SecondValve" class="org.apache.geronimo.tomcat.ValveGBean">
+        <attribute name="className">org.apache.catalina.authenticator.SingleSignOn</attribute>
+    </gbean>
+    -->
+
+    <!-- Realm -->
+    <!-- This is an example TomcatJAASRealm -->
+    <gbean name="TomcatJAASRealm" class="org.apache.geronimo.tomcat.RealmGBean">
+        <attribute name="className">org.apache.geronimo.tomcat.realm.TomcatJAASRealm</attribute>
+        <attribute name="initParams">
+            userClassNames=org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal
+            roleClassNames=org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal
+        </attribute>
+    </gbean>
+
+    <!-- Host -->
+    <gbean name="TomcatHost" class="org.apache.geronimo.tomcat.HostGBean">
+        <attribute name="className">org.apache.catalina.core.StandardHost</attribute>
+        <attribute name="initParams">
+            name=${PlanServerHostname}
+            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>FirstValve</name>
+        </reference> 
+        -->
+    </gbean>

Propchange: geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: geronimo/trunk/modules/assembly/src/plan/tomcat-deployer-config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/tomcat-deployer-config.xml?rev=219408&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/tomcat-deployer-config.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/tomcat-deployer-config.xml Sun Jul 17 15:29:43 2005
@@ -0,0 +1,31 @@
+    <dependency>
+        <uri>geronimo/jars/geronimo-tomcat-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/catalina-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/naming-resources-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/tomcat-coyote-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/tomcat-util-${tomcat_version}.jar</uri>
+    </dependency>
+
+    <gbean name="WebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
+        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
+        <reference name="WebServiceBuilder"><name>WebServiceBuilder</name></reference>
+        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+    </gbean>
+
+    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
+        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
+        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+    </gbean>

Added: geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml?rev=219408&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml Sun Jul 17 15:29:43 2005
@@ -0,0 +1,31 @@
+    <dependency>
+        <uri>geronimo/jars/geronimo-tomcat-builder-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/catalina-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/naming-resources-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/tomcat-coyote-${tomcat_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>tomcat/jars/tomcat-util-${tomcat_version}.jar</uri>
+    </dependency>
+
+    <gbean name="WebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
+        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
+        <reference name="WebServiceBuilder"><name>WebServiceBuilder</name></reference>
+        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+    </gbean>
+
+    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
+        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
+        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+    </gbean>



Mime
View raw message