geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r520160 - in /geronimo/server/trunk: ./ assemblies/geronimo-jetty6-jee5/ assemblies/geronimo-jetty6-jee5/src/main/var/config/ assemblies/geronimo-tomcat6-jee5/ assemblies/geronimo-tomcat6-jee5/src/main/var/config/ configs/ configs/activemq-...
Date Mon, 19 Mar 2007 23:03:27 GMT
Author: jdillon
Date: Mon Mar 19 16:03:26 2007
New Revision: 520160

URL: http://svn.apache.org/viewvc?view=rev&rev=520160
Log:
 r6701@Bliss:  jason | 2007-03-19 16:02:03 -0700
 (GERONIMO-2980) Rename configs/activemq to configs/activemq-ra

Added:
    geronimo/server/trunk/configs/activemq-ra/
      - copied from r520135, geronimo/server/trunk/configs/activemq/
Removed:
    geronimo/server/trunk/configs/activemq/
Modified:
    geronimo/server/trunk/   (props changed)
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
    geronimo/server/trunk/configs/activemq-ra/pom.xml
    geronimo/server/trunk/configs/openejb/pom.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/modules/geronimo-openejb-builder/geronimo-openejb.xml

Propchange: geronimo/server/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Mar 19 16:03:26 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:6700
+bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/trunk-reorg:6701

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml?view=diff&rev=520160&r1=520159&r2=520160
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Mon Mar 19 16:03:26 2007
@@ -165,7 +165,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq</artifactId>
+            <artifactId>activemq-ra</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=520160&r1=520159&r2=520160
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml Mon
Mar 19 16:03:26 2007
@@ -85,7 +85,7 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/activemq/${version}/car"/>
+    <module name="org.apache.geronimo.configs/activemq-ra/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/myfaces/${version}/car"/>
 

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml?view=diff&rev=520160&r1=520159&r2=520160
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml Mon Mar 19 16:03:26 2007
@@ -151,7 +151,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq</artifactId>
+            <artifactId>activemq-ra</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml?view=diff&rev=520160&r1=520159&r2=520160
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
Mon Mar 19 16:03:26 2007
@@ -85,7 +85,7 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/activemq/${version}/car"/>
+    <module name="org.apache.geronimo.configs/activemq-ra/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/tomcat6/${version}/car">
         <!-- To disable accesslogging uncomment the following lines

Modified: geronimo/server/trunk/configs/activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/activemq-ra/pom.xml?view=diff&rev=520160&r1=520135&r2=520160
==============================================================================
--- geronimo/server/trunk/configs/activemq-ra/pom.xml (original)
+++ geronimo/server/trunk/configs/activemq-ra/pom.xml Mon Mar 19 16:03:26 2007
@@ -29,8 +29,8 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>activemq</artifactId>
-    <name>Geronimo Configs :: ActiveMQ</name>
+    <artifactId>activemq-ra</artifactId>
+    <name>Geronimo Configs :: ActiveMQ Resource Adapter</name>
     <packaging>car</packaging>
     
     <dependencies>
@@ -58,7 +58,6 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-
 
     </dependencies>
     

Modified: geronimo/server/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/pom.xml?view=diff&rev=520160&r1=520159&r2=520160
==============================================================================
--- geronimo/server/trunk/configs/openejb/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb/pom.xml Mon Mar 19 16:03:26 2007
@@ -65,7 +65,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq</artifactId>
+            <artifactId>activemq-ra</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=520160&r1=520159&r2=520160
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Mon Mar 19 16:03:26 2007
@@ -105,7 +105,7 @@
     </build>
 
     <modules>
-        <module>activemq</module>
+        <module>activemq-ra</module>
         <module>activemq-broker</module>
         <module>axis</module>
         <module>axis-deployer</module>

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/geronimo-openejb.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/geronimo-openejb.xml?view=diff&rev=520160&r1=520159&r2=520160
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/geronimo-openejb.xml (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/geronimo-openejb.xml Mon Mar 19
16:03:26 2007
@@ -45,7 +45,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>activemq</artifactId>
+                <artifactId>activemq-ra</artifactId>
                 <type>car</type>
             </dependency>
         </dependencies>



Mime
View raw message