You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2005/06/06 06:21:05 UTC
svn commit: r180212 -
/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
/geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
Author: jgenender
Date: Sun Jun 5 21:21:04 2005
New Revision: 180212
URL: http://svn.apache.org/viewcvs?rev=180212&view=rev
Log:
Added webservice integration for Tomcat
Modified:
geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.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=180212&r1=180211&r2=180212&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Sun Jun 5 21:21:04 2005
@@ -198,6 +198,10 @@
<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>
@@ -214,6 +218,7 @@
<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>
-->
@@ -251,12 +256,26 @@
<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="SkeletonGenerator"><gbean-name>openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</gbean-name></reference>-->
<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=180212&r1=180211&r2=180212&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 Jun 5 21:21:04 2005
@@ -137,6 +137,7 @@
<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>
-->
@@ -197,12 +198,27 @@
<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="SkeletonGenerator"><gbean-name>openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</gbean-name></reference>-->
<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"/>