activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [2/3] activemq-artemis git commit: ARTEMIS-1523 wildcard binding configured wrong
Date Tue, 12 Dec 2017 15:35:08 GMT
ARTEMIS-1523 wildcard binding configured wrong

Bindings with wildcards are not configured with the proper
message-load-balancing type.


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

Branch: refs/heads/master
Commit: 46b642447c20200fa29932d1fd5df596a7b97759
Parents: c8b7dce
Author: raul.valdoleiros <raul.valdoleiros@ceiia.com>
Authored: Fri Nov 24 17:53:14 2017 +0000
Committer: Justin Bertram <jbertram@apache.org>
Committed: Tue Dec 12 09:33:00 2017 -0600

----------------------------------------------------------------------
 .../artemis/core/postoffice/Bindings.java       |   2 +
 .../core/postoffice/impl/BindingsImpl.java      |   5 +
 .../postoffice/impl/WildcardAddressManager.java |  11 +-
 .../protocols/mqtt/clustered-queue-mqtt/pom.xml | 161 +++++++++++++++++++
 .../mqtt/clustered-queue-mqtt/readme.html       |  55 +++++++
 .../jms/example/ClusteredQueueMQTTExample.java  |  82 ++++++++++
 .../main/resources/activemq/server0/broker.xml  |  98 +++++++++++
 .../main/resources/activemq/server1/broker.xml  |  98 +++++++++++
 examples/protocols/mqtt/pom.xml                 |   2 +
 .../mqtt/imported/MqttClusterWildcardTest.java  | 122 ++++++++++++++
 .../impl/WildcardAddressManagerUnitTest.java    |   5 +
 11 files changed, 636 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46b64244/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java
index 1d335ad..f3592c4 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java
@@ -34,6 +34,8 @@ public interface Bindings extends UnproposalListener {
 
    void setMessageLoadBalancingType(MessageLoadBalancingType messageLoadBalancingType);
 
+   MessageLoadBalancingType getMessageLoadBalancingType();
+
    boolean redistribute(Message message, Queue originatingQueue, RoutingContext context)
throws Exception;
 
    void route(Message message, RoutingContext context) throws Exception;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46b64244/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
index c3d2f0f..2e2b31c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
@@ -78,6 +78,11 @@ public final class BindingsImpl implements Bindings {
    }
 
    @Override
+   public MessageLoadBalancingType getMessageLoadBalancingType() {
+      return this.messageLoadBalancingType;
+   }
+
+   @Override
    public Collection<Binding> getBindings() {
       return bindingsMap.values();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46b64244/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
index b1d15c3..8ff1a38 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
@@ -16,11 +16,6 @@
  */
 package org.apache.activemq.artemis.core.postoffice.impl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.config.WildcardConfiguration;
 import org.apache.activemq.artemis.core.persistence.StorageManager;
@@ -30,6 +25,11 @@ import org.apache.activemq.artemis.core.postoffice.Bindings;
 import org.apache.activemq.artemis.core.postoffice.BindingsFactory;
 import org.apache.activemq.artemis.core.transaction.Transaction;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
  * extends the simple manager to allow wildcard addresses to be used.
  */
@@ -67,6 +67,7 @@ public class WildcardAddressManager extends SimpleAddressManager {
                   for (Binding theBinding : theBindings) {
                      super.addMappingInternal(address, theBinding);
                   }
+                  super.getBindingsForRoutingAddress(address).setMessageLoadBalancingType(b.getMessageLoadBalancingType());
                }
             }
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46b64244/examples/protocols/mqtt/clustered-queue-mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/mqtt/clustered-queue-mqtt/pom.xml b/examples/protocols/mqtt/clustered-queue-mqtt/pom.xml
new file mode 100644
index 0000000..6deacc0
--- /dev/null
+++ b/examples/protocols/mqtt/clustered-queue-mqtt/pom.xml
@@ -0,0 +1,161 @@
+<?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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.apache.activemq.examples.clustered</groupId>
+      <artifactId>broker-clustered</artifactId>
+      <version>2.5.0-SNAPSHOT</version>
+   </parent>
+
+   <artifactId>clustered-queue-mqtt</artifactId>
+   <packaging>jar</packaging>
+   <name>ActiveMQ Artemis JMS Clustered Queue Example</name>
+
+   <properties>
+      <activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
+   </properties>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-jms-client</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.fusesource.mqtt-client</groupId>
+         <artifactId>mqtt-client</artifactId>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>artemis-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>create0</id>
+                  <goals>
+                     <goal>create</goal>
+                  </goals>
+                  <configuration>
+                     <ignore>${noServer}</ignore>
+                     <instance>${basedir}/target/server0</instance>
+                     <configuration>${basedir}/target/classes/activemq/server0</configuration>
+                     <!-- this makes it easier in certain envs -->
+                     <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>create1</id>
+                  <goals>
+                     <goal>create</goal>
+                  </goals>
+                  <configuration>
+                     <ignore>${noServer}</ignore>
+                     <instance>${basedir}/target/server1</instance>
+                     <configuration>${basedir}/target/classes/activemq/server1</configuration>
+                     <!-- this makes it easier in certain envs -->
+                     <javaOptions>-Djava.net.preferIPv4Stack=true</javaOptions>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>start0</id>
+                  <goals>
+                     <goal>cli</goal>
+                  </goals>
+                  <configuration>
+                     <ignore>${noServer}</ignore>
+                     <spawn>true</spawn>
+                     <location>${basedir}/target/server0</location>
+                     <testURI>tcp://localhost:61616</testURI>
+                     <args>
+                        <param>run</param>
+                     </args>
+                     <name>server0</name>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>start1</id>
+                  <goals>
+                     <goal>cli</goal>
+                  </goals>
+                  <configuration>
+                     <ignore>${noServer}</ignore>
+                     <spawn>true</spawn>
+                     <location>${basedir}/target/server1</location>
+                     <testURI>tcp://localhost:61617</testURI>
+                     <args>
+                        <param>run</param>
+                     </args>
+                     <name>server1</name>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>runClient</id>
+                  <goals>
+                     <goal>runClient</goal>
+                  </goals>
+                  <configuration>
+                     <clientClass>org.apache.activemq.artemis.jms.example.ClusteredQueueMQTTExample</clientClass>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>stop0</id>
+                  <goals>
+                     <goal>cli</goal>
+                  </goals>
+                  <configuration>
+                     <ignore>${noServer}</ignore>
+                     <location>${basedir}/target/server0</location>
+                     <args>
+                        <param>stop</param>
+                     </args>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>stop1</id>
+                  <goals>
+                     <goal>cli</goal>
+                  </goals>
+                  <configuration>
+                     <ignore>${noServer}</ignore>
+                     <location>${basedir}/target/server1</location>
+                     <args>
+                        <param>stop</param>
+                     </args>
+                  </configuration>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>org.apache.activemq.examples.clustered</groupId>
+                  <artifactId>clustered-queue-mqtt</artifactId>
+                  <version>${project.version}</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+      </plugins>
+   </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46b64244/examples/protocols/mqtt/clustered-queue-mqtt/readme.html
----------------------------------------------------------------------
diff --git a/examples/protocols/mqtt/clustered-queue-mqtt/readme.html b/examples/protocols/mqtt/clustered-queue-mqtt/readme.html
new file mode 100644
index 0000000..a39fc4c
--- /dev/null
+++ b/examples/protocols/mqtt/clustered-queue-mqtt/readme.html
@@ -0,0 +1,55 @@
+<!--
+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.
+-->
+
+<html>
+  <head>
+    <title>ActiveMQ Artemis JMS Load Balanced Clustered Queue Example</title>
+    <link rel="stylesheet" type="text/css" href="../../../common/common.css" />
+    <link rel="stylesheet" type="text/css" href="../../../common/prettify.css" />
+    <script type="text/javascript" src="../../../common/prettify.js"></script>
+  </head>
+  <body onload="prettyPrint()">
+     <h1>JMS Load Balanced Clustered Queue Example</h1>
+
+     <pre>To run the example, simply type <b>mvn verify</b> from this directory,
<br>or <b>mvn -PnoServer verify</b> if you want to start and create the
server manually.</pre>
+
+     <p>This example demonstrates a JMS queue deployed on two different nodes. The
two nodes are configured to form a cluster.</p>
+     <p>We then create a consumer on the queue on each node, and we create a producer
on only one of the nodes.</p>
+     <p>We then send some messages via the producer, and we verify that <b>both</b>
consumers receive the sent messages
+     in a round-robin fashion.</p>
+     <p>In other words, ActiveMQ Artemis <b>load balances</b> the sent
messages across all consumers on the cluster</p>
+     <p>This example uses JNDI to lookup the JMS Queue and ConnectionFactory objects.
If you prefer not to use
+     JNDI, these could be instantiated directly.</p>
+     <p>Here's the relevant snippet from the server configuration, which tells the
server to form a cluster between the two nodes
+     and to load balance the messages between the nodes.</p>
+     <pre class="prettyprint">
+     <code>&lt;cluster-connection name="my-cluster"&gt;
+        &lt;connector-ref>netty-connector&lt;/connector-ref>
+        &lt;retry-interval&gt;500&lt;/retry-interval&gt;
+        &lt;use-duplicate-detection&gt;true&lt;/use-duplicate-detection&gt;
+        &lt;message-load-balancing&gt;STRICT&lt;/message-load-balancing&gt;
+        &lt;max-hops&gt;1&lt;/max-hops&gt;
+        &lt;discovery-group-ref discovery-group-name="my-discovery-group"/&gt;
+     &lt;/cluster-connection&gt;
+     </code>
+     </pre>
+     <p>For more information on ActiveMQ Artemis load balancing, and clustering in
general, please see the clustering
+     section of the user manual.</p>
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46b64244/examples/protocols/mqtt/clustered-queue-mqtt/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredQueueMQTTExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/mqtt/clustered-queue-mqtt/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredQueueMQTTExample.java
b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredQueueMQTTExample.java
new file mode 100644
index 0000000..0f60ac3
--- /dev/null
+++ b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredQueueMQTTExample.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+package org.apache.activemq.artemis.jms.example;
+
+import java.util.concurrent.TimeUnit;
+import org.fusesource.mqtt.client.BlockingConnection;
+import org.fusesource.mqtt.client.MQTT;
+import org.fusesource.mqtt.client.Message;
+import org.fusesource.mqtt.client.QoS;
+import org.fusesource.mqtt.client.Topic;
+
+/**
+ * A simple example that demonstrates server side load-balancing of messages between the
queue instances on different
+ * nodes of the cluster.
+ */
+public class ClusteredQueueMQTTExample {
+
+   public static void main(final String[] args) throws Exception {
+      // Create a new MQTT connection to the broker.  We are not setting the client ID. 
The broker will pick one for us.
+      System.out.println("Connecting to Artemis using MQTT");
+      BlockingConnection connection1 = retrieveMQTTConnection("tcp://localhost:1883");
+      System.out.println("Connected to Artemis 1");
+      BlockingConnection connection2 = retrieveMQTTConnection("tcp://localhost:1884");
+      System.out.println("Connected to Artemis 2");
+
+      // Subscribe to topics
+      Topic[] topics = {new Topic("test/+/some/#", QoS.AT_MOST_ONCE)};
+      connection1.subscribe(topics);
+      connection2.subscribe(topics);
+      System.out.println("Subscribed to topics.");
+
+      // Publish Messages
+      String payload1 = "This is message 1";
+      String payload2 = "This is message 2";
+      String payload3 = "This is message 3";
+
+      connection1.publish("test/1/some/la", payload1.getBytes(), QoS.AT_LEAST_ONCE, false);
+      connection1.publish("test/1/some/la", payload2.getBytes(), QoS.AT_MOST_ONCE, false);
+      connection1.publish("test/1/some/la", payload3.getBytes(), QoS.AT_MOST_ONCE, false);
+      System.out.println("Sent messages.");
+
+      Message message1 = connection1.receive(5, TimeUnit.SECONDS);
+      Message message2 = connection1.receive(5, TimeUnit.SECONDS);
+      Message message3 = connection1.receive(5, TimeUnit.SECONDS);
+      Message message4 = connection2.receive(5, TimeUnit.SECONDS);
+      Message message5 = connection2.receive(5, TimeUnit.SECONDS);
+      Message message6 = connection2.receive(5, TimeUnit.SECONDS);
+      System.out.println("Received messages.");
+
+      System.out.println("Broker 1: " + new String(message1.getPayload()));
+      System.out.println("Broker 1: " + new String(message2.getPayload()));
+      System.out.println("Broker 1: " + new String(message3.getPayload()));
+      System.out.println("Broker 2: " + new String(message4.getPayload()));
+      System.out.println("Broker 2: " + new String(message5.getPayload()));
+      System.out.println("Broker 2: " + new String(message6.getPayload()));
+   }
+
+   private static BlockingConnection retrieveMQTTConnection(String host) throws Exception
{
+      MQTT mqtt = new MQTT();
+      mqtt.setHost(host);
+      mqtt.setUserName("admin");
+      mqtt.setPassword("admin");
+      BlockingConnection connection = mqtt.blockingConnection();
+      connection.connect();
+      return connection;
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46b64244/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server0/broker.xml
b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server0/broker.xml
new file mode 100644
index 0000000..bc43659
--- /dev/null
+++ b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server0/broker.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+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/artemis-server.xsd">
+    <core xmlns="urn:activemq:core">
+        <security-enabled>false</security-enabled>
+
+        <bindings-directory>./data/bindings</bindings-directory>
+
+        <journal-directory>./data/journal</journal-directory>
+
+        <large-messages-directory>./data/largemessages</large-messages-directory>
+
+        <paging-directory>./data/paging</paging-directory>
+
+        <!-- Connectors -->
+        <connectors>
+            <connector name="netty-connector">tcp://localhost:61616</connector>
+        </connectors>
+
+        <!-- Acceptors -->
+        <acceptors>
+            <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
+            <acceptor name="mqtt">tcp://0.0.0.0:1883?protocols=MQTT</acceptor>
+        </acceptors>
+
+        <!-- Clustering configuration -->
+        <broadcast-groups>
+            <broadcast-group name="my-broadcast-group">
+                <group-address>${udp-address:231.7.7.7}</group-address>
+                <group-port>9876</group-port>
+                <broadcast-period>100</broadcast-period>
+                <connector-ref>netty-connector</connector-ref>
+            </broadcast-group>
+        </broadcast-groups>
+
+        <discovery-groups>
+            <discovery-group name="my-discovery-group">
+                <group-address>${udp-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>test/+/some/#</address> -->
+                <connector-ref>netty-connector</connector-ref>
+                <retry-interval>5</retry-interval>
+                <use-duplicate-detection>true</use-duplicate-detection>
+                <message-load-balancing>STRICT</message-load-balancing>
+                <max-hops>1</max-hops>
+                <discovery-group-ref discovery-group-name="my-discovery-group"/>
+            </cluster-connection>
+        </cluster-connections>
+
+        <!-- Other config -->
+
+        <security-settings>
+            <security-setting match="#">
+                <permission type="createNonDurableQueue" roles="amq"/>
+                <permission type="deleteNonDurableQueue" roles="amq"/>
+                <permission type="createDurableQueue" roles="amq"/>
+                <permission type="deleteDurableQueue" roles="amq"/>
+                <permission type="createAddress" roles="amq"/>
+                <permission type="deleteAddress" roles="amq"/>
+                <permission type="consume" roles="amq"/>
+                <permission type="browse" roles="amq"/>
+                <permission type="send" roles="amq"/>
+                <!-- we need this otherwise ./artemis data imp wouldn't work -->
+                <permission type="manage" roles="amq"/>
+            </security-setting>
+        </security-settings>
+
+        <wildcard-addresses>
+            <routing-enabled>true</routing-enabled>
+            <delimiter>/</delimiter>
+            <any-words>#</any-words>
+            <single-word>+</single-word>
+        </wildcard-addresses>
+    </core>
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46b64244/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server1/broker.xml
b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server1/broker.xml
new file mode 100644
index 0000000..6b386da
--- /dev/null
+++ b/examples/protocols/mqtt/clustered-queue-mqtt/src/main/resources/activemq/server1/broker.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+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/artemis-server.xsd">
+    <core xmlns="urn:activemq:core">
+        <security-enabled>false</security-enabled>
+
+        <bindings-directory>target/server1/data/messaging/bindings</bindings-directory>
+
+        <journal-directory>target/server1/data/messaging/journal</journal-directory>
+
+        <large-messages-directory>target/server1/data/messaging/largemessages</large-messages-directory>
+
+        <paging-directory>target/server1/data/messaging/paging</paging-directory>
+
+        <!-- Connectors -->
+        <connectors>
+            <connector name="netty-connector">tcp://localhost:61617</connector>
+        </connectors>
+
+        <!-- Acceptors -->
+        <acceptors>
+            <acceptor name="netty-acceptor">tcp://localhost:61617</acceptor>
+            <acceptor name="mqtt">tcp://0.0.0.0:1884?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;protocols=MQTT;useEpoll=true</acceptor>
+        </acceptors>
+
+        <!-- Clustering configuration -->
+        <broadcast-groups>
+            <broadcast-group name="my-broadcast-group">
+                <group-address>${udp-address:231.7.7.7}</group-address>
+                <group-port>9876</group-port>
+                <broadcast-period>100</broadcast-period>
+                <connector-ref>netty-connector</connector-ref>
+            </broadcast-group>
+        </broadcast-groups>
+
+        <discovery-groups>
+            <discovery-group name="my-discovery-group">
+                <group-address>${udp-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>test/+/some/#</address> -->
+                <connector-ref>netty-connector</connector-ref>
+                <retry-interval>5</retry-interval>
+                <use-duplicate-detection>true</use-duplicate-detection>
+                <message-load-balancing>STRICT</message-load-balancing>
+                <max-hops>1</max-hops>
+                <discovery-group-ref discovery-group-name="my-discovery-group"/>
+            </cluster-connection>
+        </cluster-connections>
+
+        <!-- Other config -->
+
+        <security-settings>
+            <security-setting match="#">
+                <permission type="createNonDurableQueue" roles="amq"/>
+                <permission type="deleteNonDurableQueue" roles="amq"/>
+                <permission type="createDurableQueue" roles="amq"/>
+                <permission type="deleteDurableQueue" roles="amq"/>
+                <permission type="createAddress" roles="amq"/>
+                <permission type="deleteAddress" roles="amq"/>
+                <permission type="consume" roles="amq"/>
+                <permission type="browse" roles="amq"/>
+                <permission type="send" roles="amq"/>
+                <!-- we need this otherwise ./artemis data imp wouldn't work -->
+                <permission type="manage" roles="amq"/>
+            </security-setting>
+        </security-settings>
+
+        <wildcard-addresses>
+            <routing-enabled>true</routing-enabled>
+            <delimiter>/</delimiter>
+            <any-words>#</any-words>
+            <single-word>+</single-word>
+        </wildcard-addresses>
+    </core>
+</configuration>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46b64244/examples/protocols/mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/mqtt/pom.xml b/examples/protocols/mqtt/pom.xml
index afdb5ba..5df091c 100644
--- a/examples/protocols/mqtt/pom.xml
+++ b/examples/protocols/mqtt/pom.xml
@@ -41,12 +41,14 @@ under the License.
          <id>release</id>
          <modules>
             <module>basic-pubsub</module>
+            <module>clustered-queue-mqtt</module>
          </modules>
       </profile>
       <profile>
          <id>examples</id>
          <modules>
             <module>basic-pubsub</module>
+            <module>clustered-queue-mqtt</module>
          </modules>
       </profile>
    </profiles>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46b64244/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java
new file mode 100644
index 0000000..5485f57
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MqttClusterWildcardTest.java
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+package org.apache.activemq.artemis.tests.integration.mqtt.imported;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.activemq.artemis.core.config.WildcardConfiguration;
+import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
+import org.apache.activemq.artemis.tests.integration.cluster.distribution.ClusterTestBase;
+import org.fusesource.mqtt.client.BlockingConnection;
+import org.fusesource.mqtt.client.MQTT;
+import org.fusesource.mqtt.client.Message;
+import org.fusesource.mqtt.client.QoS;
+import org.fusesource.mqtt.client.Topic;
+import org.junit.Test;
+
+public class MqttClusterWildcardTest extends ClusterTestBase {
+
+   @Override
+   protected boolean isResolveProtocols() {
+      return true;
+   }
+
+   public boolean isNetty() {
+      return true;
+   }
+
+   @Test
+   public void loadBalanceRequests() throws Exception {
+      final String TOPIC = "test/+/some/#";
+
+      WildcardConfiguration wildcardConfiguration = new WildcardConfiguration();
+      wildcardConfiguration.setAnyWords('#');
+      wildcardConfiguration.setDelimiter('/');
+      wildcardConfiguration.setRoutingEnabled(true);
+      wildcardConfiguration.setSingleWord('+');
+
+      setupServer(0, false, isNetty());
+      servers[0].getConfiguration().setWildCardConfiguration(wildcardConfiguration);
+      setupServer(1, false, isNetty());
+      servers[1].getConfiguration().setWildCardConfiguration(wildcardConfiguration);
+
+      setupClusterConnection("cluster0", "", MessageLoadBalancingType.ON_DEMAND, 1, isNetty(),
0, 1);
+      setupClusterConnection("cluster1", "", MessageLoadBalancingType.ON_DEMAND, 1, isNetty(),
1, 0);
+
+      startServers(0, 1);
+
+      BlockingConnection connection1 = null;
+      BlockingConnection connection2 = null;
+      try {
+         connection1 = retrieveMQTTConnection("tcp://localhost:61616");
+         connection2 = retrieveMQTTConnection("tcp://localhost:61617");
+
+         // Subscribe to topics
+         Topic[] topics = {new Topic(TOPIC, QoS.AT_MOST_ONCE)};
+         connection1.subscribe(topics);
+         connection2.subscribe(topics);
+
+         waitForBindings(0, TOPIC, 1, 1, true);
+         waitForBindings(1, TOPIC, 1, 1, true);
+
+         waitForBindings(0, TOPIC, 1, 1, false);
+         waitForBindings(1, TOPIC, 1, 1, false);
+
+         // Publish Messages
+         String payload1 = "This is message 1";
+         String payload2 = "This is message 2";
+         String payload3 = "This is message 3";
+
+         connection1.publish("test/1/some/la", payload1.getBytes(), QoS.AT_LEAST_ONCE, false);
+         connection1.publish("test/1/some/la", payload2.getBytes(), QoS.AT_MOST_ONCE, false);
+         connection1.publish("test/1/some/la", payload3.getBytes(), QoS.AT_MOST_ONCE, false);
+
+         Message message1 = connection1.receive(5, TimeUnit.SECONDS);
+         Message message2 = connection1.receive(5, TimeUnit.SECONDS);
+         Message message3 = connection1.receive(5, TimeUnit.SECONDS);
+         Message message4 = connection2.receive(5, TimeUnit.SECONDS);
+         Message message5 = connection2.receive(5, TimeUnit.SECONDS);
+         Message message6 = connection2.receive(5, TimeUnit.SECONDS);
+
+         assertEquals(payload1, new String(message1.getPayload()));
+         assertEquals(payload2, new String(message2.getPayload()));
+         assertEquals(payload3, new String(message3.getPayload()));
+         assertEquals(payload1, new String(message4.getPayload()));
+         assertEquals(payload2, new String(message5.getPayload()));
+         assertEquals(payload3, new String(message6.getPayload()));
+
+      } finally {
+         String[] topics = new String[]{TOPIC};
+         if (connection1 != null) {
+            connection1.unsubscribe(topics);
+            connection1.disconnect();
+         }
+         if (connection2 != null) {
+            connection2.unsubscribe(topics);
+            connection2.disconnect();
+         }
+      }
+   }
+
+   private static BlockingConnection retrieveMQTTConnection(String host) throws Exception
{
+      MQTT mqtt = new MQTT();
+      mqtt.setHost(host);
+      BlockingConnection connection = mqtt.blockingConnection();
+      connection.connect();
+      return connection;
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46b64244/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
index d88d18f..f628fa0 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
@@ -230,6 +230,11 @@ public class WildcardAddressManagerUnitTest extends ActiveMQTestBase
{
       }
 
       @Override
+      public MessageLoadBalancingType getMessageLoadBalancingType() {
+         return null;
+      }
+
+      @Override
       public void unproposed(SimpleString groupID) {
       }
 


Mime
View raw message