Return-Path: 
 <scm-return-42997-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 28719 invoked from network); 8 Jun 2010 02:37:51 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 8 Jun 2010 02:37:51 -0000
Received: (qmail 89094 invoked by uid 500); 8 Jun 2010 02:37:51 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 89009 invoked by uid 500); 8 Jun 2010 02:37:50 -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 89002 invoked by uid 99); 8 Jun 2010 02:37:50 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jun 2010 02:37:50 +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; Tue, 08 Jun 2010 02:37:47 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6D51B23889DD; Tue,  8 Jun 2010 02:37:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r952513 - in /geronimo/server/branches/2.2: ./
 plugins/activemq/
 plugins/activemq/activemq-webconsole-jetty/
 plugins/activemq/activemq-webconsole-jetty/src/main/history/
 plugins/activemq/activemq-webconsole-tomcat/ plugins/activemq/activemq...
Date: Tue, 08 Jun 2010 02:37:25 -0000
To: scm@geronimo.apache.org
From: genspring@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100608023725.6D51B23889DD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: genspring
Date: Tue Jun  8 02:37:24 2010
New Revision: 952513

URL: http://svn.apache.org/viewvc?rev=952513&view=rev
Log:
GERONIMO-5357 Run ActiveMQ 5.4 in Geronimo 2.2.

Modified:
    geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/pom.xml
    geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/pom.xml
    geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/plugins/activemq/pom.xml
    geronimo/server/branches/2.2/plugins/spring/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/pom.xml

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/pom.xml?rev=952513&r1=952512&r2=952513&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/pom.xml Tue Jun  8 02:37:24 2010
@@ -108,12 +108,16 @@
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
+                    <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-websocket</artifactId>
                 </exclusion>
+<!--                 <exclusion> -->
+<!--                     <groupId>org.eclipse.jetty</groupId> -->
+<!--                     <artifactId>jetty-util</artifactId> -->
+<!--                 </exclusion> -->
                 <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-continuation</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml?rev=952513&r1=952512&r2=952513&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml Tue Jun  8 02:37:24 2010
@@ -32,16 +32,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>jivesoftware</groupId>
-        <artifactId>smack</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>jivesoftware</groupId>
-        <artifactId>smackx</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>net.sf.josql</groupId>
         <artifactId>gentlyweb-utils</artifactId>
         <type>jar</type>
@@ -117,13 +107,18 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.fusesource.commonman</groupId>
-        <artifactId>commons-management</artifactId>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>stax2-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-aop</artifactId>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>woodstox-core-asl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.fusesource.commonman</groupId>
+        <artifactId>commons-management</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -152,6 +147,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>xmlpull</groupId>
         <artifactId>xmlpull</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/pom.xml?rev=952513&r1=952512&r2=952513&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/pom.xml Tue Jun  8 02:37:24 2010
@@ -110,8 +110,16 @@
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>jetty-util</artifactId>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-websocket</artifactId>
+                </exclusion>
+<!--                 <exclusion> -->
+<!--                     <groupId>org.eclipse.jetty</groupId> -->
+<!--                     <artifactId>jetty-util</artifactId> -->
+<!--                 </exclusion> -->
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-continuation</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -199,7 +207,11 @@
                 <exclusion>
                     <groupId>taglibs</groupId>
                     <artifactId>standard</artifactId>
-
+                    
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml?rev=952513&r1=952512&r2=952513&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml Tue Jun  8 02:37:24 2010
@@ -32,16 +32,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>jivesoftware</groupId>
-        <artifactId>smack</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>jivesoftware</groupId>
-        <artifactId>smackx</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>net.sf.josql</groupId>
         <artifactId>gentlyweb-utils</artifactId>
         <type>jar</type>
@@ -117,13 +107,18 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.fusesource.commonman</groupId>
-        <artifactId>commons-management</artifactId>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>stax2-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-aop</artifactId>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>woodstox-core-asl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.fusesource.commonman</groupId>
+        <artifactId>commons-management</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -152,6 +147,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>xmlpull</groupId>
         <artifactId>xmlpull</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/2.2/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/pom.xml?rev=952513&r1=952512&r2=952513&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/activemq/pom.xml Tue Jun  8 02:37:24 2010
@@ -63,7 +63,7 @@
     </profiles>
 
     <properties>
-        <activemqVersion>5.3.1</activemqVersion>
+        <activemqVersion>5.4-SNAPSHOT</activemqVersion>
     </properties>
 
     <dependencyManagement>

Modified: geronimo/server/branches/2.2/plugins/spring/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/spring/src/main/history/dependencies.xml?rev=952513&r1=952512&r2=952513&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/spring/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/2.2/plugins/spring/src/main/history/dependencies.xml Tue Jun  8 02:37:24 2010
@@ -7,12 +7,27 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>aopalliance</groupId>
+        <artifactId>aopalliance</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>jee-specs</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-asm</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
         <type>jar</type>
     </dependency>
@@ -28,6 +43,11 @@
     </dependency>
     <dependency>
         <groupId>org.springframework</groupId>
+        <artifactId>spring-expression</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=952513&r1=952512&r2=952513&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Tue Jun  8 02:37:24 2010
@@ -70,7 +70,7 @@
         <cxfVersion>2.1.9</cxfVersion>
         <axis2Version>1.5.1</axis2Version>
         <axiomVersion>1.2.8</axiomVersion>
-        <springVersion>2.5.6</springVersion>
+        <springVersion>3.0.1.RELEASE</springVersion>
         <openjpaVersion>1.2.2</openjpaVersion>
         <xbeanVersion>3.7</xbeanVersion>
         <!-- For now, use XBean 3.6 to avoid jndi test failures on 3.7 -->