geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r423612 - in /geronimo/sandbox/svkmerge/m2migration/m2-assemblies: geronimo-jetty-j2ee/src/main/var/config/config.xml geronimo-tomcat-j2ee/pom.xml geronimo-tomcat-j2ee/src/main/var/config/config.xml
Date Wed, 19 Jul 2006 21:14:22 GMT
Author: jdillon
Date: Wed Jul 19 14:14:21 2006
New Revision: 423612

URL: http://svn.apache.org/viewvc?rev=423612&view=rev
Log:
Keep jetty and tomcat j2ee assemblies in sync

Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?rev=423612&r1=423611&r2=423612&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
Wed Jul 19 14:14:21 2006
@@ -135,10 +135,14 @@
     
     <module name="org.apache.geronimo.configs/webconsole-jetty/${pom.version}/car"/>
     
-    <!--<module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car" load="false"/>-->
+    <!--
+    <module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car" load="false"/>
+    -->
     
-    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"
/>
+    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"/>
     
-    <!--<module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"
/>-->
+    <!--
+    <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
+    -->
     
 </attributes>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml?rev=423612&r1=423611&r2=423612&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml Wed Jul
19 14:14:21 2006
@@ -306,6 +306,13 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>sharedlib</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>online-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?rev=423612&r1=423611&r2=423612&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
Wed Jul 19 14:14:21 2006
@@ -142,9 +142,9 @@
     
     <module name="org.apache.geronimo.configs/welcome-tomcat/${pom.version}/car"/>
     
-    <!--
     <module name="org.apache.geronimo.configs/webconsole-tomcat/${pom.version}/car"/>
     
+    <!--
     <module name="org.apache.geronimo.configs/uddi-tomcat/${pom.version}/car" load="false"/>
     -->
     



Mime
View raw message