Repository: activemq-6 Updated Branches: refs/heads/master b5039ab8d -> 571fb7a23
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml new file mode 100644 index 0000000..4caa289 --- /dev/null +++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml @@ -0,0 +1,104 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + <!-- + if you want to run this as a backup on different ports you would need to set the following variable + export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true" + --> + + <paging-directory>${data.dir:../data}/paging</paging-directory> + + <bindings-directory>${data.dir:../data}/bindings</bindings-directory> + + <journal-directory>${data.dir:../data}/journal</journal-directory> + + <journal-min-files>10</journal-min-files> + + <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory> + + <connectors> + <connector name="netty"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + </connector> + + <connector name="netty-throughput"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="batch-delay" value="50"/> + </connector> + </connectors> + + <acceptors> + <acceptor name="netty"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + </acceptor> + + <acceptor name="netty-throughput"> + <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="batch-delay" value="50"/> + <param key="direct-deliver" value="false"/> + </acceptor> + </acceptors> + + <broadcast-groups> + <broadcast-group name="bg-group1"> + <group-address>231.7.7.7</group-address> + <group-port>9876</group-port> + <broadcast-period>5000</broadcast-period> + <connector-ref>netty</connector-ref> + </broadcast-group> + </broadcast-groups> + + <discovery-groups> + <discovery-group name="dg-group1"> + <group-address>231.7.7.7</group-address> + <group-port>9876</group-port> + <refresh-timeout>10000</refresh-timeout> + </discovery-group> + </discovery-groups> + + <cluster-connections> + <cluster-connection name="my-cluster"> + <address>jms</address> + <connector-ref>netty</connector-ref> + <discovery-group-ref discovery-group-name="dg-group1"/> + </cluster-connection> + </cluster-connections> + + <ha-policy> + <shared-store> + <master/> + </shared-store> + </ha-policy> + + <security-settings> + <security-setting match="#"> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + </security-settings> + + <address-settings> + <!--default for catch all--> + <address-setting match="#"> + <dead-letter-address>jms.queue.DLQ</dead-letter-address> + <expiry-address>jms.queue.ExpiryQueue</expiry-address> + <redelivery-delay>0</redelivery-delay> + <max-size-bytes>10485760</max-size-bytes> + <message-counter-history-day-limit>10</message-counter-history-day-limit> + <address-full-policy>BLOCK</address-full-policy> + </address-setting> + </address-settings> + + + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml new file mode 100644 index 0000000..044d7e8 --- /dev/null +++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml @@ -0,0 +1,53 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> + + <connection-factory name="NettyXAConnectionFactory"> + <xa>true</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/XAConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="NettyConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty"/> + </connectors> + <entries> + <entry name="/ConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="NettyThroughputConnectionFactory"> + <xa>true</xa> + <connectors> + <connector-ref connector-name="netty-throughput"/> + </connectors> + <entries> + <entry name="/XAThroughputConnectionFactory"/> + </entries> + </connection-factory> + + <connection-factory name="NettyThroughputConnectionFactory"> + <xa>false</xa> + <connectors> + <connector-ref connector-name="netty-throughput"/> + </connectors> + <entries> + <entry name="/ThroughputConnectionFactory"/> + </entries> + </connection-factory> + + <queue name="DLQ"> + <entry name="/queue/DLQ"/> + </queue> + + <queue name="ExpiryQueue"> + <entry name="/queue/ExpiryQueue"/> + </queue> + +</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml new file mode 100644 index 0000000..934306c --- /dev/null +++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml @@ -0,0 +1,7 @@ +<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd"> + <!-- the default user. this is used where username is null--> + <defaultuser name="guest" password="guest"> + <role name="guest"/> + </defaultuser> +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml index 9834d3b..192cdb9 100644 --- a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml +++ b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml @@ -14,8 +14,8 @@ <broker xmlns="http://hornetq.org/schema";> - <core configuration="file:${hornetq.home}/config/shared-store/hornetq-configuration.xml"></core> - <jms configuration="file:${hornetq.home}/config/shared-store/hornetq-jms.xml"></jms> + <core configuration="file:${activemq.home}/config/shared-store/activemq-configuration.xml"></core> + <jms configuration="file:${activemq.home}/config/shared-store/activemq-jms.xml"></jms> <basic-security/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml deleted file mode 100644 index 4caa289..0000000 --- a/distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml +++ /dev/null @@ -1,104 +0,0 @@ -<configuration xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> - <!-- - if you want to run this as a backup on different ports you would need to set the following variable - export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dhornetq.remoting.netty.host=localhost -Dhornetq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true" - --> - - <paging-directory>${data.dir:../data}/paging</paging-directory> - - <bindings-directory>${data.dir:../data}/bindings</bindings-directory> - - <journal-directory>${data.dir:../data}/journal</journal-directory> - - <journal-min-files>10</journal-min-files> - - <large-messages-directory>${data.dir:../data}/large-messages</large-messages-directory> - - <connectors> - <connector name="netty"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.port:5445}"/> - </connector> - - <connector name="netty-throughput"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> - <param key="batch-delay" value="50"/> - </connector> - </connectors> - - <acceptors> - <acceptor name="netty"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.port:5445}"/> - </acceptor> - - <acceptor name="netty-throughput"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> - <param key="batch-delay" value="50"/> - <param key="direct-deliver" value="false"/> - </acceptor> - </acceptors> - - <broadcast-groups> - <broadcast-group name="bg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <broadcast-period>5000</broadcast-period> - <connector-ref>netty</connector-ref> - </broadcast-group> - </broadcast-groups> - - <discovery-groups> - <discovery-group name="dg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <refresh-timeout>10000</refresh-timeout> - </discovery-group> - </discovery-groups> - - <cluster-connections> - <cluster-connection name="my-cluster"> - <address>jms</address> - <connector-ref>netty</connector-ref> - <discovery-group-ref discovery-group-name="dg-group1"/> - </cluster-connection> - </cluster-connections> - - <ha-policy> - <shared-store> - <master/> - </shared-store> - </ha-policy> - - <security-settings> - <security-setting match="#"> - <permission type="createNonDurableQueue" roles="guest"/> - <permission type="deleteNonDurableQueue" roles="guest"/> - <permission type="consume" roles="guest"/> - <permission type="send" roles="guest"/> - </security-setting> - </security-settings> - - <address-settings> - <!--default for catch all--> - <address-setting match="#"> - <dead-letter-address>jms.queue.DLQ</dead-letter-address> - <expiry-address>jms.queue.ExpiryQueue</expiry-address> - <redelivery-delay>0</redelivery-delay> - <max-size-bytes>10485760</max-size-bytes> - <message-counter-history-day-limit>10</message-counter-history-day-limit> - <address-full-policy>BLOCK</address-full-policy> - </address-setting> - </address-settings> - - - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/hornetq-jms.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/shared-store/hornetq-jms.xml b/distribution/activemq/src/main/resources/config/shared-store/hornetq-jms.xml deleted file mode 100644 index 044d7e8..0000000 --- a/distribution/activemq/src/main/resources/config/shared-store/hornetq-jms.xml +++ /dev/null @@ -1,53 +0,0 @@ -<configuration xmlns="urn:hornetq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> - - <connection-factory name="NettyXAConnectionFactory"> - <xa>true</xa> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/XAConnectionFactory"/> - </entries> - </connection-factory> - - <connection-factory name="NettyConnectionFactory"> - <xa>false</xa> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="/ConnectionFactory"/> - </entries> - </connection-factory> - - <connection-factory name="NettyThroughputConnectionFactory"> - <xa>true</xa> - <connectors> - <connector-ref connector-name="netty-throughput"/> - </connectors> - <entries> - <entry name="/XAThroughputConnectionFactory"/> - </entries> - </connection-factory> - - <connection-factory name="NettyThroughputConnectionFactory"> - <xa>false</xa> - <connectors> - <connector-ref connector-name="netty-throughput"/> - </connectors> - <entries> - <entry name="/ThroughputConnectionFactory"/> - </entries> - </connection-factory> - - <queue name="DLQ"> - <entry name="/queue/DLQ"/> - </queue> - - <queue name="ExpiryQueue"> - <entry name="/queue/ExpiryQueue"/> - </queue> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/f9bdb25a/distribution/activemq/src/main/resources/config/shared-store/hornetq-users.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/shared-store/hornetq-users.xml b/distribution/activemq/src/main/resources/config/shared-store/hornetq-users.xml deleted file mode 100644 index 934306c..0000000 --- a/distribution/activemq/src/main/resources/config/shared-store/hornetq-users.xml +++ /dev/null @@ -1,7 +0,0 @@ -<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> \ No newline at end of file
