geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r481184 - in /geronimo/server/trunk/assemblies/geronimo-jetty-j2ee: pom.xml src/main/var/config/config.xml
Date Fri, 01 Dec 2006 08:36:14 GMT
Author: djencks
Date: Fri Dec  1 00:36:12 2006
New Revision: 481184

URL: http://svn.apache.org/viewvc?view=rev&rev=481184
Log:
include jetty-deployer explicitly, make it easier to turn on corba, remove non-existent config
remains

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml?view=diff&rev=481184&r1=481183&r2=481184
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml Fri Dec  1 00:36:12 2006
@@ -230,6 +230,12 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-clustering-builder-wadi</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?view=diff&rev=481184&r1=481183&r2=481184
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Fri
Dec  1 00:36:12 2006
@@ -73,13 +73,6 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/j2ee-corba-sun/${version}/car" load="false">
-        <gbean name="NameServer">
-            <attribute name="port">${PlanCOSSunNamingPort}</attribute>
-            <attribute name="host">${PlanCOSNamingHost}</attribute>
-        </gbean>
-    </module>
-
     <module name="org.apache.geronimo.configs/system-database/${version}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -123,7 +116,7 @@
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
         </gbean>
     </module>
-    
+
     <module name="org.apache.geronimo.configs/connector-deployer/${version}/car">
         <gbean name="ResourceRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
@@ -162,7 +155,9 @@
         </gbean>
 
     </module>
-    
+
+    <module name="org.apache.geronimo.configs/openejb-corba-deployer/${version}/car" load="false"/>
+
     <module name="org.apache.geronimo.configs/client-deployer/${version}/car">
     </module>
 



Mime
View raw message