You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/04/26 22:31:22 UTC

svn commit: r938224 - in /geronimo/server/trunk/plugins/activemq: activemq-broker/ geronimo-activemq-blueprint/pom.xml geronimo-activemq/ pom.xml

Author: gawor
Date: Mon Apr 26 20:31:22 2010
New Revision: 938224

URL: http://svn.apache.org/viewvc?rev=938224&view=rev
Log:
Remove old (non-blueprint) based activemq modules

Removed:
    geronimo/server/trunk/plugins/activemq/activemq-broker/
    geronimo/server/trunk/plugins/activemq/geronimo-activemq/
Modified:
    geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
    geronimo/server/trunk/plugins/activemq/pom.xml

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml?rev=938224&r1=938223&r2=938224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml Mon Apr 26 20:31:22 2010
@@ -60,16 +60,6 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.spring.framework</groupId>
-                    <artifactId>spring-context</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -82,31 +72,12 @@
             <artifactId>activeio-core</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-        <!--<groupId>org.springframework</groupId>-->
-        <!--<artifactId>spring-core</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-        <!--<groupId>org.springframework</groupId>-->
-        <!--<artifactId>spring-beans</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-        <!--<groupId>org.springframework</groupId>-->
-        <!--<artifactId>spring-context</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-        <!--<groupId>org.springframework</groupId>-->
-        <!--<artifactId>spring-web</artifactId>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-blueprint</artifactId>
             <version>3.7-SNAPSHOT</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>org.apache.aries.blueprint</artifactId>

Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=938224&r1=938223&r2=938224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Mon Apr 26 20:31:22 2010
@@ -34,33 +34,25 @@
     </description>
 
     <modules>
-        <module>activemq-broker</module>
         <module>activemq-broker-blueprint</module>
         <module>geronimo-activemq-ra</module>
         <module>activemq-ra</module>
-        <module>geronimo-activemq</module>
         <module>geronimo-activemq-blueprint</module>
         <module>geronimo-activemq-management</module>
-        <module>activemq-portlets</module>
+        <!--<module>activemq-portlets</module>-->
         <!--<module>activemq-console-jetty</module>-->
         <!--<module>activemq-console-tomcat</module>-->
         <!--<module>activemq-webconsole-jetty</module>-->
         <!--<module>activemq-webconsole-tomcat</module>-->
         <!--<module>activemq-webconsole</module>-->
-        <module>activemq-jetty-server</module>
+        <!--<module>activemq-server</module>-->
     </modules>
 
     <profiles>
         <profile>
-            <id>it</id>
+            <id>mini-servers</id>
             <modules>
-                <module>activemq-server</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>all-subprojects</id>
-            <modules>
-                <module>activemq-server</module>
+                <module>activemq-jetty-server</module>
             </modules>
         </profile>
     </profiles>