Re: svn commit: r520132 - in /geronimo/server/trunk: ./ applications/console/geronimo-console-standard/src/main/resources/ assemblies/geronimo-boilerplate-jee5/ configs/activemq/ maven-plugins/car-maven-plugin/src/site/apt/ modules/ modules/ge-activemq-rar...

Tue, 20 Mar 2007 04:20:25 -0800

We might need to watch out for windows path length problems as a result of this change -- they were the reason for the former peculiar name. 

thanks
david jencks

On Mar 19, 2007, at 6:35 PM, [EMAIL PROTECTED] wrote:


Author: jdillon
Date: Mon Mar 19 15:35:23 2007
New Revision: 520132

URL: http://svn.apache.org/viewvc?view=rev&rev=520132
Log:
 [EMAIL PROTECTED]:  jason | 2007-03-19 15:01:06 -0700
 (GERONIMO-2980) Rename ge-activemq-rar to geronimo-activemq-ra

Added:
    geronimo/server/trunk/modules/geronimo-activemq-ra/
- copied from r519919, geronimo/server/trunk/modules/ge- activemq-rar/ 
Removed:
    geronimo/server/trunk/modules/ge-activemq-rar/
Modified:
    geronimo/server/trunk/   (props changed)
geronimo/server/trunk/applications/console/geronimo-console- standard/src/main/resources/jms-resource-providers.properties 
    geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml
    geronimo/server/trunk/configs/activemq/pom.xml
geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/ apt/usage.apt geronimo/server/trunk/modules/geronimo-activemq-ra/pom.xml (contents, props changed) geronimo/server/trunk/modules/geronimo-activemq-ra/src/main/rar/ META-INF/ra.xml (props changed) 
    geronimo/server/trunk/modules/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/ jms-ear/src/main/resources/META-INF/geronimo-application.xml 

Propchange: geronimo/server/trunk/
---------------------------------------------------------------------- -------- 
--- svk:merge (original)
+++ svk:merge Mon Mar 19 15:35:23 2007
@@ -1,3 +1,3 @@
13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/ m2migration:428851 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/ trunk:428882 
-bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/trunk-reorg:6670
+bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/trunk-reorg:6690
Modified: geronimo/server/trunk/applications/console/geronimo- console-standard/src/main/resources/jms-resource-providers.properties URL: http://svn.apache.org/viewvc/geronimo/server/trunk/ applications/console/geronimo-console-standard/src/main/resources/ jms-resource-providers.properties? view=diff&rev=520132&r1=520131&r2=520132 ====================================================================== ======== --- geronimo/server/trunk/applications/console/geronimo-console- standard/src/main/resources/jms-resource-providers.properties (original) +++ geronimo/server/trunk/applications/console/geronimo-console- standard/src/main/resources/jms-resource-providers.properties Mon Mar 19 15:35:23 2007 
@@ -19,6 +19,6 @@
 ##

 provider.activemq.name=ActiveMQ
-provider.activemq.rar=org.apache.geronimo.modules/ge-activemq-rar// rar +provider.activemq.rar=org.apache.geronimo.modules/geronimo- activemq-ra//rar provider.activemq.dependency=org.apache.geronimo.configs/activemq- broker//car
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate- jee5/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/ geronimo-boilerplate-jee5/pom.xml? view=diff&rev=520132&r1=520131&r2=520132 ====================================================================== ======== --- geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/ pom.xml (original) +++ geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/ pom.xml Mon Mar 19 15:35:23 2007 
@@ -73,7 +73,7 @@
                             <artifacts>
                                 <artifact>
<groupId>org.apache.geronimo.modules</groupId> - <artifactId>ge-activemq-rar</ artifactId> + <artifactId>geronimo-activemq- ra</artifactId> 
                                     <version>${version}</version>
                                     <type>rar</type>
                                 </artifact>

Modified: geronimo/server/trunk/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ activemq/pom.xml?view=diff&rev=520132&r1=520131&r2=520132 ====================================================================== ======== 
--- geronimo/server/trunk/configs/activemq/pom.xml (original)
+++ geronimo/server/trunk/configs/activemq/pom.xml Mon Mar 19 15:35:23 2007 
@@ -45,7 +45,7 @@

         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>ge-activemq-rar</artifactId>
+            <artifactId>geronimo-activemq-ra</artifactId>
             <version>${version}</version>
             <type>rar</type>
             <scope>test</scope>
@@ -75,7 +75,7 @@
                     </deploymentConfigs>
                     <module>
<groupId>org.apache.geronimo.modules</ groupId> 
-                        <artifactId>ge-activemq-rar</artifactId>
+                        <artifactId>geronimo-activemq-ra</artifactId>
                         <version>${version}</version>
                         <type>rar</type>
                     </module>
Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/ site/apt/usage.apt URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven- plugins/car-maven-plugin/src/site/apt/usage.apt? view=diff&rev=520132&r1=520131&r2=520132 ====================================================================== ======== --- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/ apt/usage.apt (original) +++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/site/ apt/usage.apt Mon Mar 19 15:35:23 2007 
@@ -178,7 +178,7 @@
                 <artifacts>
                     <artifactItem>
<groupId>org.apache.geronimo.modules</ groupId> 
-                        <artifactId>ge-activemq-rar</artifactId>
+                        <artifactId>geronimo-activemq-ra</artifactId>
                         <type>rar</type>
                     </artifactItem>
                 </artifacts>

Modified: geronimo/server/trunk/modules/geronimo-activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ geronimo-activemq-ra/pom.xml?view=diff&rev=520132&r1=519919&r2=520132 ====================================================================== ======== --- geronimo/server/trunk/modules/geronimo-activemq-ra/pom.xml (original) +++ geronimo/server/trunk/modules/geronimo-activemq-ra/pom.xml Mon Mar 19 15:35:23 2007 
@@ -29,12 +29,12 @@
         <relativePath>../pom.xml</relativePath>
     </parent>

-    <artifactId>ge-activemq-rar</artifactId>
-    <name>Geronimo :: ActiveMQ Embedded RAR</name>
+    <artifactId>geronimo-activemq-ra</artifactId>
+    <name>Geronimo :: ActiveMQ Resource Adapter</name>
     <packaging>rar</packaging>

     <description>
- Resource Adapter configuration for using ActiveMQ as a bundled JMS provider. 
+        Resource Adapter for using ActiveMQ in Geronimo.
     </description>

     <!--
@@ -43,7 +43,6 @@
     -->

     <dependencies>
-
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
@@ -117,17 +116,20 @@
                     <groupId>javax.servlet</groupId>
                     <artifactId>servlet-api</artifactId>
                 </exclusion>
-
- <!-- TODO if/when amq updates to 1.1 spec, change this --> 
+
+                <!--
+ 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> 
                 </exclusion>
+
                 <exclusion>
                     <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</ artifactId> 
                 </exclusion>
-
+
                 <exclusion>
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -137,7 +139,6 @@
                     <groupId>org.apache.activemq</groupId>
                     <artifactId>activeio-core</artifactId>
                 </exclusion>
-
             </exclusions>
         </dependency>

@@ -161,7 +162,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
     </dependencies>

     <build>

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ pom.xml?view=diff&rev=520132&r1=520131&r2=520132 ====================================================================== ======== 
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Mon Mar 19 15:35:23 2007
@@ -41,7 +41,7 @@

     <modules>
         <module>geronimo-activation</module>
-        <module>ge-activemq-rar</module>
+        <module>geronimo-activemq-ra</module>
         <module>geronimo-activemq</module>
         <module>geronimo-activemq-management</module>
         <module>geronimo-axis</module>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms- tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/ enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/ geronimo-application.xml?view=diff&rev=520132&r1=520131&r2=520132 ====================================================================== ======== --- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/ jms-ear/src/main/resources/META-INF/geronimo-application.xml (original) +++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/ jms-ear/src/main/resources/META-INF/geronimo-application.xml Mon Mar 19 15:35:23 2007 
@@ -62,7 +62,7 @@
       </module>
       <ext-module>
         <connector>TestJMS</connector>
- <external-path>org.apache.geronimo.modules/ge-activemq-rar/ ${version}/rar</external-path> + <external-path>org.apache.geronimo.modules/geronimo- activemq-ra/${version}/rar</external-path> <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/ connector-1.1"> 
           <resourceadapter>
             <resourceadapter-instance>

Reply via email to