geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r723662 - in /geronimo/server/trunk/plugins/activemq5: activemq5-broker/src/main/history/dependencies.xml geronimo-activemq5-ra/pom.xml geronimo-activemq5-ra/src/main/rar/META-INF/ra.xml pom.xml
Date Fri, 05 Dec 2008 08:52:25 GMT
Author: djencks
Date: Fri Dec  5 00:52:25 2008
New Revision: 723662

URL: http://svn.apache.org/viewvc?rev=723662&view=rev
Log:
tweak rar to amq 5.2.  dependencies for broker need to be re-examined

Removed:
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5-ra/src/main/rar/META-INF/ra.xml
Modified:
    geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq5/geronimo-activemq5-ra/pom.xml
    geronimo/server/trunk/plugins/activemq5/pom.xml

Modified: geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml?rev=723662&r1=723661&r2=723662&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq5/activemq5-broker/src/main/history/dependencies.xml
Fri Dec  5 00:52:25 2008
@@ -7,28 +7,33 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>system-database</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-activemq5</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-activemq5-management</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activeio-core</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>backport-util-concurrent</groupId>
-        <artifactId>backport-util-concurrent</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-core</artifactId>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activeio-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -42,13 +47,8 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>system-database</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-core</artifactId>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -57,18 +57,18 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-activemq5</artifactId>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-activemq5-management</artifactId>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activeio-core</artifactId>
-        <type>test-jar</type>
+        <groupId>backport-util-concurrent</groupId>
+        <artifactId>backport-util-concurrent</artifactId>
+        <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/activemq5/geronimo-activemq5-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/geronimo-activemq5-ra/pom.xml?rev=723662&r1=723661&r2=723662&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/geronimo-activemq5-ra/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/geronimo-activemq5-ra/pom.xml Fri Dec  5 00:52:25
2008
@@ -52,6 +52,12 @@
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <exclusions>
+
+                <exclusion>
+                    <groupId>org.apache.camel</groupId>
+                    <artifactId>camel-core</artifactId>
+                </exclusion>
+                <!--
                 <exclusion>
                     <groupId>mx4j</groupId>
                     <artifactId>mx4j</artifactId>
@@ -121,10 +127,11 @@
                     <groupId>javax.servlet</groupId>
                     <artifactId>servlet-api</artifactId>
                 </exclusion>
-                
+-->
                 <!--
                 FIXME: if/when amq updates to 1.1 spec, change this, for now exclude both
versions.
                 -->
+                <!--
                 <exclusion>
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
@@ -134,6 +141,7 @@
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
                 </exclusion>
+                -->
                 
                 <exclusion>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -167,6 +175,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-rar</artifactId>
+            <type>rar</type>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
     
     <!--
@@ -199,6 +214,34 @@
             </plugin>
             
             <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-dependency-plugin</artifactId>
+               <executions>
+                 <execution>
+                   <id>unpack</id>
+                   <phase>compile</phase>
+                   <goals>
+                     <goal>unpack</goal>
+                   </goals>
+                   <configuration>
+                       <artifactItems>
+                         <artifactItem>
+                           <groupId>org.apache.activemq</groupId>
+                           <artifactId>activemq-rar</artifactId>
+                           <type>rar</type>
+                           <overWrite>true</overWrite>
+                           <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                           <!--<destFileName>[ filename ]</destFileName>-->
+                           <includes>META-INF/ra.xml</includes>
+                           <!--<excludes>[ comma separated list of file filters
]</excludes>-->
+                         </artifactItem>
+                       </artifactItems>
+                   </configuration>
+                 </execution>
+               </executions>
+             </plugin>
+
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-rar-plugin</artifactId>
                 <configuration>

Modified: geronimo/server/trunk/plugins/activemq5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq5/pom.xml?rev=723662&r1=723661&r2=723662&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq5/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq5/pom.xml Fri Dec  5 00:52:25 2008
@@ -42,11 +42,9 @@
         <module>activemq5-ra</module>
         <module>geronimo-activemq5</module>
         <module>geronimo-activemq5-management</module>
-        <!-- remove until updated or replaced with new AMQ5 solution
         <module>activemq5-portlets</module>
         <module>activemq5-console-jetty</module>
         <module>activemq5-console-tomcat</module>
-        -->
         <module>activemq5-server</module>
   </modules>
 
@@ -55,7 +53,7 @@
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-core</artifactId>
-                <version>5.1.0</version>
+                <version>5.2.0</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -71,7 +69,13 @@
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-ra</artifactId>
-                <version>5.1.0</version>
+                <version>5.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-rar</artifactId>
+                <type>rar</type>
+                <version>5.2.0</version>
             </dependency>
 
             <dependency>



Mime
View raw message