Return-Path: 
 <scm-return-37096-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 49052 invoked from network); 17 Jun 2009 06:09:51 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 17 Jun 2009 06:09:51 -0000
Received: (qmail 12648 invoked by uid 500); 17 Jun 2009 06:10:02 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 12567 invoked by uid 500); 17 Jun 2009 06:10: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 12558 invoked by uid 99); 17 Jun 2009 06:10:02 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2009 06:10: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; Wed, 17 Jun 2009 06:09:59 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id D9CE4238888C; Wed, 17 Jun 2009 06:09:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r785481 - in /geronimo/server/trunk/plugins/activemq:
 activemq-broker/src/main/history/dependencies.xml
 activemq-webconsole-jetty/src/main/history/dependencies.xml
 activemq-webconsole-tomcat/src/main/history/dependencies.xml
Date: Wed, 17 Jun 2009 06:09:39 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090617060939.D9CE4238888C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Wed Jun 17 06:09:39 2009
New Revision: 785481

URL: http://svn.apache.org/viewvc?rev=785481&view=rev
Log:
GERONIMO-4692 My build works only with org.springframework:spring-aop removed from these three plugins. We might need to add this dependency back after sorting

Modified:
    geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml?rev=785481&r1=785480&r2=785481&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml Wed Jun 17 06:09:39 2009
@@ -7,18 +7,13 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>system-database</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-activemq</artifactId>
+        <groupId>backport-util-concurrent</groupId>
+        <artifactId>backport-util-concurrent</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-activemq-management</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activeio-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -28,7 +23,12 @@
     </dependency>
     <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activeio-core</artifactId>
+        <artifactId>kahadb</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.activemq.protobuf</groupId>
+        <artifactId>activemq-protobuf</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -37,23 +37,23 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-spring</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>system-database</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>kahadb</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-activemq</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq.protobuf</groupId>
-        <artifactId>activemq-protobuf</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-activemq-management</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>backport-util-concurrent</groupId>
-        <artifactId>backport-util-concurrent</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-spring</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml?rev=785481&r1=785480&r2=785481&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml Wed Jun 17 06:09:39 2009
@@ -7,118 +7,113 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>${jetty}</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jasper</artifactId>
-        <type>car</type>
+        <groupId>aopalliance</groupId>
+        <artifactId>aopalliance</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>activemq-broker</artifactId>
-        <type>car</type>
+        <groupId>commons-pool</groupId>
+        <artifactId>commons-pool</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-web</artifactId>
+        <groupId>jdom</groupId>
+        <artifactId>jdom</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-camel</artifactId>
+        <groupId>jivesoftware</groupId>
+        <artifactId>smackx</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-jms</artifactId>
+        <groupId>opensymphony</groupId>
+        <artifactId>sitemesh</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-spring</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-camel</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-core</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-console</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-tx</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-pool</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-aop</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-web</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>aopalliance</groupId>
-        <artifactId>aopalliance</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-xmpp</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-jms</artifactId>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-pool</groupId>
-        <artifactId>commons-pool</artifactId>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-jms</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context-support</artifactId>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-spring</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-pool</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>activemq-broker</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
-        <groupId>rome</groupId>
-        <artifactId>rome</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jasper</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
-        <groupId>jdom</groupId>
-        <artifactId>jdom</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jetty7</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>spring-webmvc</artifactId>
+        <artifactId>spring-context-support</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xmlpull</groupId>
-        <artifactId>xmlpull</artifactId>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jms</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-xmpp</artifactId>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-tx</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>jivesoftware</groupId>
-        <artifactId>smackx</artifactId>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-webmvc</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-console</artifactId>
+        <groupId>rome</groupId>
+        <artifactId>rome</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>opensymphony</groupId>
-        <artifactId>sitemesh</artifactId>
+        <groupId>xmlpull</groupId>
+        <artifactId>xmlpull</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml?rev=785481&r1=785480&r2=785481&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml Wed Jun 17 06:09:39 2009
@@ -7,118 +7,113 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>tomcat6</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jasper</artifactId>
-        <type>car</type>
+        <groupId>aopalliance</groupId>
+        <artifactId>aopalliance</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>activemq-broker</artifactId>
-        <type>car</type>
+        <groupId>commons-pool</groupId>
+        <artifactId>commons-pool</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-web</artifactId>
+        <groupId>jdom</groupId>
+        <artifactId>jdom</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-camel</artifactId>
+        <groupId>jivesoftware</groupId>
+        <artifactId>smackx</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-jms</artifactId>
+        <groupId>opensymphony</groupId>
+        <artifactId>sitemesh</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-spring</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-camel</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-core</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-console</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-tx</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-pool</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-aop</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-web</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>aopalliance</groupId>
-        <artifactId>aopalliance</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-xmpp</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-jms</artifactId>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-pool</groupId>
-        <artifactId>commons-pool</artifactId>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-jms</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context-support</artifactId>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-spring</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-pool</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>activemq-broker</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
-        <groupId>rome</groupId>
-        <artifactId>rome</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jasper</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
-        <groupId>jdom</groupId>
-        <artifactId>jdom</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>tomcat6</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>spring-webmvc</artifactId>
+        <artifactId>spring-context-support</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xmlpull</groupId>
-        <artifactId>xmlpull</artifactId>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jms</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-xmpp</artifactId>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-tx</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>jivesoftware</groupId>
-        <artifactId>smackx</artifactId>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-webmvc</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-console</artifactId>
+        <groupId>rome</groupId>
+        <artifactId>rome</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>opensymphony</groupId>
-        <artifactId>sitemesh</artifactId>
+        <groupId>xmlpull</groupId>
+        <artifactId>xmlpull</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>