You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2009/08/20 17:26:18 UTC
svn commit: r806213 - in /geronimo/server/trunk: ./
framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/
plugins/activemq/activemq-ra/ plugins/connector-1_6/client-transaction-1_6/
plugins/connector-1_6/connector-dep...
Author: dwoods
Date: Thu Aug 20 15:26:18 2009
New Revision: 806213
URL: http://svn.apache.org/viewvc?rev=806213&view=rev
Log:
more required updates due to renaming of the connector and transaction artifacts to include -1_6 in r805984
Modified:
geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml
geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml
geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/pom.xml
geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=806213&r1=806212&r2=806213&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml Thu Aug 20 15:26:18 2009
@@ -14,7 +14,7 @@
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
<clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
- <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
+ <connectorDeployer>org.apache.geronimo.configs/connector-deployer-1_6/${geronimoVersion}/car</connectorDeployer>
<openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
<openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car</openejbcorbaDeployer>
<axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
Modified: geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=806213&r1=806212&r2=806213&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Thu Aug 20 15:26:18 2009
@@ -14,7 +14,7 @@
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
<clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
- <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
+ <connectorDeployer>org.apache.geronimo.configs/connector-deployer-1_6/${geronimoVersion}/car</connectorDeployer>
<openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
<openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car</openejbcorbaDeployer>
<axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
Modified: geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml?rev=806213&r1=806212&r2=806213&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml Thu Aug 20 15:26:18 2009
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
+ <artifactId>connector-deployer-1_6</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml?rev=806213&r1=806212&r2=806213&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/pom.xml Thu Aug 20 15:26:18 2009
@@ -30,7 +30,7 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-transaction-1_6</artifactId>
- <name>Geronimo Plugins, Connector :: Client transaction</name>
+ <name>Geronimo Plugins, Connector 1.6 :: Client transaction</name>
<packaging>car</packaging>
<dependencies>
Modified: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml?rev=806213&r1=806212&r2=806213&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml Thu Aug 20 15:26:18 2009
@@ -30,7 +30,7 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer-1_6</artifactId>
- <name>Geronimo Plugins, Connector :: Deployer</name>
+ <name>Geronimo Plugins, Connector 1.6 :: Deployer</name>
<packaging>car</packaging>
<description>
Modified: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml?rev=806213&r1=806212&r2=806213&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml Thu Aug 20 15:26:18 2009
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>transaction</artifactId>
+ <artifactId>transaction-1_6</artifactId>
<type>car</type>
</dependency>
<dependency>
@@ -78,7 +78,7 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>client-transaction</artifactId>
+ <artifactId>client-transaction-1_6</artifactId>
<type>car</type>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml?rev=806213&r1=806212&r2=806213&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml Thu Aug 20 15:26:18 2009
@@ -30,7 +30,7 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector-1_6</artifactId>
- <name>Geronimo Plugins, Connector :: Core</name>
+ <name>Geronimo Plugins, Connector 1.6 :: Core</name>
<dependencies>
<dependency>
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml?rev=806213&r1=806212&r2=806213&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml Thu Aug 20 15:26:18 2009
@@ -30,7 +30,7 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector-builder-1_6</artifactId>
- <name>Geronimo Plugins, Connector :: Builder</name>
+ <name>Geronimo Plugins, Connector 1.6 :: Builder</name>
<dependencies>
<dependency>
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/pom.xml?rev=806213&r1=806212&r2=806213&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-transaction-1_6/pom.xml Thu Aug 20 15:26:18 2009
@@ -30,7 +30,7 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction-1_6</artifactId>
- <name>Geronimo Plugins, Connector :: Transaction</name>
+ <name>Geronimo Plugins, Connector 1.6 :: Transaction</name>
<dependencies>
<dependency>
Modified: geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml?rev=806213&r1=806212&r2=806213&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/pom.xml Thu Aug 20 15:26:18 2009
@@ -30,7 +30,7 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction-1_6</artifactId>
- <name>Geronimo Plugins, Connector :: Transaction Manager (JTA11)</name>
+ <name>Geronimo Plugins, Connector 1.6 :: Transaction Manager (JTA11)</name>
<packaging>car</packaging>
<description>Geronimo transaction manager module.</description>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=806213&r1=806212&r2=806213&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Aug 20 15:26:18 2009
@@ -103,7 +103,7 @@
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${version}/car</j2eeDeployer>
<clientDeployer>org.apache.geronimo.configs/client-deployer/${version}/car</clientDeployer>
- <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${version}/car</connectorDeployer>
+ <connectorDeployer>org.apache.geronimo.configs/connector-deployer-1_6/${version}/car</connectorDeployer>
<openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${version}/car</openejbDeployer>
<openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</openejbcorbaDeployer>
<axisDeployer>org.apache.geronimo.configs/axis-deployer/${version}/car</axisDeployer>