geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r355135 - in /geronimo/trunk/assemblies: j2ee-installer/src/var/config/config.xml j2ee-jetty-server/src/var/config/config.xml j2ee-tomcat-server/src/var/config/config.xml
Date Thu, 08 Dec 2005 16:34:35 GMT
Author: djencks
Date: Thu Dec  8 08:34:30 2005
New Revision: 355135

URL: http://svn.apache.org/viewcvs?rev=355135&view=rev
Log:
GERONIMO-1313 bad listener object name

Modified:
    geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml
    geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml

Modified: geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml?rev=355135&r1=355134&r2=355135&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml Thu Dec  8 08:34:30
2005
@@ -73,21 +73,11 @@
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
     <configuration name="geronimo/welcome-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/servlets-examples-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/jsp-examples-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/webconsole-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/uddi-jetty/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
-        <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
-        </gbean>
-        <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
-        </gbean>
-    </configuration>
     <configuration name="geronimo/tomcat/${pom.currentVersion}/car" load="false">
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
@@ -105,11 +95,21 @@
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car" load="false"/>
     <configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car" load="false"/>
     <configuration name="geronimo/servlets-examples-tomcat/${pom.currentVersion}/car"
load="false"/>
     <configuration name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car" load="false"/>
     <configuration name="geronimo/webconsole-tomcat/${pom.currentVersion}/car" load="false"/>
     <configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car" load="false"/>
+    <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
+        <gbean name="WebBuilder">
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
+        </gbean>
+        <gbean name="EJBBuilder">
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/jetty/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car" load="false"/>
 
 </attributes>

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=355135&r1=355134&r2=355135&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml Thu Dec  8 08:34:30
2005
@@ -79,7 +79,7 @@
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
         </gbean>
         <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/jetty/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
         </gbean>
     </configuration>
     <configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=355135&r1=355134&r2=355135&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml Thu Dec  8 08:34:30
2005
@@ -82,10 +82,10 @@
     <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
     <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
         </gbean>
         <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/tomcat/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
         </gbean>
     </configuration>
     <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>



Mime
View raw message