Author: chirino
Date: Wed Mar 16 19:23:13 2005
New Revision: 157876
URL: http://svn.apache.org/viewcvs?view=rev&rev=157876
Log:
Reved up ActiveMQ version to 3.0-SNAPSHOT
Modified:
geronimo/trunk/etc/project.properties
geronimo/trunk/modules/assembly/project.xml
geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
Modified: geronimo/trunk/etc/project.properties
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?view=diff&r1=157875&r2=157876
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Wed Mar 16 19:23:13 2005
@@ -69,7 +69,7 @@
# actual dependencies
activeio_version=1.0-SNAPSHOT
-activemq_version=2.2-SNAPSHOT
+activemq_version=3.0-SNAPSHOT
geronimo_version=1.0-SNAPSHOT
openejb_version=2.0-SNAPSHOT
tranql_version=1.0-SNAPSHOT
Modified: geronimo/trunk/modules/assembly/project.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?view=diff&r1=157875&r2=157876
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Wed Mar 16 19:23:13 2005
@@ -489,41 +489,9 @@
</dependency>
<dependency>
<groupId>activemq</groupId>
- <artifactId>activemq-store-journal</artifactId>
- <version>${activemq_version}</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-store-jdbm</artifactId>
- <version>${activemq_version}</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-store-jdbc</artifactId>
- <version>${activemq_version}</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
- <dependency>
- <groupId>activemq</groupId>
<artifactId>activemq-ra</artifactId>
<version>${activemq_version}</version>
<type>rar</type>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
- <dependency>
- <groupId>jdbm</groupId>
- <artifactId>jdbm</artifactId>
- <version>0.20-dev</version>
<properties>
<repository>true</repository>
</properties>
Modified: geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml?view=diff&r1=157875&r2=157876
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml Wed Mar
16 19:23:13 2005
@@ -30,27 +30,21 @@
<uri>activemq/jars/activemq-gbean-${activemq_version}.jar</uri>
</dependency>
<dependency>
- <uri>activemq/jars/activemq-store-jdbc-${activemq_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>activemq/jars/activemq-store-journal-${activemq_version}.jar</uri>
- </dependency>
- <dependency>
<uri>activeio/jars/activeio-${activeio_version}.jar</uri>
</dependency>
<!-- message broker -->
- <gbean name="ActiveMQ"
class="org.codehaus.activemq.gbean.ActiveMQContainerGBean">
+ <gbean name="ActiveMQ" class="org.activemq.gbean.ActiveMQContainerGBean">
<attribute name="brokerName">possibly-unique-broker</attribute>
<reference
name="persistenceAdapter"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.cache,*</gbean-name></reference>
</gbean>
- <gbean name="ActiveMQ.cache"
class="org.codehaus.activemq.store.cache.SimpleCachePersistenceAdapterGBean">
+ <gbean name="ActiveMQ.cache"
class="org.activemq.store.cache.SimpleCachePersistenceAdapterGBean">
<attribute name="cacheSize">10000</attribute>
<reference
name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.journal,*</gbean-name></reference>
</gbean>
- <gbean name="ActiveMQ.journal"
class="org.codehaus.activemq.store.journal.JournalPersistenceAdapterGBean">
+ <gbean name="ActiveMQ.journal"
class="org.activemq.store.journal.JournalPersistenceAdapterGBean">
<!--TODO change to ServerInfo -->
<reference
name="serverInfo"><module>org/apache/geronimo/System</module><type>GBean</type><name>ServerInfo</name></reference>
<attribute name="directory">var/activemq/journal</attribute>
@@ -58,16 +52,16 @@
<reference
name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.jdbc,*</gbean-name></reference>
</gbean>
- <gbean name="ActiveMQ.jdbc"
class="org.codehaus.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
+ <gbean name="ActiveMQ.jdbc"
class="org.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
<reference
name="dataSource"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</gbean-name></reference>
</gbean>
- <gbean name="ActiveMQ.tcp.localhost.61616"
class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
+ <gbean name="ActiveMQ.tcp.localhost.61616"
class="org.activemq.gbean.ActiveMQConnectorGBean">
<attribute name="url">tcp://localhost:61616</attribute>
<reference
name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
</gbean>
- <gbean name="ActiveMQ.vm.localhost"
class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
+ <gbean name="ActiveMQ.vm.localhost"
class="org.activemq.gbean.ActiveMQConnectorGBean">
<attribute name="url">vm://localhost</attribute>
<reference
name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
</gbean>
