Make ActiveMQ persistent

git-svn-id: https://svn.argeo.org/commons/trunk@3150 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
index 3888018a5bba29c094670efa7420397f0a2a128e..c37dff083026fec48c1d9d7380599f1dabf4d242 100644 (file)
--- a/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
@@ -1,15 +1,23 @@
 Manifest-Version: 1.0
 Bundle-Version: 0.1.2.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.activemq.broker
-Import-Package: jabber.client;resolution:=optional,jabber.iq._private;
- resolution:=optional,jabber.iq.auth;resolution:=optional,jabber.iq.ro
- ster;resolution:=optional,org.jabber.etherx.streams;resolution:=optio
- nal,org.jabber.protocol.disco_info;resolution:=optional,org.jabber.pr
- otocol.disco_items;resolution:=optional,org.jabber.protocol.muc;resol
- ution:=optional,org.jabber.protocol.muc_user;resolution:=optional,iet
- f.params.xml.ns.xmpp_sasl;resolution:=optional,ietf.params.xml.ns.xmp
- p_stanzas;resolution:=optional,ietf.params.xml.ns.xmpp_streams;resolu
- tion:=optional,ietf.params.xml.ns.xmpp_tls;resolution:=optional,org.a
- pache.activemq.broker,org.apache.activemq.command;resolution:=optiona
- l,org.apache.activemq.transport.http;resolution:=optional,org.apache.
- activemq.xbean,org.springframework.beans.factory.config
+Import-Package: ietf.params.xml.ns.xmpp_sasl;resolution:=optional,
+ ietf.params.xml.ns.xmpp_stanzas;resolution:=optional,
+ ietf.params.xml.ns.xmpp_streams;resolution:=optional,
+ ietf.params.xml.ns.xmpp_tls;resolution:=optional,
+ jabber.client;resolution:=optional,
+ jabber.iq._private;resolution:=optional,
+ jabber.iq.auth;resolution:=optional,
+ jabber.iq.roster;resolution:=optional,
+ org.apache.activemq.broker,
+ org.apache.activemq.command;resolution:=optional,
+ org.apache.activemq.store.amq,
+ org.apache.activemq.transport.http;resolution:=optional,
+ org.apache.activemq.util,
+ org.apache.activemq.xbean,
+ org.jabber.etherx.streams;resolution:=optional,
+ org.jabber.protocol.disco_info;resolution:=optional,
+ org.jabber.protocol.disco_items;resolution:=optional,
+ org.jabber.protocol.muc;resolution:=optional,
+ org.jabber.protocol.muc_user;resolution:=optional,
+ org.springframework.beans.factory.config

diff --git a/server/modules/org.argeo.server.activemq.broker/META-INF/spring/activemq-broker.xml b/server/modules/org.argeo.server.activemq.broker/META-INF/spring/activemq-broker.xml
index eae474ba4f01af0b6ffe0865f162107a1f0f1856..8b4b289b2a5a325b5a1f8b918f3b2b8598079ad0 100644 (file)
--- a/server/modules/org.argeo.server.activemq.broker/META-INF/spring/activemq-broker.xml
+++ b/server/modules/org.argeo.server.activemq.broker/META-INF/spring/activemq-broker.xml
@@ -15,7 +15,11 @@
        </bean>
 
        <!-- Embedded broker -->
-       <amq:broker id="broker" useJmx="false" persistent="false">
+       <amq:broker id="broker" useJmx="false" persistent="true">
+               <amq:persistenceAdapter>
+                       <amq:amqPersistenceAdapter directory="${argeo.osgi.data.dir}/activemq-data"
+                               maxFileLength="32mb" />
+               </amq:persistenceAdapter>
                <amq:transportConnectors>
                        <amq:transportConnector uri="${argeo.server.jms.url}" />
                        <!-- <amq:transportConnector uri="xmpp://localhost:61222" /> -->