Return-Path: 
 <scm-return-45357-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 34825 invoked from network); 20 Jan 2011 02:56:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 20 Jan 2011 02:56:04 -0000
Received: (qmail 73725 invoked by uid 500); 20 Jan 2011 02:56:04 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 73591 invoked by uid 500); 20 Jan 2011 02:56:02 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 73584 invoked by uid 99); 20 Jan 2011 02:56:02 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 02:56:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 02:56:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E649F23889E9; Thu, 20 Jan 2011 02:55:38 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: scm@geronimo.apache.org
From: xiaming@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110120025538.E649F23889E9@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>