geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1061108 - in /geronimo/server/branches/3.0-M2: plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml plugins/openejb/openejb/src/main/history/dependencies.xml plugins/tomcat/tomcat7/src/main/history/dependencies.xml pom.xml
Date Thu, 20 Jan 2011 02:55:38 GMT
Author: xiaming
Date: Thu Jan 20 02:55:38 2011
New Revision: 1061108

URL: http://svn.apache.org/viewvc?rev=1061108&view=rev
Log:
Set the default container to tomcat-web for 3.0-M2 branch, so that testsuite run against to
tomcat-web assembly

Modified:
    geronimo/server/branches/3.0-M2/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-M2/pom.xml

Modified: geronimo/server/branches/3.0-M2/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=1061108&r1=1061107&r2=1061108&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
Thu Jan 20 02:55:38 2011
@@ -76,4 +76,9 @@
         <artifactId>xbean-bundleutils</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1061108&r1=1061107&r2=1061108&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
Thu Jan 20 02:55:38 2011
@@ -137,6 +137,16 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-bundleutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-spec-corba</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=1061108&r1=1061107&r2=1061108&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
Thu Jan 20 02:55:38 2011
@@ -57,6 +57,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.ext.tomcat</groupId>
+        <artifactId>util</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-deployment</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/3.0-M2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/pom.xml?rev=1061108&r1=1061107&r2=1061108&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/pom.xml (original)
+++ geronimo/server/branches/3.0-M2/pom.xml Thu Jan 20 02:55:38 2011
@@ -2248,7 +2248,7 @@ only found in cxf
                             </assembly>
                         </assemblies>
 
-                        <defaultAssemblyId>jetty</defaultAssemblyId>
+                        <defaultAssemblyId>tomcat-web</defaultAssemblyId>
 
                         <optionSets>
                             <optionSet>



Mime
View raw message