Author: chirino
Date: Fri Feb 25 21:40:19 2005
New Revision: 155385
URL: http://svn.apache.org/viewcvs?view=rev&rev=155385
Log:
Updated ActiveMQ GBeans to use cache+journal+jdbc message stores.
Modified:
geronimo/trunk/modules/assembly/project.xml
geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
Modified: geronimo/trunk/modules/assembly/project.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?view=diff&r1=155384&r2=155385
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Fri Feb 25 21:40:19 2005
@@ -479,6 +479,14 @@
</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>
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=155384&r2=155385
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml Fri Feb
25 21:40:19 2005
@@ -29,43 +29,46 @@
<dependency>
<uri>activemq/jars/activemq-gbean-${activemq_version}.jar</uri>
</dependency>
- <!--
<dependency>
- <uri>activemq/jars/activemq-store-jdbm-${activemq_version}.jar</uri>
+ <uri>activemq/jars/activemq-store-jdbc-${activemq_version}.jar</uri>
</dependency>
<dependency>
- <uri>jdbm/jars/jdbm-0.20-dev.jar</uri>
+ <uri>activemq/jars/activemq-store-journal-${activemq_version}.jar</uri>
</dependency>
- -->
<dependency>
- <uri>activemq/jars/activemq-store-jdbc-${activemq_version}.jar</uri>
+ <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
</dependency>
<!-- message broker -->
- <!--
- <gbean namePart="ActiveMQ"
class="org.codehaus.activemq.store.jdbm.JdbmPersistenceAdapterGBean">
- <reference
name="ServerInfo">geronimo.system:name=ServerInfo,*</reference>
- <attribute name="DataDirectory">var/activemq</attribute>
+ <gbean namePart="ActiveMQ"
class="org.codehaus.activemq.gbean.ActiveMQContainerGBean">
+ <attribute name="brokerName">possibly-unique-broker</attribute>
+ <reference
name="persistenceAdapter">geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.cache,*</reference>
</gbean>
- -->
- <gbean namePart="ActiveMQ"
class="org.codehaus.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
- <reference
name="DataSource">geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</reference>
+ <gbean namePart="ActiveMQ.cache"
class="org.codehaus.activemq.store.cache.SimpleCachePersistenceAdapterGBean">
+ <attribute name="cacheSize">10000</attribute>
+ <reference
name="longTermPersistence">geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.journal,*</reference>
</gbean>
- <gbean namePart="ActiveMQ"
class="org.codehaus.activemq.gbean.ActiveMQContainerGBean">
- <attribute name="brokerName">possibly-unique-broker</attribute>
- <reference
name="PersistenceAdapter">geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ,*</reference>
+ <gbean namePart="ActiveMQ.journal"
class="org.codehaus.activemq.store.journal.JournalPersistenceAdapterGBean">
+ <reference
name="serverInfo">geronimo.server:name=ServerInfo,*</reference>
+ <attribute name="directory">var/activemq/journal</attribute>
+ <attribute name="journalType">default</attribute>
+ <reference
name="longTermPersistence">geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.jdbc,*</reference>
+ </gbean>
+
+ <gbean namePart="ActiveMQ.jdbc"
class="org.codehaus.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
+ <reference
name="dataSource">geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</reference>
</gbean>
<gbean namePart="ActiveMQ.tcp.localhost.61616"
class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
<attribute name="url">tcp://localhost:61616</attribute>
- <reference
name="ActiveMQContainer">geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</reference>
+ <reference
name="activeMQContainer">geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</reference>
</gbean>
<gbean namePart="ActiveMQ.vm.localhost"
class="org.codehaus.activemq.gbean.ActiveMQConnectorGBean">
<attribute name="url">vm://localhost</attribute>
- <reference
name="ActiveMQContainer">geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</reference>
+ <reference
name="activeMQContainer">geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</reference>
</gbean>
</configuration>
