activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject activemq-artemis git commit: Added addressing to default config
Date Tue, 08 Nov 2016 11:27:40 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/ARTEMIS-780 f72aec041 -> 09222967b


Added addressing to default config


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/09222967
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/09222967
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/09222967

Branch: refs/heads/ARTEMIS-780
Commit: 09222967b810ac2176bef16fdfc2f0bda9f347e1
Parents: f72aec0
Author: Martyn Taylor <mtaylor@redhat.com>
Authored: Tue Nov 8 11:23:43 2016 +0000
Committer: Martyn Taylor <mtaylor@redhat.com>
Committed: Tue Nov 8 11:23:43 2016 +0000

----------------------------------------------------------------------
 .../artemis/cli/commands/etc/broker.xml         | 26 ++++++++++++++------
 .../cli/commands/etc/cluster-settings.txt       |  1 -
 2 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/09222967/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index 58c103c..0dc70c7 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -22,12 +22,8 @@ under the License.
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
 
-   <jms xmlns="urn:activemq:jms">
-      <queue name="DLQ"/>
-      <queue name="ExpiryQueue"/>${jms-list.settings}
-   </jms>
-
-   <core xmlns="urn:activemq:core">
+   <core xmlns="urn:activemq:core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="urn:activemq:core ">
 
       <name>${name}</name>
 
@@ -88,8 +84,8 @@ ${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
       <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>
+            <dead-letter-address>DLQ</dead-letter-address>
+            <expiry-address>ExpiryQueue</expiry-address>
             <redelivery-delay>0</redelivery-delay>
             <!-- with -1 only the global-max-size is in use for limiting -->
             <max-size-bytes>-1</max-size-bytes>
@@ -97,5 +93,19 @@ ${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
             <address-full-policy>PAGE</address-full-policy>
          </address-setting>
       </address-settings>
+
+      <addresses>
+         <address name="DLQ" type="anycast">
+            <queues>
+               <queue name="DLQ" />
+            </queues>
+         </address>
+         <address name="ExpiryQueue" type="anycast">
+            <queues>
+               <queue name="ExpiryQueue" />
+            </queues>
+         </address>
+      </addresses>
+
    </core>
 </configuration>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/09222967/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
index b7afbca..f639735 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
@@ -18,7 +18,6 @@
 
       <cluster-connections>
          <cluster-connection name="my-cluster">
-            <address>jms</address>
             <connector-ref>artemis</connector-ref>
             <message-load-balancing>${message-load-balancing}</message-load-balancing>
             <max-hops>${max-hops}</max-hops>


Mime
View raw message