geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r290600 - in /geronimo/trunk/modules/assembly: maven.xml src/plan/j2ee-runtime-deployer-plan.xml src/var/config/config.xml
Date Wed, 21 Sep 2005 02:11:11 GMT
Author: djencks
Date: Tue Sep 20 19:11:04 2005
New Revision: 290600

URL: http://svn.apache.org/viewcvs?rev=290600&view=rev
Log:
Make the ejb ws listener have the right name.  Needs to go in M5

Modified:
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/var/config/config.xml

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=290600&r1=290599&r2=290600&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Tue Sep 20 19:11:04 2005
@@ -279,6 +279,7 @@
         <j:set var="PlanLdapPort" value="1389"/>
         <j:if test="${context.getVariable('geronimo.web.container').equals('jetty')}">
             <echo>JETTY CONTAINER</echo>
+            <j:set var="PlanWebServerName" value="Jetty"/>
             <j:set var="PlanWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/web/jetty"/>
             <j:set var="PlanHTTPPort" value="8080"/>
             <j:set var="PlanHTTPSPort" value="8443"/>
@@ -290,6 +291,7 @@
         </j:if>
         <j:if test="${context.getVariable('geronimo.web.container').equals('tomcat')}">
             <echod>TOMCAT CONTAINER</echod>
+            <j:set var="PlanWebServerName" value="Tomcat"/>
             <j:set var="PlanWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/web/tomcat"/>
             <j:set var="PlanHTTPPort" value="8090"/>
             <j:set var="PlanHTTPSPort" value="8453"/>

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=290600&r1=290599&r2=290600&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 Tue Sep 20 19:11:04
2005
@@ -215,7 +215,7 @@
 
     <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>
+        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
         <reference name="WebServiceLinkTemplate">
             <name>WebServiceEJBLinkTemplate</name>
         </reference>

Modified: geronimo/trunk/modules/assembly/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.xml?rev=290600&r1=290599&r2=290600&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.xml Tue Sep 20 19:11:04 2005
@@ -15,6 +15,22 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
+    <configuration name="org/apache/geronimo/OfflineDeployer">
+        <gbean name="WebBuilder">
+            <attribute name="defaultNamespace">${PlanWebBuilderDefaultNamespace}</attribute>
+        </gbean>
+        <gbean name="EJBBuilder">
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/${PlanWebServerName},J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="org/apache/geronimo/RuntimeDeployer">
+        <gbean name="WebBuilder">
+            <attribute name="defaultNamespace">${PlanWebBuilderDefaultNamespace}</attribute>
+        </gbean>
+        <gbean name="EJBBuilder">
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/${PlanWebServerName},J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
+        </gbean>
+    </configuration>
     <configuration name="org/apache/geronimo/Jetty">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>



Mime
View raw message