You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/05/13 18:34:50 UTC
svn commit: r406127 - in /geronimo/branches/1.1:
assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/
configs/activemq/ configs/daytrader-jetty/src/plan/
configs/daytrader-tomcat/src/plan/ modules/activemq-embedded-rar/
modules/activemq-embedde...
Author: djencks
Date: Sat May 13 09:34:49 2006
New Revision: 406127
URL: http://svn.apache.org/viewcvs?rev=406127&view=rev
Log:
GERONIMO-2021 backport activemq-embedded-rar
Added:
geronimo/branches/1.1/modules/activemq-embedded-rar/
- copied from r391989, geronimo/trunk/modules/activemq-embedded-rar/
geronimo/branches/1.1/modules/activemq-embedded-rar/LICENSE.txt
- copied unchanged from r405917, geronimo/trunk/modules/activemq-embedded-rar/LICENSE.txt
geronimo/branches/1.1/modules/activemq-embedded-rar/NOTICE.txt
- copied unchanged from r405917, geronimo/trunk/modules/activemq-embedded-rar/NOTICE.txt
geronimo/branches/1.1/modules/activemq-embedded-rar/maven.xml
geronimo/branches/1.1/modules/activemq-embedded-rar/pom.xml
- copied unchanged from r405917, geronimo/trunk/modules/activemq-embedded-rar/pom.xml
geronimo/branches/1.1/modules/activemq-embedded-rar/project.properties
- copied unchanged from r405917, geronimo/trunk/modules/activemq-embedded-rar/project.properties
geronimo/branches/1.1/modules/activemq-embedded-rar/project.xml
- copied, changed from r405917, geronimo/trunk/modules/activemq-embedded-rar/project.xml
geronimo/branches/1.1/modules/activemq-embedded-rar/src/
- copied from r405917, geronimo/trunk/modules/activemq-embedded-rar/src/
Modified:
geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml
geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml
geronimo/branches/1.1/configs/activemq/project.properties
geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml
geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml
geronimo/branches/1.1/modules/activemq-embedded-rar/src/rar/META-INF/ra.xml
Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml?rev=406127&r1=406126&r2=406127&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml Sat May 13 09:34:49 2006
@@ -506,9 +506,9 @@
<!-- packages we include for others to use, mostly rars -->
<dependency>
<!-- included to make additional deployments easier -->
- <groupId>activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>${activemq_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-activemq-embedded-rar</artifactId>
+ <version>${pom.currentVersion}</version>
<type>rar</type>
<properties>
<geronimo.assemble>repository</geronimo.assemble>
Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml?rev=406127&r1=406126&r2=406127&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/project.xml Sat May 13 09:34:49 2006
@@ -464,7 +464,7 @@
</properties>
</dependency>
- <!--dependencies for online-deployer -->
+ <!--dependencies for online-deployer -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
@@ -506,9 +506,9 @@
<!-- packages we include for others to use, mostly rars -->
<dependency>
<!-- included to make additional deployments easier -->
- <groupId>activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>${activemq_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-activemq-embedded-rar</artifactId>
+ <version>${pom.currentVersion}</version>
<type>rar</type>
<properties>
<geronimo.assemble>repository</geronimo.assemble>
Modified: geronimo/branches/1.1/configs/activemq/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/activemq/project.properties?rev=406127&r1=406126&r2=406127&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/activemq/project.properties (original)
+++ geronimo/branches/1.1/configs/activemq/project.properties Sat May 13 09:34:49 2006
@@ -21,7 +21,7 @@
maven.multiproject.type=car
-geronimo.packaging.moduleFile=${maven.repo.local}/activemq/rars/activemq-ra-${activemq_version}.rar
+geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/rars/geronimo-activemq-embedded-rar-${pom.currentVersion}.rar
# ensure eclipse project name is unique (used in eclipse plugin V1.11 onwards)
# Also will cause all config projects to be grouped together when imported into eclipse.
Modified: geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml?rev=406127&r1=406126&r2=406127&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml Sat May 13 09:34:49 2006
@@ -522,7 +522,7 @@
</moduleId>
</server-environment>
<resource>
- <external-rar>activemq/activemq-ra/${activemq_version}/rar</external-rar>
+ <external-rar>geronimo/geronimo-activemq-embedded-rar/${pom.currentVersion}/rar</external-rar>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<resourceadapter>
<resourceadapter-instance>
@@ -560,7 +560,7 @@
<adminobject>
<adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.codehaus.activemq.message.ActiveMQTopic</adminobject-class>
+ <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
<adminobject-instance>
<message-destination-name>TradeStreamerTopic</message-destination-name>
<config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
@@ -610,7 +610,7 @@
<ext-module>
<connector>TradeJMS</connector>
- <external-path>activemq/activemq-ra/${activemq_version}/rar</external-path>
+ <external-path>geronimo/geronimo-activemq-embedded-rar/${pom.currentVersion}/rar</external-path>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<resourceadapter>
@@ -669,7 +669,7 @@
<adminobject>
<adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.codehaus.activemq.message.ActiveMQTopic</adminobject-class>
+ <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
<adminobject-instance>
<message-destination-name>TradeStreamerTopic</message-destination-name>
<config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
@@ -678,7 +678,7 @@
<adminobject>
<adminobject-interface>javax.jms.Queue</adminobject-interface>
- <adminobject-class>org.codehaus.activemq.message.ActiveMQQueue</adminobject-class>
+ <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
<adminobject-instance>
<message-destination-name>TradeBrokerQueue</message-destination-name>
<config-property-setting name="PhysicalName">TradeBrokerQueue</config-property-setting>
Modified: geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml?rev=406127&r1=406126&r2=406127&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml Sat May 13 09:34:49 2006
@@ -522,7 +522,7 @@
</moduleId>
</server-environment>
<resource>
- <external-rar>activemq/activemq-ra/${activemq_version}/rar</external-rar>
+ <external-rar>geronimo/geronimo-activemq-embedded-rar/${pom.currentVersion}/rar</external-rar>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<resourceadapter>
<resourceadapter-instance>
@@ -560,7 +560,7 @@
<adminobject>
<adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.codehaus.activemq.message.ActiveMQTopic</adminobject-class>
+ <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
<adminobject-instance>
<message-destination-name>TradeStreamerTopic</message-destination-name>
<config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
@@ -610,7 +610,7 @@
<ext-module>
<connector>TradeJMS</connector>
- <external-path>activemq/activemq-ra/${activemq_version}/rar</external-path>
+ <external-path>geronimo/geronimo-activemq-embedded-rar/${pom.currentVersion}/rar</external-path>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<resourceadapter>
@@ -669,7 +669,7 @@
<adminobject>
<adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.codehaus.activemq.message.ActiveMQTopic</adminobject-class>
+ <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
<adminobject-instance>
<message-destination-name>TradeStreamerTopic</message-destination-name>
<config-property-setting name="PhysicalName">TradeStreamerTopic</config-property-setting>
@@ -678,7 +678,7 @@
<adminobject>
<adminobject-interface>javax.jms.Queue</adminobject-interface>
- <adminobject-class>org.codehaus.activemq.message.ActiveMQQueue</adminobject-class>
+ <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
<adminobject-instance>
<message-destination-name>TradeBrokerQueue</message-destination-name>
<config-property-setting name="PhysicalName">TradeBrokerQueue</config-property-setting>
Added: geronimo/branches/1.1/modules/activemq-embedded-rar/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/activemq-embedded-rar/maven.xml?rev=406127&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/activemq-embedded-rar/maven.xml (added)
+++ geronimo/branches/1.1/modules/activemq-embedded-rar/maven.xml Sat May 13 09:34:49 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Revision: 1.1 $ $Date: 2005/08/03 06:10:42 $ -->
+
+<project default="rar:install"
+ >
+</project>
+
Copied: geronimo/branches/1.1/modules/activemq-embedded-rar/project.xml (from r405917, geronimo/trunk/modules/activemq-embedded-rar/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/activemq-embedded-rar/project.xml?p2=geronimo/branches/1.1/modules/activemq-embedded-rar/project.xml&p1=geronimo/trunk/modules/activemq-embedded-rar/project.xml&r1=405917&r2=406127&rev=406127&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-embedded-rar/project.xml (original)
+++ geronimo/branches/1.1/modules/activemq-embedded-rar/project.xml Sat May 13 09:34:49 2006
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
- <groupId>incubator-activemq</groupId>
+ <groupId>activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${activemq_version}</version>
<properties>
@@ -48,7 +48,7 @@
</properties>
</dependency>
<dependency>
- <groupId>incubator-activemq</groupId>
+ <groupId>activemq</groupId>
<artifactId>activemq-ra</artifactId>
<version>${activemq_version}</version>
<properties>
Modified: geronimo/branches/1.1/modules/activemq-embedded-rar/src/rar/META-INF/ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/activemq-embedded-rar/src/rar/META-INF/ra.xml?rev=406127&r1=405917&r2=406127&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/activemq-embedded-rar/src/rar/META-INF/ra.xml (original)
+++ geronimo/branches/1.1/modules/activemq-embedded-rar/src/rar/META-INF/ra.xml Sat May 13 09:34:49 2006
@@ -46,7 +46,7 @@
<license-required>true</license-required>
</license>
<resourceadapter>
- <resourceadapter-class>org.apache.activemq.ra.ActiveMQResourceAdapter</resourceadapter-class>
+ <resourceadapter-class>org.activemq.ra.ActiveMQResourceAdapter</resourceadapter-class>
<config-property>
<description>
The URL to the ActiveMQ server that you want this connection to connect to. If using
@@ -102,25 +102,25 @@
<outbound-resourceadapter>
<connection-definition>
- <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+ <managedconnectionfactory-class>org.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
<connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+ <connectionfactory-impl-class>org.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
<connection-interface>javax.jms.Connection</connection-interface>
- <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
+ <connection-impl-class>org.activemq.ra.ManagedConnectionProxy</connection-impl-class>
</connection-definition>
<connection-definition>
- <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+ <managedconnectionfactory-class>org.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
<connectionfactory-interface>javax.jms.QueueConnectionFactory</connectionfactory-interface>
- <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+ <connectionfactory-impl-class>org.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
<connection-interface>javax.jms.QueueConnection</connection-interface>
- <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
+ <connection-impl-class>org.activemq.ra.ManagedConnectionProxy</connection-impl-class>
</connection-definition>
<connection-definition>
- <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+ <managedconnectionfactory-class>org.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
<connectionfactory-interface>javax.jms.TopicConnectionFactory</connectionfactory-interface>
- <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+ <connectionfactory-impl-class>org.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
<connection-interface>javax.jms.TopicConnection</connection-interface>
- <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
+ <connection-impl-class>org.activemq.ra.ManagedConnectionProxy</connection-impl-class>
</connection-definition>
<transaction-support>XATransaction</transaction-support>
<authentication-mechanism>
@@ -134,7 +134,7 @@
<messagelistener>
<messagelistener-type>javax.jms.MessageListener</messagelistener-type>
<activationspec>
- <activationspec-class>org.apache.activemq.ra.ActiveMQActivationSpec</activationspec-class>
+ <activationspec-class>org.activemq.ra.ActiveMQActivationSpec</activationspec-class>
<required-config-property>
<config-property-name>destination</config-property-name>
@@ -149,7 +149,7 @@
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>javax.jms.Queue</adminobject-interface>
- <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
+ <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
<config-property>
<config-property-name>PhysicalName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
@@ -157,7 +157,7 @@
</adminobject>
<adminobject>
<adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
+ <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
<config-property>
<config-property-name>PhysicalName</config-property-name>
<config-property-type>java.lang.String</config-property-type>