geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r219858 - /geronimo/trunk/modules/assembly/src/plan/
Date Wed, 20 Jul 2005 08:42:51 GMT
Author: jgenender
Date: Wed Jul 20 01:42:51 2005
New Revision: 219858

URL: http://svn.apache.org/viewcvs?rev=219858&view=rev
Log:
Moved the EJBBuilder back into the main plans and unified all refs to XXXWebContainer to just
WebContainer

Modified:
    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/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
    geronimo/trunk/modules/assembly/src/plan/tomcat-deployer-config.xml
    geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml

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=219858&r1=219857&r2=219858&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Wed Jul 20 01:42:51 2005
@@ -222,6 +222,13 @@
     <gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder">
     </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=WebContainer</attribute>
+        <reference name="Repository">
+            <gbean-name>*:name=Repository,*</gbean-name>
+        </reference>
+    </gbean>
 
     <gbean name="JBIBuilder" class="org.apache.geronimo.servicemix.deployment.ServiceMixConfigBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>

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=219858&r1=219857&r2=219858&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 Wed Jul 20 01:42:51
2005
@@ -151,6 +151,11 @@
     <gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder">
     </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=WebContainer</attribute>
+        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+    </gbean>
 
     <gbean name="JBIBuilder" class="org.apache.geronimo.servicemix.deployment.ServiceMixConfigBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>

Modified: 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=219858&r1=219857&r2=219858&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/jetty-config.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/jetty-config.xml Wed Jul 20 01:42:51 2005
@@ -28,11 +28,11 @@
     </dependency>
 
     <!-- default WAR container using Jetty -->
-    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl">
+    <gbean name="WebContainer" 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="JettyContainer"><name>WebContainer</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>
@@ -41,7 +41,7 @@
 
     <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty.connector.HTTPConnector">
         <attribute name="port">${PlanHTTPPort}</attribute>
-        <reference name="JettyContainer"><name>JettyWebContainer</name></reference>
+        <reference name="JettyContainer"><name>WebContainer</name></reference>
         <!--        <attribute name="MaxConnections">10</attribute>-->
         <!--        <attribute name="MaxIdleTime">10</attribute>-->
     </gbean>
@@ -54,6 +54,6 @@
         <attribute name="keyPassword">secret</attribute>
         <attribute name="needClientAuth">false</attribute>
         <attribute name="protocol">TLS</attribute>
-        <reference name="JettyContainer"><name>JettyWebContainer</name></reference>
+        <reference name="JettyContainer"><name>WebContainer</name></reference>
         <reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
     </gbean>

Modified: 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=219858&r1=219857&r2=219858&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml Wed Jul 20 01:42:51
2005
@@ -33,7 +33,7 @@
     <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="jettyContainerObjectName">geronimo.server:name=WebContainer,*</attribute>
     <attribute name="defaultServlets">geronimo.deployer:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/J2EEDeployer,*</attribute>
     <attribute name="pojoWebServiceTemplate">geronimo.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/RuntimeDeployer,J2EEServer=deployer,j2eeType=ServletWebServiceTemplate,name=POJOTemplate</attribute>
     <reference name="WebServiceBuilder">
@@ -73,11 +73,4 @@
     <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>
 

Modified: 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=219858&r1=219857&r2=219858&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml Wed Jul 20
01:42:51 2005
@@ -28,7 +28,7 @@
     <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="jettyContainerObjectName">geronimo.server:name=WebContainer,*</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>
@@ -62,11 +62,5 @@
 
     <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>
 

Modified: 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=219858&r1=219857&r2=219858&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/tomcat-config.xml Wed Jul 20 01:42:51 2005
@@ -110,7 +110,7 @@
     <!-- 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">
+    <gbean name="WebContainer" class="org.apache.geronimo.tomcat.TomcatContainer">
         <attribute name="catalinaHome">var/catalina</attribute>
         <reference name="engineGBean">
             <name>TomcatEngine</name>
@@ -137,7 +137,7 @@
             disableUploadTimeout=true
         </attribute>
         <reference name="TomcatContainer">
-            <name>TomcatWebContainer</name>
+            <name>WebContainer</name>
         </reference>
         <reference name="ServerInfo">
             <module>org/apache/geronimo/System</module>
@@ -155,7 +155,7 @@
             redirectPort=${PlanHTTPSPort}
         </attribute>
         <reference name="TomcatContainer">
-            <name>TomcatWebContainer</name>
+            <name>WebContainer</name>
         </reference>
         <reference name="ServerInfo">
             <module>org/apache/geronimo/System</module>
@@ -185,7 +185,7 @@
             keystoreFile=var/security/keystore
             keystorePass=secret
         </attribute>
-        <reference name="TomcatContainer"><name>TomcatWebContainer</name></reference>
+        <reference name="TomcatContainer"><name>WebContainer</name></reference>
         <reference name="ServerInfo">
             <module>org/apache/geronimo/System</module>
             <name>ServerInfo</name>

Modified: 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=219858&r1=219857&r2=219858&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/tomcat-deployer-config.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/tomcat-deployer-config.xml Wed Jul 20 01:42:51
2005
@@ -19,13 +19,8 @@
 
     <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>
+        <attribute name="tomcatContainerObjectName">geronimo.server:name=WebContainer,*</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>

Modified: 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=219858&r1=219857&r2=219858&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml Wed Jul 20
01:42:51 2005
@@ -19,13 +19,13 @@
 
     <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>
+        <attribute name="tomcatContainerObjectName">geronimo.server:name=WebContainer,*</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>
+        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
         <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
     </gbean>



Mime
View raw message