http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/colocated-hapolicy-config.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config.xml b/activemq-server/src/test/resources/colocated-hapolicy-config.xml index 9ae4254..3f401a3 100644 --- a/activemq-server/src/test/resources/colocated-hapolicy-config.xml +++ b/activemq-server/src/test/resources/colocated-hapolicy-config.xml @@ -17,34 +17,35 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> - <ha-policy> - <replication> - <colocated> - <backup-request-retries>44</backup-request-retries> - <backup-request-retry-interval>33</backup-request-retry-interval> - <max-backups>3</max-backups> - <request-backup>false</request-backup> - <backup-port-offset>33</backup-port-offset> - <master> - <group-name>purple</group-name> - <check-for-live-server>true</check-for-live-server> - <cluster-name>abcdefg</cluster-name> - </master> - <slave> - <group-name>tiddles</group-name> - <max-saved-replicated-journals-size>22</max-saved-replicated-journals-size> - <cluster-name>33rrrrr</cluster-name> - <restart-backup>false</restart-backup> - <scale-down> - <!--a grouping of servers that can be scaled down to--> - <group-name>boo!</group-name> - <!--either a discovery group--> - <discovery-group>wahey</discovery-group> - </scale-down> - </slave> - </colocated> - </replication> - </ha-policy> - + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + <core xmlns="urn:activemq:core"> + <ha-policy> + <replication> + <colocated> + <backup-request-retries>44</backup-request-retries> + <backup-request-retry-interval>33</backup-request-retry-interval> + <max-backups>3</max-backups> + <request-backup>false</request-backup> + <backup-port-offset>33</backup-port-offset> + <master> + <group-name>purple</group-name> + <check-for-live-server>true</check-for-live-server> + <cluster-name>abcdefg</cluster-name> + </master> + <slave> + <group-name>tiddles</group-name> + <max-saved-replicated-journals-size>22</max-saved-replicated-journals-size> + <cluster-name>33rrrrr</cluster-name> + <restart-backup>false</restart-backup> + <scale-down> + <!--a grouping of servers that can be scaled down to--> + <group-name>boo!</group-name> + <!--either a discovery group--> + <discovery-group>wahey</discovery-group> + </scale-down> + </slave> + </colocated> + </replication> + </ha-policy> + </core> </configuration>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml index f874ece..415b50a 100644 --- a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml @@ -17,28 +17,30 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> - <ha-policy> - <shared-store> - <colocated> - <backup-request-retries>44</backup-request-retries> - <backup-request-retry-interval>33</backup-request-retry-interval> - <max-backups>3</max-backups> - <request-backup>false</request-backup> - <backup-port-offset>33</backup-port-offset> - <master> - <failback-delay>1234</failback-delay> - <failover-on-shutdown>false</failover-on-shutdown> - </master> - <slave> - <failback-delay>44</failback-delay> - <failover-on-shutdown>false</failover-on-shutdown> - <restart-backup>false</restart-backup> - <scale-down/> - </slave> - </colocated> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + <core xmlns="urn:activemq:core"> + <ha-policy> + <shared-store> + <colocated> + <backup-request-retries>44</backup-request-retries> + <backup-request-retry-interval>33</backup-request-retry-interval> + <max-backups>3</max-backups> + <request-backup>false</request-backup> + <backup-port-offset>33</backup-port-offset> + <master> + <failback-delay>1234</failback-delay> + <failover-on-shutdown>false</failover-on-shutdown> + </master> + <slave> + <failback-delay>44</failback-delay> + <failover-on-shutdown>false</failover-on-shutdown> + <restart-backup>false</restart-backup> + <scale-down/> + </slave> + </colocated> - </shared-store> - </ha-policy> + </shared-store> + </ha-policy> + </core>c </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/live-only-hapolicy-config.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config.xml b/activemq-server/src/test/resources/live-only-hapolicy-config.xml index b604a9a..ee0a377 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config.xml @@ -17,16 +17,18 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - <ha-policy> - <live-only> - <scale-down> - <!--a grouping of servers that can be scaled down to--> - <group-name>boo!</group-name> - <!--either a discovery group--> - <discovery-group>wahey</discovery-group> - </scale-down> - </live-only> - </ha-policy> + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + <core xmlns="urn:activemq:core"> + <ha-policy> + <live-only> + <scale-down> + <!--a grouping of servers that can be scaled down to--> + <group-name>boo!</group-name> + <!--either a discovery group--> + <discovery-group>wahey</discovery-group> + </scale-down> + </live-only> + </ha-policy> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml index ecfe109..0541783 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml @@ -17,22 +17,23 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - <ha-policy> - <!--only one of the following--> - <!--on server shutdown scale down to another live server--> - <live-only> - <scale-down> - <enabled>false</enabled> - <!--a grouping of servers that can be scaled down to--> - <group-name>boo!</group-name> - <!--or some connectors--> - <connectors> - <connector-ref>sd-connector1</connector-ref> - <connector-ref>sd-connector2</connector-ref> - </connectors> - </scale-down> - </live-only> - </ha-policy> - + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + <core xmlns="urn:activemq:core"> + <ha-policy> + <!--only one of the following--> + <!--on server shutdown scale down to another live server--> + <live-only> + <scale-down> + <enabled>false</enabled> + <!--a grouping of servers that can be scaled down to--> + <group-name>boo!</group-name> + <!--or some connectors--> + <connectors> + <connector-ref>sd-connector1</connector-ref> + <connector-ref>sd-connector2</connector-ref> + </connectors> + </scale-down> + </live-only> + </ha-policy> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml index 62d676c..1f79134 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml @@ -17,11 +17,12 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - <ha-policy> - <!--only one of the following--> - <!--on server shutdown scale down to another live server--> - <live-only/> - </ha-policy> - + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + <core xmlns="urn:activemq:core"> + <ha-policy> + <!--only one of the following--> + <!--on server shutdown scale down to another live server--> + <live-only/> + </ha-policy> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml index f23cd82..cd05bf4 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml @@ -17,7 +17,9 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - <ha-policy/> + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + <core xmlns="urn:activemq:core"> + <ha-policy/> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml index d18757a..b244b9e 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml @@ -17,6 +17,8 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + <core xmlns="urn:activemq:core"/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/replica-hapolicy-config.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/replica-hapolicy-config.xml b/activemq-server/src/test/resources/replica-hapolicy-config.xml index 4cf2ef6..8ed633c 100644 --- a/activemq-server/src/test/resources/replica-hapolicy-config.xml +++ b/activemq-server/src/test/resources/replica-hapolicy-config.xml @@ -17,24 +17,27 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - <ha-policy> - <replication> - <slave> - <group-name>tiddles</group-name> - <max-saved-replicated-journals-size>22</max-saved-replicated-journals-size> - <cluster-name>33rrrrr</cluster-name> - <restart-backup>false</restart-backup> - <allow-failback>true</allow-failback> - <failback-delay>9876</failback-delay> - <scale-down> - <!--a grouping of servers that can be scaled down to--> - <group-name>boo!</group-name> - <!--either a discovery group--> - <discovery-group>wahey</discovery-group> - </scale-down> - </slave> - </replication> - </ha-policy> + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + <core xmlns="urn:activemq:core"> + <ha-policy> + <replication> + <slave> + <group-name>tiddles</group-name> + <max-saved-replicated-journals-size>22</max-saved-replicated-journals-size> + <cluster-name>33rrrrr</cluster-name> + <restart-backup>false</restart-backup> + <allow-failback>true</allow-failback> + <failback-delay>9876</failback-delay> + <scale-down> + <!--a grouping of servers that can be scaled down to--> + <group-name>boo!</group-name> + <!--either a discovery group--> + <discovery-group>wahey</discovery-group> + </scale-down> + </slave> + </replication> + </ha-policy> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/replica-hapolicy-config2.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/replica-hapolicy-config2.xml b/activemq-server/src/test/resources/replica-hapolicy-config2.xml index e418610..15e85c5 100644 --- a/activemq-server/src/test/resources/replica-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/replica-hapolicy-config2.xml @@ -17,25 +17,28 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - <ha-policy> - <replication> - <slave> - <group-name>tiddles</group-name> - <max-saved-replicated-journals-size>22</max-saved-replicated-journals-size> - <cluster-name>33rrrrr</cluster-name> - <restart-backup>false</restart-backup> - <scale-down> - <!--a grouping of servers that can be scaled down to--> - <group-name>boo!</group-name> - <!--or some connectors--> - <connectors> - <connector-ref>sd-connector1</connector-ref> - <connector-ref>sd-connector2</connector-ref> - </connectors> - </scale-down> - </slave> - </replication> - </ha-policy> + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + <core xmlns="urn:activemq:core"> + <ha-policy> + <replication> + <slave> + <group-name>tiddles</group-name> + <max-saved-replicated-journals-size>22</max-saved-replicated-journals-size> + <cluster-name>33rrrrr</cluster-name> + <restart-backup>false</restart-backup> + <scale-down> + <!--a grouping of servers that can be scaled down to--> + <group-name>boo!</group-name> + <!--or some connectors--> + <connectors> + <connector-ref>sd-connector1</connector-ref> + <connector-ref>sd-connector2</connector-ref> + </connectors> + </scale-down> + </slave> + </replication> + </ha-policy> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/replica-hapolicy-config3.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/replica-hapolicy-config3.xml b/activemq-server/src/test/resources/replica-hapolicy-config3.xml index a748d5e..71b86b3 100644 --- a/activemq-server/src/test/resources/replica-hapolicy-config3.xml +++ b/activemq-server/src/test/resources/replica-hapolicy-config3.xml @@ -17,16 +17,19 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - <ha-policy> - <replication> - <slave> - <group-name>tiddles</group-name> - <max-saved-replicated-journals-size>22</max-saved-replicated-journals-size> - <cluster-name>33rrrrr</cluster-name> - <restart-backup>false</restart-backup> - </slave> - </replication> - </ha-policy> + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + <core xmlns="urn:activemq:core"> + <ha-policy> + <replication> + <slave> + <group-name>tiddles</group-name> + <max-saved-replicated-journals-size>22</max-saved-replicated-journals-size> + <cluster-name>33rrrrr</cluster-name> + <restart-backup>false</restart-backup> + </slave> + </replication> + </ha-policy> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/replicated-hapolicy-config.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/replicated-hapolicy-config.xml b/activemq-server/src/test/resources/replicated-hapolicy-config.xml index 83311ba..1225208 100644 --- a/activemq-server/src/test/resources/replicated-hapolicy-config.xml +++ b/activemq-server/src/test/resources/replicated-hapolicy-config.xml @@ -17,15 +17,18 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - <ha-policy> - <replication> - <master> - <group-name>purple</group-name> - <check-for-live-server>true</check-for-live-server> - <cluster-name>abcdefg</cluster-name> - </master> - </replication> - </ha-policy> + xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd"> + + <core xmlns="urn:activemq:core"> + <ha-policy> + <replication> + <master> + <group-name>purple</group-name> + <check-for-live-server>true</check-for-live-server> + <cluster-name>abcdefg</cluster-name> + </master> + </replication> + </ha-policy> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml b/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml index 306cbc8..a79589a 100644 --- a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml +++ b/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml @@ -17,14 +17,16 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> - <ha-policy> - <shared-store> - <master> - <failback-delay>3456</failback-delay> - <failover-on-shutdown>false</failover-on-shutdown> - </master> - </shared-store> - </ha-policy> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + <core xmlns="urn:activemq:core"> + <ha-policy> + <shared-store> + <master> + <failback-delay>3456</failback-delay> + <failover-on-shutdown>false</failover-on-shutdown> + </master> + </shared-store> + </ha-policy> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml index b0ffeae..0f8bb71 100644 --- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml +++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml @@ -17,22 +17,24 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> - <ha-policy> - <shared-store> - <slave> - <allow-failback>true</allow-failback> - <failback-delay>9876</failback-delay> - <failover-on-shutdown>false</failover-on-shutdown> - <restart-backup>false</restart-backup> - <scale-down> - <!--a grouping of servers that can be scaled down to--> - <group-name>boo!</group-name> - <!--either a discovery group--> - <discovery-group>wahey</discovery-group> - </scale-down> - </slave> - </shared-store> - </ha-policy> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + <core xmlns="urn:activemq:core"> + <ha-policy> + <shared-store> + <slave> + <allow-failback>true</allow-failback> + <failback-delay>9876</failback-delay> + <failover-on-shutdown>false</failover-on-shutdown> + <restart-backup>false</restart-backup> + <scale-down> + <!--a grouping of servers that can be scaled down to--> + <group-name>boo!</group-name> + <!--either a discovery group--> + <discovery-group>wahey</discovery-group> + </scale-down> + </slave> + </shared-store> + </ha-policy> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml index c88eb23..3f5a9ed 100644 --- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml @@ -17,24 +17,26 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> - <ha-policy> - <shared-store> - <slave> - <failback-delay>5678</failback-delay> - <failover-on-shutdown>true</failover-on-shutdown> - <restart-backup>true</restart-backup> - <scale-down> - <!--a grouping of servers that can be scaled down to--> - <group-name>boo!</group-name> - <!--or some connectors--> - <connectors> - <connector-ref>sd-connector1</connector-ref> - <connector-ref>sd-connector2</connector-ref> - </connectors> - </scale-down> - </slave> - </shared-store> - </ha-policy> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + <core xmlns="urn:activemq:core"> + <ha-policy> + <shared-store> + <slave> + <failback-delay>5678</failback-delay> + <failover-on-shutdown>true</failover-on-shutdown> + <restart-backup>true</restart-backup> + <scale-down> + <!--a grouping of servers that can be scaled down to--> + <group-name>boo!</group-name> + <!--or some connectors--> + <connectors> + <connector-ref>sd-connector1</connector-ref> + <connector-ref>sd-connector2</connector-ref> + </connectors> + </scale-down> + </slave> + </shared-store> + </ha-policy> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml index 43126aa..06b0fbb 100644 --- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml +++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml @@ -17,15 +17,17 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> - <ha-policy> - <shared-store> - <slave> - <failback-delay>5678</failback-delay> - <failover-on-shutdown>true</failover-on-shutdown> - <restart-backup>true</restart-backup> - </slave> - </shared-store> - </ha-policy> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd"> + <core xmlns="urn:activemq:core"> + <ha-policy> + <shared-store> + <slave> + <failback-delay>5678</failback-delay> + <failover-on-shutdown>true</failover-on-shutdown> + <restart-backup>true</restart-backup> + </slave> + </shared-store> + </ha-policy> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml index 0be0644..16529bc 100644 --- a/distribution/activemq/pom.xml +++ b/distribution/activemq/pom.xml @@ -215,106 +215,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>validate</goal> - </goals> - </execution> - </executions> - <configuration> - <validationSets> - <validationSet> - <dir>${configLocation}/clustered</dir> - <systemId>${schemaLocation}/activemq-configuration.xsd</systemId> - <includes> - <include>activemq-configuration.xml</include> - </includes> - </validationSet> - <validationSet> - <dir>${configLocation}/non-clustered</dir> - <systemId>${schemaLocation}/activemq-configuration.xsd</systemId> - <includes> - <include>activemq-configuration.xml</include> - </includes> - </validationSet> - <validationSet> - <dir>${configLocation}/replicated</dir> - <systemId>${schemaLocation}/activemq-configuration.xsd</systemId> - <includes> - <include>activemq-configuration.xml</include> - </includes> - </validationSet> - <validationSet> - <dir>${configLocation}/shared-store</dir> - <systemId>${schemaLocation}/activemq-configuration.xsd</systemId> - <includes> - <include>activemq-configuration.xml</include> - </includes> - </validationSet> - <validationSet> - <dir>${configLocation}/clustered</dir> - <systemId>${schemaLocation}/activemq-jms.xsd</systemId> - <includes> - <include>activemq-jms.xml</include> - </includes> - </validationSet> - <validationSet> - <dir>${configLocation}/non-clustered</dir> - <systemId>${schemaLocation}/activemq-jms.xsd</systemId> - <includes> - <include>activemq-jms.xml</include> - </includes> - </validationSet> - <validationSet> - <dir>${configLocation}/replicated</dir> - <systemId>${schemaLocation}/activemq-jms.xsd</systemId> - <includes> - <include>activemq-jms.xml</include> - </includes> - </validationSet> - <validationSet> - <dir>${configLocation}/shared-store</dir> - <systemId>${schemaLocation}/activemq-jms.xsd</systemId> - <includes> - <include>activemq-jms.xml</include> - </includes> - </validationSet> - <validationSet> - <dir>${configLocation}/clustered</dir> - <systemId>${schemaLocation}/activemq-users.xsd</systemId> - <includes> - <include>activemq-users.xml</include> - </includes> - </validationSet> - <validationSet> - <dir>${configLocation}/non-clustered</dir> - <systemId>${schemaLocation}/activemq-users.xsd</systemId> - <includes> - <include>activemq-users.xml</include> - </includes> - </validationSet> - <validationSet> - <dir>${configLocation}/replicated</dir> - <systemId>${schemaLocation}/activemq-users.xsd</systemId> - <includes> - <include>activemq-users.xml</include> - </includes> - </validationSet> - <validationSet> - <dir>${configLocation}/shared-store</dir> - <systemId>${schemaLocation}/activemq-users.xsd</systemId> - <includes> - <include>activemq-users.xml</include> - </includes> - </validationSet> - </validationSets> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml index 29c3466..103d567 100644 --- a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml @@ -21,94 +21,96 @@ under the License. <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> - - <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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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> - - <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> - - + <jms xmlns="urn:activemq:jms"> + <queue name="DLQ"/> + <queue name="ExpiryQueue"/> + </jms> + <core xmlns="urn:activemq:core"> + <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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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> + + <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> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml deleted file mode 100644 index 73a5f46..0000000 --- a/distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you 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. ---> - -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - - <queue name="DLQ"/> - - <queue name="ExpiryQueue"/> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/clustered/activemq-roles.properties ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-roles.properties b/distribution/activemq/src/main/resources/config/clustered/activemq-roles.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/distribution/activemq/src/main/resources/config/clustered/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You 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. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/clustered/activemq-users.properties ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-users.properties b/distribution/activemq/src/main/resources/config/clustered/activemq-users.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/distribution/activemq/src/main/resources/config/clustered/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You 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. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml deleted file mode 100644 index f63079d..0000000 --- a/distribution/activemq/src/main/resources/config/clustered/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you 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. ---> - -<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml index 681a1f5..74608dc 100644 --- a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml +++ b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml @@ -22,7 +22,7 @@ <jms configuration="file:${activemq.home}/config/clustered/activemq-jms.xml"/> - <basic-security/> + <file-security configuration="file:${activemq.home}/config/non-clustered/activemq-users.xml"/> <web bind="http://localhost:8161"; path="web"> <app url="jolokia" war="jolokia-war-1.2.3.war"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml index 1f12009..245d0bd 100644 --- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml @@ -18,70 +18,72 @@ specific language governing permissions and limitations under the License. --> -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> +<configuration xmlns="urn:activemq"> + <jms xmlns="urn:activemq:jms"> + <queue name="DLQ"/> + <queue name="ExpiryQueue"/> + </jms> + <core xmlns="urn:activemq:core"> + <paging-directory>${data.dir:../data}/paging</paging-directory> - <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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/> - <param key="batch-delay" value="50"/> - </connector> - </connectors> + <bindings-directory>${data.dir:../data}/bindings</bindings-directory> - <acceptors> - <acceptor name="netty"> - <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="host" value="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/> - <param key="batch-delay" value="50"/> - <param key="direct-deliver" value="false"/> - </acceptor> - </acceptors> + <journal-directory>${data.dir:../data}/journal</journal-directory> - <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> + <journal-min-files>10</journal-min-files> - <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> + <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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/> + <param key="batch-delay" value="50"/> + <param key="direct-deliver" value="false"/> + </acceptor> + </acceptors> + + <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> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml deleted file mode 100644 index 73a5f46..0000000 --- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you 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. ---> - -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - - <queue name="DLQ"/> - - <queue name="ExpiryQueue"/> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/non-clustered/activemq-roles.properties ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-roles.properties b/distribution/activemq/src/main/resources/config/non-clustered/activemq-roles.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You 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. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.properties ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.properties b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You 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. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml deleted file mode 100644 index f63079d..0000000 --- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you 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. ---> - -<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml index e031b16..26bc04e 100644 --- a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml +++ b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml @@ -18,11 +18,13 @@ <broker xmlns="http://activemq.org/schema";> - <core configuration="file:${activemq.home}/config/non-clustered/activemq-configuration.xml"/> + <basic-security> + <users>file:${activemq.home}/config/non-clustered/activemq-users.properties</users> + <roles>file:${activemq.home}/config/non-clustered/activemq-roles.properties</roles> + <default-user>guest</default-user> + </basic-security> - <jms configuration="file:${activemq.home}/config/non-clustered/activemq-jms.xml"/> - - <basic-security/> + <server configuration="file:${activemq.home}/config/non-clustered/activemq-configuration.xml"/> <web bind="http://localhost:8161"; path="web"> <app url="jolokia" war="jolokia-war-1.2.3.war"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml index 9b7cbf5..2ae8d4d 100644 --- a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml @@ -21,104 +21,107 @@ under the License. <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-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="-Dactivemq.remoting.netty.host=localhost -Dactivemq.remoting.netty.port=5545 -Dactivemq.remoting.netty.batch.port=5555 -Dactivemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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> - <replication> - <master/> - </replication> - </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> - - + <jms xmlns="urn:activemq:jms"> + <queue name="DLQ"/> + <queue name="ExpiryQueue"/> + </jms> + <core xmlns="urn:activemq:core"> + <!-- + if you want to run this as a backup on different ports you would need to set the following variable + export CLUSTER_PROPS="-Dactivemq.remoting.netty.host=localhost -Dactivemq.remoting.netty.port=5545 -Dactivemq.remoting.netty.batch.port=5555 -Dactivemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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> + <replication> + <master/> + </replication> + </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> + </core> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml deleted file mode 100644 index 73a5f46..0000000 --- a/distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you 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. ---> - -<configuration xmlns="urn:activemq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - - <queue name="DLQ"/> - - <queue name="ExpiryQueue"/> - -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/replicated/activemq-roles.properties ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-roles.properties b/distribution/activemq/src/main/resources/config/replicated/activemq-roles.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/distribution/activemq/src/main/resources/config/replicated/activemq-roles.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You 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. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/replicated/activemq-users.properties ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-users.properties b/distribution/activemq/src/main/resources/config/replicated/activemq-users.properties new file mode 100644 index 0000000..4e2d44c --- /dev/null +++ b/distribution/activemq/src/main/resources/config/replicated/activemq-users.properties @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You 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. +## --------------------------------------------------------------------------- +guest=guest \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml deleted file mode 100644 index f63079d..0000000 --- a/distribution/activemq/src/main/resources/config/replicated/activemq-users.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version='1.0'?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you 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. ---> - -<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq /schema/activemq-users.xsd"> - <!-- the default user. this is used where username is null--> - <defaultuser name="guest" password="guest"> - <role name="guest"/> - </defaultuser> -</configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml index 037f5d2..54c266c 100644 --- a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml +++ b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml @@ -22,7 +22,7 @@ <jms configuration="file:${activemq.home}/config/replicated/activemq-jms.xml"/> - <basic-security/> + <file-security configuration="file:${activemq.home}/config/non-clustered/activemq-users.xml"/> <web bind="http://localhost:8161"; path="web"> <app url="jolokia" war="jolokia-war-1.2.3.war"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4b63891a/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 index 970953a..1f00dae 100644 --- a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml @@ -21,104 +21,107 @@ under the License. <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-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="-Dactivemq.remoting.netty.host=localhost -Dactivemq.remoting.netty.port=5545 -Dactivemq.remoting.netty.batch.port=5555 -Dactivemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> - <param key="port" value="${activemq.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> - - + <jms xmlns="urn:activemq:jms"> + <queue name="DLQ"/> + <queue name="ExpiryQueue"/> + </jms> + <core xmlns="urn:activemq:core"> + <!-- + if you want to run this as a backup on different ports you would need to set the following variable + export CLUSTER_PROPS="-Dactivemq.remoting.netty.host=localhost -Dactivemq.remoting.netty.port=5545 -Dactivemq.remoting.netty.batch.port=5555 -Dactivemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.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> + </core> </configuration>
