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 2008/12/09 14:55:07 UTC
svn commit: r724700 - in /geronimo/server/trunk/plugins:
connector-1_6/geronimo-connector-builder-1_6/src/test/resources/
connector/geronimo-connector-builder/src/test/resources/ openejb/openejb/
openejb/openejb/src/main/history/
Author: dwoods
Date: Tue Dec 9 05:55:06 2008
New Revision: 724700
URL: http://svn.apache.org/viewvc?rev=724700&view=rev
Log:
GERONIMO-4337 some plans/configs are still using the old AMQ4 broker, which causes the server assembly to contain both and fail to start
Modified:
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/jms-plan.xml
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/jms-plan.xml
geronimo/server/trunk/plugins/openejb/openejb/pom.xml
geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/jms-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/jms-plan.xml?rev=724700&r1=724699&r2=724700&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/jms-plan.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/jms-plan.xml Tue Dec 9 05:55:06 2008
@@ -25,7 +25,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq-broker</artifactId>
+ <artifactId>${activemqString}-broker</artifactId>
<type>car</type>
</dependency>
</dependencies>
@@ -89,4 +89,4 @@
<config-property-setting name="PhysicalName">TestTopic1Physical</config-property-setting>
</adminobject-instance>
</adminobject>
-</connector>
\ No newline at end of file
+</connector>
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/jms-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/jms-plan.xml?rev=724700&r1=724699&r2=724700&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/jms-plan.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/resources/jms-plan.xml Tue Dec 9 05:55:06 2008
@@ -25,7 +25,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq-broker</artifactId>
+ <artifactId>${activemqString}-broker</artifactId>
<type>car</type>
</dependency>
</dependencies>
@@ -89,4 +89,4 @@
<config-property-setting name="PhysicalName">TestTopic1Physical</config-property-setting>
</adminobject-instance>
</adminobject>
-</connector>
\ No newline at end of file
+</connector>
Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=724700&r1=724699&r2=724700&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Tue Dec 9 05:55:06 2008
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq-broker</artifactId>
+ <artifactId>${activemqString}-broker</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=724700&r1=724699&r2=724700&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Tue Dec 9 05:55:06 2008
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>activemq-broker</artifactId>
+ <artifactId>${activemqString}-broker</artifactId>
<type>car</type>
</dependency>
<dependency>