You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2015/09/11 16:06:01 UTC
[1/8] activemq-artemis git commit: improving jdk detection and
javadoc options
Repository: activemq-artemis
Updated Branches:
refs/heads/master 7316609dd -> 243a94176
improving jdk detection and javadoc options
The build wasn't working at this stage unless I specified release due to some javadoc issues
What could break builds after releases
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/649edd3a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/649edd3a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/649edd3a
Branch: refs/heads/master
Commit: 649edd3a376819312d5e4552a90e83b4dbdc4929
Parents: 7316609
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Sep 10 13:56:20 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 11 09:05:25 2015 -0400
----------------------------------------------------------------------
pom.xml | 67 +++++++++++++++++++++++++++++++++---------------------------
1 file changed, 37 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/649edd3a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c06e961..f26dd51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,26 @@
<module>artemis-protocols</module>
<module>artemis-dto</module>
<module>artemis-boot</module>
+ <module>artemis-web</module>
+ <module>artemis-website</module>
+ <module>artemis-cli</module>
+ <module>artemis-commons</module>
+ <module>artemis-selector</module>
+ <module>artemis-core-client</module>
+ <module>artemis-server</module>
+ <module>artemis-jms-client</module>
+ <module>artemis-jms-server</module>
+ <module>artemis-native</module>
+ <module>artemis-journal</module>
+ <module>artemis-ra</module>
+ <module>artemis-rest</module>
+ <module>artemis-service-extensions</module>
+ <module>artemis-maven-plugin</module>
+ <module>integration/activemq-spring-integration</module>
+ <module>integration/activemq-aerogear-integration</module>
+ <module>integration/activemq-vertx-integration</module>
+ <module>artemis-distribution</module>
+ <module>tests</module>
</modules>
<name>ActiveMQ Artemis Parent</name>
@@ -483,6 +503,23 @@
</properties>
</profile>
<profile>
+ <id>jdk18</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>dev</id>
<modules>
<module>artemis-boot</module>
@@ -517,29 +554,6 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
- <modules>
- <module>artemis-dto</module>
- <module>artemis-web</module>
- <module>artemis-website</module>
- <module>artemis-cli</module>
- <module>artemis-commons</module>
- <module>artemis-selector</module>
- <module>artemis-core-client</module>
- <module>artemis-server</module>
- <module>artemis-jms-client</module>
- <module>artemis-jms-server</module>
- <module>artemis-native</module>
- <module>artemis-journal</module>
- <module>artemis-ra</module>
- <module>artemis-rest</module>
- <module>artemis-service-extensions</module>
- <module>artemis-maven-plugin</module>
- <module>integration/activemq-spring-integration</module>
- <module>integration/activemq-aerogear-integration</module>
- <module>integration/activemq-vertx-integration</module>
- <module>artemis-distribution</module>
- <module>tests</module>
- </modules>
</profile>
<profile>
<id>release</id>
@@ -594,13 +608,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
</plugins>
</build>
</profile>
[4/8] activemq-artemis git commit: removing old doc (non relevant any
longer)
Posted by ma...@apache.org.
removing old doc (non relevant any longer)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d3ea9aca
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d3ea9aca
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d3ea9aca
Branch: refs/heads/master
Commit: d3ea9aca504fc2305a55dc18d6e608cb8f95c181
Parents: e7e1e0c
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Sep 10 16:31:47 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 11 09:06:00 2015 -0400
----------------------------------------------------------------------
docs/user-manual/en/persistence.md | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d3ea9aca/docs/user-manual/en/persistence.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/persistence.md b/docs/user-manual/en/persistence.md
index c5f0862..a9269b1 100644
--- a/docs/user-manual/en/persistence.md
+++ b/docs/user-manual/en/persistence.md
@@ -269,7 +269,7 @@ The message journal is configured using the following attributes in
journal. The compacting algorithm won't start until you have at
least `journal-compact-min-files`
- Setting this to 0 will disable the feature to compact completely.
+ Setting this to 0 will disable the feature to compact completely.
This could be dangerous though as the journal could grow indefinitely.
Use it wisely!
@@ -354,29 +354,3 @@ straightforward. Simply set the parameter `persistence-enabled` in
Please note that if you set this parameter to false, then *zero*
persistence will occur. That means no bindings data, message data, large
message data, duplicate id caches or paging data will be persisted.
-
-## Import/Export the Journal Data
-
-You may want to inspect the existent records on each one of the journals
-used by Apache ActiveMQ Artemis, and you can use the export/import tool for that
-purpose.
-you can export the journal as a text file by using this command:
-
-`java -cp activemq-tools-jar-with-dependencies.jar export-journal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput>`
-
-To import the file as binary data on the journal (Notice you also
-require netty.jar):
-
-`java -cp activemq-tools-jar-with-dependencies.jar import-journal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileInput>`
-
-- JournalDirectory: Use the configured folder for your selected folder. Example: ./activemq/data/journal
-
-- JournalPrefix: Use the prefix for your selected journal, as discussed above
-
-- FileExtension: Use the extension for your selected journal, as discussed above
-
-- FileSize: Use the size for your selected journal, as discussed above
-
-- FileOutput or FileInput: text file that will contain the exported data
-
-See [Tools](tools.md) for more information.
[8/8] activemq-artemis git commit: Merge PR #166
Posted by ma...@apache.org.
Merge PR #166
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/243a9417
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/243a9417
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/243a9417
Branch: refs/heads/master
Commit: 243a94176d94bad87e5c0c89600dc980ee22ba29
Parents: 7316609 6cbde62
Author: Martyn Taylor <mt...@redhat.com>
Authored: Fri Sep 11 15:05:19 2015 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Fri Sep 11 15:05:19 2015 +0100
----------------------------------------------------------------------
README.md | 6 +
.../core/client/impl/ServerLocatorImpl.java | 71 ++++----
artemis-protocols/artemis-proton-plug/pom.xml | 4 +-
.../org/proton/plug/test/AbstractJMSTest.java | 34 +---
.../java/org/proton/plug/test/ProtonTest.java | 29 ++--
docs/user-manual/en/persistence.md | 28 +---
examples/protocols/amqp/pom.xml | 4 +-
examples/protocols/amqp/proton-j/pom.xml | 108 ------------
examples/protocols/amqp/proton-j/readme.html | 95 -----------
.../artemis/jms/example/ProtonJExample.java | 64 -------
.../activemq/server0/artemis-roles.properties | 17 --
.../activemq/server0/artemis-users.properties | 17 --
.../main/resources/activemq/server0/broker.xml | 68 --------
examples/protocols/amqp/queue/pom.xml | 108 ++++++++++++
examples/protocols/amqp/queue/readme.html | 46 +++++
.../artemis/jms/example/ProtonJExample.java | 67 ++++++++
pom.xml | 67 ++++----
tests/activemq5-unit-tests/pom.xml | 8 -
.../activemq/conversions/AmqpAndMqttTest.java | 119 -------------
tests/integration-tests/pom.xml | 4 +-
.../jms/cluster/MultipleThreadsOpeningTest.java | 33 ++--
.../tests/integration/proton/ProtonTest.java | 167 ++-----------------
22 files changed, 372 insertions(+), 792 deletions(-)
----------------------------------------------------------------------
[2/8] activemq-artemis git commit: Removing a non open wire test --
this test is only validating AMQP <-> MQTT converstion through ActiveMQ5. No
value for OpenWire tests
Posted by ma...@apache.org.
Removing a non open wire test
-- this test is only validating AMQP <-> MQTT converstion through ActiveMQ5. No value for OpenWire tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e7e1e0c6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e7e1e0c6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e7e1e0c6
Branch: refs/heads/master
Commit: e7e1e0c6ebd30748743585fa1620b1fa1aa47ed9
Parents: 7b2c504
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Sep 10 15:52:56 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 11 09:06:00 2015 -0400
----------------------------------------------------------------------
.../activemq/conversions/AmqpAndMqttTest.java | 119 -------------------
1 file changed, 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e7e1e0c6/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/conversions/AmqpAndMqttTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/conversions/AmqpAndMqttTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/conversions/AmqpAndMqttTest.java
deleted file mode 100644
index d9b7add..0000000
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/conversions/AmqpAndMqttTest.java
+++ /dev/null
@@ -1,119 +0,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.
- */
-package org.apache.activemq.conversions;
-
-import org.apache.activemq.CombinationTestSupport;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
-import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
-import org.apache.qpid.amqp_1_0.jms.impl.TopicImpl;
-import org.fusesource.mqtt.client.BlockingConnection;
-import org.fusesource.mqtt.client.MQTT;
-import org.fusesource.mqtt.client.QoS;
-
-import javax.jms.*;
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-
-/**
- */
-public class AmqpAndMqttTest extends CombinationTestSupport {
-
- protected BrokerService broker;
- private TransportConnector amqpConnector;
- private TransportConnector mqttConnector;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- broker = createBroker();
- broker.start();
- broker.waitUntilStarted();
- }
-
- @Override
- protected void tearDown() throws Exception {
- if (broker != null) {
- broker.stop();
- broker.waitUntilStopped();
- broker = null;
- }
- super.tearDown();
- }
-
- protected BrokerService createBroker() throws Exception {
- BrokerService broker = new BrokerService();
- broker.setPersistent(false);
- amqpConnector = broker.addConnector("amqp://0.0.0.0:0");
- mqttConnector = broker.addConnector("mqtt://0.0.0.0:0");
- return broker;
- }
-
- public void testFromMqttToAmqp() throws Exception {
- Connection amqp = createAmqpConnection();
- Session session = amqp.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageConsumer consumer = session.createConsumer(session.createTopic("topic://FOO"));
-
- final BlockingConnection mqtt = createMQTTConnection().blockingConnection();
- mqtt.connect();
- byte[] payload = bytes("Hello World");
- mqtt.publish("FOO", payload, QoS.AT_LEAST_ONCE, false);
- mqtt.disconnect();
-
- Message msg = consumer.receive(1000 * 5);
- assertNotNull(msg);
- assertTrue(msg instanceof BytesMessage);
-
- BytesMessage bmsg = (BytesMessage) msg;
- byte[] actual = new byte[(int) bmsg.getBodyLength()];
- bmsg.readBytes(actual);
- assertTrue(Arrays.equals(actual, payload));
- amqp.close();
- }
-
- private byte[] bytes(String value) {
- try {
- return value.getBytes("UTF-8");
- }
- catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- }
-
- protected MQTT createMQTTConnection() throws Exception {
- MQTT mqtt = new MQTT();
- mqtt.setConnectAttemptsMax(1);
- mqtt.setReconnectAttemptsMax(0);
- mqtt.setHost("localhost", mqttConnector.getConnectUri().getPort());
- return mqtt;
- }
-
- public Connection createAmqpConnection() throws Exception {
- final ConnectionFactoryImpl factory = new ConnectionFactoryImpl("localhost", amqpConnector.getConnectUri().getPort(), "admin", "password");
- final Connection connection = factory.createConnection();
- connection.setExceptionListener(new ExceptionListener() {
- @Override
- public void onException(JMSException exception) {
- exception.printStackTrace();
- }
- });
- connection.start();
- return connection;
- }
-
-}
[3/8] activemq-artemis git commit: using new qpid-jms client on AMQP
Posted by ma...@apache.org.
using new qpid-jms client on AMQP
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7b2c5041
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7b2c5041
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7b2c5041
Branch: refs/heads/master
Commit: 7b2c50415af90c748a6e1b343b45dcd5bec8b196
Parents: 649edd3
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Sep 10 13:57:18 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 11 09:06:00 2015 -0400
----------------------------------------------------------------------
artemis-protocols/artemis-proton-plug/pom.xml | 4 +-
.../org/proton/plug/test/AbstractJMSTest.java | 34 +---
.../java/org/proton/plug/test/ProtonTest.java | 29 ++--
examples/protocols/amqp/pom.xml | 4 +-
examples/protocols/amqp/proton-j/pom.xml | 108 -------------
examples/protocols/amqp/proton-j/readme.html | 95 -----------
.../artemis/jms/example/ProtonJExample.java | 64 --------
.../activemq/server0/artemis-roles.properties | 17 --
.../activemq/server0/artemis-users.properties | 17 --
.../main/resources/activemq/server0/broker.xml | 68 --------
examples/protocols/amqp/queue/pom.xml | 108 +++++++++++++
examples/protocols/amqp/queue/readme.html | 46 ++++++
.../artemis/jms/example/ProtonJExample.java | 67 ++++++++
tests/activemq5-unit-tests/pom.xml | 8 -
tests/integration-tests/pom.xml | 4 +-
.../tests/integration/proton/ProtonTest.java | 160 ++-----------------
16 files changed, 258 insertions(+), 575 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/artemis-protocols/artemis-proton-plug/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/pom.xml b/artemis-protocols/artemis-proton-plug/pom.xml
index cedbc87..47e3a91 100644
--- a/artemis-protocols/artemis-proton-plug/pom.xml
+++ b/artemis-protocols/artemis-proton-plug/pom.xml
@@ -88,8 +88,8 @@
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-amqp-1-0-client-jms</artifactId>
- <version>0.24</version>
+ <artifactId>qpid-jms-client</artifactId>
+ <version>0.5.0</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
index bccea5f..90fff62 100644
--- a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
+++ b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
@@ -21,24 +21,22 @@ import javax.jms.ConnectionFactory;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import javax.jms.Queue;
+import javax.jms.Session;
import java.lang.ref.WeakReference;
-import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
-import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
+import org.apache.qpid.jms.JmsConnectionFactory;
import org.proton.plug.test.minimalserver.DumbServer;
import org.proton.plug.test.minimalserver.MinimalServer;
public class AbstractJMSTest {
- protected final boolean useHawtJMS;
protected final boolean useSASL;
protected String address = "exampleQueue";
protected MinimalServer server = new MinimalServer();
- public AbstractJMSTest(boolean useHawtJMS, boolean useSASL) {
- this.useHawtJMS = useHawtJMS;
+ public AbstractJMSTest(boolean useSASL) {
this.useSASL = useSASL;
}
@@ -77,34 +75,16 @@ public class AbstractJMSTest {
protected ConnectionFactory createConnectionFactory() {
if (useSASL) {
- if (useHawtJMS) {
- // return new JmsConnectionFactory("aaaaaaaa", "aaaaaaa", "amqp://localhost:" + Constants.PORT);
- return null;
- }
- else {
- return new ConnectionFactoryImpl("localhost", Constants.PORT, "aaaaaaaa", "aaaaaaa");
- }
+ return new JmsConnectionFactory("aaaaaaaa", "aaaaaaa", "amqp://localhost:5672");
}
else {
- if (useHawtJMS) {
- // return new JmsConnectionFactory("amqp://localhost:" + Constants.PORT);
- return null;
- }
- else {
- return new ConnectionFactoryImpl("localhost", Constants.PORT, null, null);
- }
+ return new JmsConnectionFactory( "amqp://localhost:5672");
}
}
- protected Queue createQueue() {
- if (useHawtJMS) {
- // return new JmsQueue(address);
- return null;
- }
- else {
- return new QueueImpl(address);
- }
+ protected Queue createQueue(Session session) throws Exception {
+ return session.createQueue(address);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java
index bf972b6..e8be646 100644
--- a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java
+++ b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java
@@ -32,7 +32,6 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
-import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
import org.apache.qpid.proton.amqp.messaging.AmqpValue;
import org.apache.qpid.proton.amqp.messaging.Properties;
import org.apache.qpid.proton.message.Message;
@@ -59,16 +58,15 @@ public class ProtonTest extends AbstractJMSTest {
protected Connection connection;
- @Parameterized.Parameters(name = "useHawt={0} sasl={1}")
+ @Parameterized.Parameters(name = "sasl={0}")
public static Collection<Object[]> data() {
- List<Object[]> list = Arrays.asList(new Object[][]{{Boolean.FALSE, Boolean.TRUE}, {Boolean.FALSE, Boolean.FALSE}});
-
+ List<Object[]> list = Arrays.asList(new Object[][]{{Boolean.TRUE}, {Boolean.FALSE}});
System.out.println("Size = " + list.size());
return list;
}
- public ProtonTest(boolean useHawtJMS, boolean useSASL) {
- super(useHawtJMS, useSASL);
+ public ProtonTest(boolean useSASL) {
+ super(useSASL);
}
@Before
@@ -92,7 +90,6 @@ public class ProtonTest extends AbstractJMSTest {
public void testMessagesReceivedInParallel() throws Throwable {
final int numMessages = getNumberOfMessages();
long time = System.currentTimeMillis();
- final Queue queue = createQueue();
final ArrayList<Throwable> exceptions = new ArrayList<>();
@@ -105,6 +102,7 @@ public class ProtonTest extends AbstractJMSTest {
// connectionConsumer = connection;
connectionConsumer.start();
Session sessionConsumer = connectionConsumer.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ final Queue queue = createQueue(sessionConsumer);
final MessageConsumer consumer = sessionConsumer.createConsumer(queue);
int count = numMessages;
@@ -143,6 +141,7 @@ public class ProtonTest extends AbstractJMSTest {
Session session = connection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
t.start();
+ final Queue queue = createQueue(session);
MessageProducer p = session.createProducer(queue);
p.setDeliveryMode(DeliveryMode.PERSISTENT);
@@ -156,14 +155,14 @@ public class ProtonTest extends AbstractJMSTest {
}
long taken = (System.currentTimeMillis() - time);
- System.out.println("taken on send = " + taken + " usehawt = " + useHawtJMS + " sasl = " + useSASL);
+ System.out.println("taken on send = " + taken + " sasl = " + useSASL);
t.join();
for (Throwable e : exceptions) {
throw e;
}
taken = (System.currentTimeMillis() - time);
- System.out.println("taken = " + taken + " usehawt = " + useHawtJMS + " sasl = " + useSASL);
+ System.out.println("taken = " + taken + " sasl = " + useSASL);
connection.close();
// assertEquals(0, q.getMessageCount());
@@ -171,9 +170,9 @@ public class ProtonTest extends AbstractJMSTest {
@Test
public void testSimpleCreateSessionAndClose() throws Throwable {
- final QueueImpl queue = new QueueImpl(address);
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue queue = session.createQueue(address);
Thread.sleep(1000);
session.close();
connection.close();
@@ -183,10 +182,10 @@ public class ProtonTest extends AbstractJMSTest {
public void testSimpleBinary() throws Throwable {
final int numMessages = 5;
long time = System.currentTimeMillis();
- final QueueImpl queue = new QueueImpl(address);
-
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue queue = createQueue(session);
+
byte[] bytes = new byte[0xf + 1];
for (int i = 0; i <= 0xf; i++) {
bytes[i] = (byte) i;
@@ -230,8 +229,8 @@ public class ProtonTest extends AbstractJMSTest {
@Test
public void testMapMessage() throws Exception {
- Queue queue = createQueue();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue queue = createQueue(session);
MessageProducer p = session.createProducer(queue);
for (int i = 0; i < 10; i++) {
MapMessage message = session.createMapMessage();
@@ -252,8 +251,8 @@ public class ProtonTest extends AbstractJMSTest {
@Test
public void testProperties() throws Exception {
- Queue queue = createQueue();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue queue = createQueue(session);
MessageProducer p = session.createProducer(queue);
TextMessage message = session.createTextMessage();
message.setText("msg:0");
@@ -310,7 +309,7 @@ public class ProtonTest extends AbstractJMSTest {
Session clientSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
connection.start();
- MessageConsumer consumer = clientSession.createConsumer(createQueue());
+ MessageConsumer consumer = clientSession.createConsumer(createQueue(clientSession));
for (int i = 0; i < 1; i++) {
MapMessage msg = (MapMessage) consumer.receive(5000);
System.out.println("Msg " + msg);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/examples/protocols/amqp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/amqp/pom.xml b/examples/protocols/amqp/pom.xml
index 5841ad4..0f09732 100644
--- a/examples/protocols/amqp/pom.xml
+++ b/examples/protocols/amqp/pom.xml
@@ -48,7 +48,7 @@ under the License.
<id>release</id>
<modules>
<module>proton-cpp</module>
- <module>proton-j</module>
+ <module>queue</module>
<module>proton-ruby</module>
</modules>
</profile>
@@ -58,7 +58,7 @@ under the License.
<!-- this one to be run manually
<module>proton-cpp</module> -->
- <module>proton-j</module>
+ <module>queue</module>
<module>proton-ruby</module>
</modules>
</profile>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/examples/protocols/amqp/proton-j/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/amqp/proton-j/pom.xml b/examples/protocols/amqp/proton-j/pom.xml
deleted file mode 100644
index 4f57fdc..0000000
--- a/examples/protocols/amqp/proton-j/pom.xml
+++ /dev/null
@@ -1,108 +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.
--->
-
-<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.amqp</groupId>
- <artifactId>amqp</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>artemis-proton-j</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ Artemis Proton-J Example</name>
-
- <properties>
- <activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-amqp-1-0-client</artifactId>
- <version>0.22</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>create</id>
- <goals>
- <goal>create</goal>
- </goals>
- <configuration>
- <ignore>${noServer}</ignore>
- </configuration>
- </execution>
- <execution>
- <id>start</id>
- <goals>
- <goal>cli</goal>
- </goals>
- <configuration>
- <ignore>${noServer}</ignore>
- <spawn>true</spawn>
- <testURI>tcp://localhost:61616</testURI>
- <args>
- <param>run</param>
- </args>
- </configuration>
- </execution>
- <execution>
- <id>runClient</id>
- <goals>
- <goal>runClient</goal>
- </goals>
- <configuration>
- <clientClass>org.apache.activemq.artemis.jms.example.ProtonJExample</clientClass>
- </configuration>
- </execution>
- <execution>
- <id>stop</id>
- <goals>
- <goal>cli</goal>
- </goals>
- <configuration>
- <ignore>${noServer}</ignore>
- <args>
- <param>stop</param>
- </args>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq.examples.amqp</groupId>
- <artifactId>artemis-proton-j</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/examples/protocols/amqp/proton-j/readme.html
----------------------------------------------------------------------
diff --git a/examples/protocols/amqp/proton-j/readme.html b/examples/protocols/amqp/proton-j/readme.html
deleted file mode 100644
index b20054e..0000000
--- a/examples/protocols/amqp/proton-j/readme.html
+++ /dev/null
@@ -1,95 +0,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.
--->
-
-<html>
-<head>
- <title>ActiveMQ Artemis QPID java 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>Proton qpid java 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>ActiveMQ Artemis is a multi protocol broker. It will inspect the initial handshake of clients to determine what protocol to use.</p>
-<p>All you need to do is to connect a client into activemq's configured port and you should be able connect.</p>
-<p>To run this example simply run the command <literal>mvn verify -Pexample</literal>, execute the compile.sh script and start the executable called ./hello</p>
-
-<p>You don't need to do anything special to configure the ActiveMQ Artemis server to accept AMQP clients. </p>
-<p>Just for the sake of documentation though we are setting the port of ActiveMQ Artemis on this example as 5672 which is the port qpid have by default. </p>
-<p>This is totally optional and you don't need to follow this convention. You can use any port you chose including ActiveMQ's 61616 default port</p>
- <pre class="prettyprint">
- <code>
- <acceptor name="proton-acceptor">tcp://localhost:5672</acceptor>
- </code>
- </pre>
-<h2>Example step-by-step</h2>
-<ol>
- <li> Create an amqp qpid 1.0 connection.</li>
- <pre class="prettyprint">
- <code>connection= new Connection("localhost", 5672, null, null);</code>
- </pre>
-
- <li>Create a session</li>
- <pre class="prettyprint">
- <code>Session session = connection.createSession();</code>
- </pre>
-
- <li>Create a sender</li>
- <pre class="prettyprint">
- <code>Sender sender = session.createSender("testQueue");</code>
- </pre>
-
- <li>send a simple message</li>
- <pre class="prettyprint">
- <code>sender.send(new Message("I am an amqp message"));</code>
- </pre>
-
- <li>create a moving receiver, this means the message will be removed from the queue</li>
- <pre class="prettyprint">
- <code>Receiver rec = session.createMovingReceiver("testQueue");</code>
- </pre>
-
- <li>set some credit so we can receive</li>
- <pre class="prettyprint">
- <code>rec.setCredit(UnsignedInteger.valueOf(1), false);</code>
- </pre>
-
- <li>receive the simple message</li>
- <pre class="prettyprint">
- <code>Message m = rec.receive(5000);
- System.out.println("message = " + m.getPayload());</code>
- </pre>
-
- <li>acknowledge the message</li>
- <pre class="prettyprint">
- <code>rec.acknowledge(m);</code>
- </pre>
-
- <li>close the connection</li>
- <pre class="prettyprint">
- <code>connection.close();</code>
- </pre>
-</ol>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/examples/protocols/amqp/proton-j/src/main/java/org/apache/activemq/artemis/jms/example/ProtonJExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/amqp/proton-j/src/main/java/org/apache/activemq/artemis/jms/example/ProtonJExample.java b/examples/protocols/amqp/proton-j/src/main/java/org/apache/activemq/artemis/jms/example/ProtonJExample.java
deleted file mode 100644
index 85334b4..0000000
--- a/examples/protocols/amqp/proton-j/src/main/java/org/apache/activemq/artemis/jms/example/ProtonJExample.java
+++ /dev/null
@@ -1,64 +0,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.
- */
-package org.apache.activemq.artemis.jms.example;
-
-import org.apache.qpid.amqp_1_0.client.Connection;
-import org.apache.qpid.amqp_1_0.client.Message;
-import org.apache.qpid.amqp_1_0.client.Receiver;
-import org.apache.qpid.amqp_1_0.client.Sender;
-import org.apache.qpid.amqp_1_0.client.Session;
-import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
-
-public class ProtonJExample {
-
- public static void main(String[] args) throws Exception {
- Connection connection = null;
-
- try {
- // Step 1. Create an amqp qpid 1.0 connection
- connection = new Connection("localhost", 5672, null, null);
-
- // Step 2. Create a session
- Session session = connection.createSession();
-
- // Step 3. Create a sender
- Sender sender = session.createSender("jms.queue.exampleQueue");
-
- // Step 4. send a simple message
- sender.send(new Message("I am an amqp message"));
-
- // Step 5. create a moving receiver, this means the message will be removed from the queue
- Receiver rec = session.createMovingReceiver("jms.queue.exampleQueue");
-
- // Step 6. set some credit so we can receive
- rec.setCredit(UnsignedInteger.valueOf(1), false);
-
- // Step 7. receive the simple message
- Message m = rec.receive(5000);
- System.out.println("message = " + m.getPayload());
-
- // Step 8. acknowledge the message
- rec.acknowledge(m);
- }
- finally {
- if (connection != null) {
- // Step 9. close the connection
- connection.close();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/examples/protocols/amqp/proton-j/src/main/resources/activemq/server0/artemis-roles.properties
----------------------------------------------------------------------
diff --git a/examples/protocols/amqp/proton-j/src/main/resources/activemq/server0/artemis-roles.properties b/examples/protocols/amqp/proton-j/src/main/resources/activemq/server0/artemis-roles.properties
deleted file mode 100644
index 4e2d44c..0000000
--- a/examples/protocols/amqp/proton-j/src/main/resources/activemq/server0/artemis-roles.properties
+++ /dev/null
@@ -1,17 +0,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.
-## ---------------------------------------------------------------------------
-guest=guest
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/examples/protocols/amqp/proton-j/src/main/resources/activemq/server0/artemis-users.properties
----------------------------------------------------------------------
diff --git a/examples/protocols/amqp/proton-j/src/main/resources/activemq/server0/artemis-users.properties b/examples/protocols/amqp/proton-j/src/main/resources/activemq/server0/artemis-users.properties
deleted file mode 100644
index 4e2d44c..0000000
--- a/examples/protocols/amqp/proton-j/src/main/resources/activemq/server0/artemis-users.properties
+++ /dev/null
@@ -1,17 +0,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.
-## ---------------------------------------------------------------------------
-guest=guest
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/examples/protocols/amqp/proton-j/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/amqp/proton-j/src/main/resources/activemq/server0/broker.xml b/examples/protocols/amqp/proton-j/src/main/resources/activemq/server0/broker.xml
deleted file mode 100644
index f1df1c6..0000000
--- a/examples/protocols/amqp/proton-j/src/main/resources/activemq/server0/broker.xml
+++ /dev/null
@@ -1,68 +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:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:activemq"
- xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
- <jms xmlns="urn:activemq:jms">
- <!--the queue used by the example-->
- <queue name="exampleQueue"/>
- </jms>
-
- <core xmlns="urn:activemq:core">
-
- <bindings-directory>${data.dir}/server0/data/messaging/bindings</bindings-directory>
-
- <journal-directory>${data.dir}/server0/data/messaging/journal</journal-directory>
-
- <large-messages-directory>${data.dir}/server0/data/messaging/largemessages</large-messages-directory>
-
- <paging-directory>${data.dir}/server0/data/messaging/paging</paging-directory>
-
-
- <!-- Acceptors -->
- <acceptors>
- <acceptor name="proton-acceptor">tcp://localhost:5672</acceptor>
- <acceptor name="netty-acceptor">tcp://localhost:61616</acceptor>
- </acceptors>
-
- <queues>
- <queue name="testQueue">
- <address>testQueue</address>
- </queue>
- </queues>
-
- <!-- Other config -->
-
- <security-settings>
- <!--security for example queue-->
- <security-setting match="jms.queue.exampleQueue">
- <permission type="createDurableQueue" roles="guest"/>
- <permission type="deleteDurableQueue" roles="guest"/>
- <permission type="createNonDurableQueue" roles="guest"/>
- <permission type="deleteNonDurableQueue" roles="guest"/>
- <permission type="consume" roles="guest"/>
- <permission type="send" roles="guest"/>
- </security-setting>
- </security-settings>
-
- </core>
-</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/examples/protocols/amqp/queue/pom.xml
----------------------------------------------------------------------
diff --git a/examples/protocols/amqp/queue/pom.xml b/examples/protocols/amqp/queue/pom.xml
new file mode 100644
index 0000000..8a2b028
--- /dev/null
+++ b/examples/protocols/amqp/queue/pom.xml
@@ -0,0 +1,108 @@
+<?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.amqp</groupId>
+ <artifactId>amqp</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>queue</artifactId>
+ <packaging>jar</packaging>
+ <name>ActiveMQ Artemis Proton-J Example</name>
+
+ <properties>
+ <activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-jms-client</artifactId>
+ <version>0.5.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create</id>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ <configuration>
+ <ignore>${noServer}</ignore>
+ </configuration>
+ </execution>
+ <execution>
+ <id>start</id>
+ <goals>
+ <goal>cli</goal>
+ </goals>
+ <configuration>
+ <ignore>${noServer}</ignore>
+ <spawn>true</spawn>
+ <testURI>tcp://localhost:61616</testURI>
+ <args>
+ <param>run</param>
+ </args>
+ </configuration>
+ </execution>
+ <execution>
+ <id>runClient</id>
+ <goals>
+ <goal>runClient</goal>
+ </goals>
+ <configuration>
+ <clientClass>org.apache.activemq.artemis.jms.example.ProtonJExample</clientClass>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop</id>
+ <goals>
+ <goal>cli</goal>
+ </goals>
+ <configuration>
+ <ignore>${noServer}</ignore>
+ <args>
+ <param>stop</param>
+ </args>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.activemq.examples.amqp</groupId>
+ <artifactId>queue</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/examples/protocols/amqp/queue/readme.html
----------------------------------------------------------------------
diff --git a/examples/protocols/amqp/queue/readme.html b/examples/protocols/amqp/queue/readme.html
new file mode 100644
index 0000000..4eb1f0c
--- /dev/null
+++ b/examples/protocols/amqp/queue/readme.html
@@ -0,0 +1,46 @@
+<!--
+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 QPID java 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>Proton qpid java 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>ActiveMQ Artemis is a multi protocol broker. It will inspect the initial handshake of clients to determine what protocol to use.</p>
+<p>All you need to do is to connect a client into activemq's configured port and you should be able connect.</p>
+<p>To run this example simply run the command <literal>mvn verify -Pexample</literal>, execute the compile.sh script and start the executable called ./hello</p>
+
+<p>You don't need to do anything special to configure the ActiveMQ Artemis server to accept AMQP clients. </p>
+<p>Just for the sake of documentation though we are setting the port of ActiveMQ Artemis on this example as 5672 which is the port qpid have by default. </p>
+<p>This is totally optional and you don't need to follow this convention. You can use any port you chose including ActiveMQ's 61616 default port</p>
+ <pre class="prettyprint">
+ <code>
+ <acceptor name="proton-acceptor">tcp://localhost:5672</acceptor>
+ </code>
+ </pre>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/ProtonJExample.java
----------------------------------------------------------------------
diff --git a/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/ProtonJExample.java b/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/ProtonJExample.java
new file mode 100644
index 0000000..fa50e1a
--- /dev/null
+++ b/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/ProtonJExample.java
@@ -0,0 +1,67 @@
+/*
+ * 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 javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.MessageProducer;
+import javax.jms.*;
+
+
+import org.apache.qpid.jms.JmsConnectionFactory;
+
+public class ProtonJExample {
+
+ public static void main(String[] args) throws Exception {
+ Connection connection = null;
+ ConnectionFactory connectionFactory = new JmsConnectionFactory("amqp://localhost:5672");
+
+ try {
+
+
+ // Step 1. Create an amqp qpid 1.0 connection
+ connection = connectionFactory.createConnection();
+
+ // Step 2. Create a session
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ // Step 3. Create a sender
+ Queue queue = session.createQueue("jms.queue.exampleQueue");
+ MessageProducer sender = session.createProducer(queue);
+
+ // Step 4. send a few simple message
+ sender.send(session.createTextMessage("Hello world "));
+
+ connection.start();
+
+ // Step 5. create a moving receiver, this means the message will be removed from the queue
+ MessageConsumer consumer = session.createConsumer(queue);
+
+
+ // Step 7. receive the simple message
+ TextMessage m = (TextMessage) consumer.receive(5000);
+ System.out.println("message = " + m.getText());
+
+ }
+ finally {
+ if (connection != null) {
+ // Step 9. close the connection
+ connection.close();
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/tests/activemq5-unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/pom.xml b/tests/activemq5-unit-tests/pom.xml
index 8ee1050..9ac5c2a 100644
--- a/tests/activemq5-unit-tests/pom.xml
+++ b/tests/activemq5-unit-tests/pom.xml
@@ -37,7 +37,6 @@
<org-apache-derby-version>10.11.1.1</org-apache-derby-version>
<commons-io-version>2.4</commons-io-version>
<commons-net-version>3.3</commons-net-version>
- <qpid-jms-version>0.30</qpid-jms-version>
<xbean-version>3.18</xbean-version>
<hamcrest-version>1.3</hamcrest-version>
<slf4j-version>1.7.10</slf4j-version>
@@ -196,13 +195,6 @@
</dependency>
<dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-amqp-1-0-client-jms</artifactId>
- <version>${qpid-jms-version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean-version}</version>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/tests/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index c71286c..de8ca77 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -187,8 +187,8 @@
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-amqp-1-0-client-jms</artifactId>
- <version>0.24</version>
+ <artifactId>qpid-jms-client</artifactId>
+ <version>0.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
index 036be19..e779c14 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
@@ -40,22 +40,15 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.Random;
-import org.apache.activemq.artemis.api.core.management.ResourceNames;
-import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.apache.activemq.artemis.tests.util.RandomUtil;
-import org.apache.qpid.amqp_1_0.client.Receiver;
-import org.apache.qpid.amqp_1_0.client.Sender;
-import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
-import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
-import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.ByteUtil;
+import org.apache.qpid.jms.JmsConnectionFactory;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -737,153 +730,20 @@ public class ProtonTest extends ActiveMQTestBase {
connection.close();
}
- @Test
- public void testUsingPlainAMQP() throws Exception {
- if (this.protocol != 0 && protocol != 3) {
- return;
- }
-
- org.apache.qpid.amqp_1_0.client.Connection connection = null;
-
- try {
- // Step 1. Create an amqp qpid 1.0 connection
- connection = new org.apache.qpid.amqp_1_0.client.Connection("localhost", 5672, null, null);
-
- // Step 2. Create a session
- org.apache.qpid.amqp_1_0.client.Session session = connection.createSession();
-
- // Step 3. Create a sender
- Sender sender = session.createSender("jms.queue.exampleQueue");
-
- // Step 4. send a simple message
- sender.send(new org.apache.qpid.amqp_1_0.client.Message("I am an amqp message"));
-
- // Step 5. create a moving receiver, this means the message will be removed from the queue
- Receiver rec = session.createMovingReceiver("jms.queue.exampleQueue");
-
- // Step 6. set some credit so we can receive
- rec.setCredit(UnsignedInteger.valueOf(1), false);
-
- // Step 7. receive the simple message
- org.apache.qpid.amqp_1_0.client.Message m = rec.receive(5000);
- System.out.println("message = " + m.getPayload());
-
- // Step 8. acknowledge the message
- rec.acknowledge(m);
- }
- finally {
- if (connection != null) {
- // Step 9. close the connection
- connection.close();
- }
- }
- }
-
- @Test
- public void testUsingPlainAMQPSenderWithNonExistentQueue() throws Exception {
- if (this.protocol != 0 && protocol != 3) {
- return;
- }
-
- String queue = ResourceNames.JMS_QUEUE + RandomUtil.randomString();
-
- org.apache.qpid.amqp_1_0.client.Connection connection = null;
-
- try {
- // Step 1. Create an amqp qpid 1.0 connection
- connection = new org.apache.qpid.amqp_1_0.client.Connection("localhost", 5672, null, null);
-
- // Step 2. Create a session
- org.apache.qpid.amqp_1_0.client.Session session = connection.createSession();
-
- // Step 3. Create a sender
- Sender sender = session.createSender(queue);
-
- Assert.assertNotNull(server.locateQueue(new SimpleString(queue)));
-
- // Step 4. send a simple message
- sender.send(new org.apache.qpid.amqp_1_0.client.Message("I am an amqp message"));
-
- // Step 5. create a moving receiver, this means the message will be removed from the queue
- Receiver rec = session.createMovingReceiver(queue);
-
- // Step 6. set some credit so we can receive
- rec.setCredit(UnsignedInteger.valueOf(1), false);
-
- // Step 7. receive the simple message
- org.apache.qpid.amqp_1_0.client.Message m = rec.receive(5000);
- System.out.println("message = " + m.getPayload());
-
- // Step 8. acknowledge the message
- rec.acknowledge(m);
- }
- finally {
- if (connection != null) {
- // Step 9. close the connection
- connection.close();
- }
- }
- }
-
- @Test
- public void testUsingPlainAMQPReceiverWithNonExistentQueue() throws Exception {
- if (this.protocol != 0 && protocol != 3) {
- return;
- }
-
- String queue = ResourceNames.JMS_QUEUE + RandomUtil.randomString();
-
- org.apache.qpid.amqp_1_0.client.Connection connection = null;
-
+ private javax.jms.Queue createQueue(String address) throws Exception {
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
try {
- // Step 1. Create an amqp qpid 1.0 connection
- connection = new org.apache.qpid.amqp_1_0.client.Connection("localhost", 5672, null, null);
-
- // Step 2. Create a session
- org.apache.qpid.amqp_1_0.client.Session session = connection.createSession();
-
- // Step 3. create a moving receiver, this means the message will be removed from the queue
- Receiver rec = session.createMovingReceiver(queue);
-
- Assert.assertNotNull(server.locateQueue(new SimpleString(queue)));
-
- // Step 4. Create a sender
- Sender sender = session.createSender(queue);
-
- // Step 5. send a simple message
- sender.send(new org.apache.qpid.amqp_1_0.client.Message("I am an amqp message"));
-
- // Step 6. set some credit so we can receive
- rec.setCredit(UnsignedInteger.valueOf(1), false);
-
- // Step 7. receive the simple message
- org.apache.qpid.amqp_1_0.client.Message m = rec.receive(5000);
- System.out.println("message = " + m.getPayload());
-
- // Step 8. acknowledge the message
- rec.acknowledge(m);
+ return session.createQueue(address);
}
finally {
- if (connection != null) {
- // Step 9. close the connection
- connection.close();
- }
- }
- }
-
- private javax.jms.Queue createQueue(String address) {
- if (protocol == 0 || protocol == 3) {
- return new QueueImpl(address);
- }
- else {
- return ActiveMQJMSClient.createQueue(address);
+ session.close();
}
}
private javax.jms.Connection createConnection() throws JMSException {
Connection connection;
if (protocol == 3) {
- factory = new ConnectionFactoryImpl("localhost", 5672, null, null);
+ factory = new JmsConnectionFactory("amqp://localhost:5672");
connection = factory.createConnection();
connection.setExceptionListener(new ExceptionListener() {
@Override
@@ -894,7 +754,7 @@ public class ProtonTest extends ActiveMQTestBase {
connection.start();
}
else if (protocol == 0) {
- factory = new ConnectionFactoryImpl("localhost", 5672, "guest", "guest");
+ factory = new JmsConnectionFactory("guest", "guest", "amqp://localhost:5672");
connection = factory.createConnection();
connection.setExceptionListener(new ExceptionListener() {
@Override
@@ -909,12 +769,12 @@ public class ProtonTest extends ActiveMQTestBase {
if (protocol == 1) {
transport = new TransportConfiguration(INVM_CONNECTOR_FACTORY);
+ factory = new ActiveMQConnectionFactory("vm:/0");
}
else {
- transport = new TransportConfiguration(NETTY_CONNECTOR_FACTORY);
+ factory = new ActiveMQConnectionFactory();
}
- factory = new ActiveMQConnectionFactory(false, transport);
connection = factory.createConnection("guest", "guest");
connection.setExceptionListener(new ExceptionListener() {
@Override
[7/8] activemq-artemis git commit: small change on README around docs
Posted by ma...@apache.org.
small change on README around docs
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6cbde624
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6cbde624
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6cbde624
Branch: refs/heads/master
Commit: 6cbde624d8d912a49240fab2df122821a9ce2606
Parents: f5a7272
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Sep 11 09:18:53 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 11 09:18:53 2015 -0400
----------------------------------------------------------------------
README.md | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6cbde624/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 195441f..213688b 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,12 @@ This file describes some minimum 'stuff one needs to know' to get started coding
For details about the modifying the code, building the project, running tests, IDE integration, etc. see
our [Hacking Guide](./docs/hacking-guide/en/SUMMARY.md).
+## Documentation
+
+Our documentation is always in sync with our releases at the [Apache ActiveMQ Artemis](http://activemq.apache.org/artemis/docs.html) website.
+
+Or you can also look at the current master version on [github](https://github.com/apache/activemq-artemis/blob/master/docs/user-manual/en/SUMMARY.md).
+
## Examples
To run an example firstly make sure you have run
[6/8] activemq-artemis git commit: ARTEMIS-222 fixing a deadlock that
appeared on the testsuite (MultipleThreadsOpeningTest)
Posted by ma...@apache.org.
ARTEMIS-222 fixing a deadlock that appeared on the testsuite (MultipleThreadsOpeningTest)
https://issues.apache.org/jira/browse/ARTEMIS-222
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f5a72725
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f5a72725
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f5a72725
Branch: refs/heads/master
Commit: f5a727259e7d913c49130e57155ad7aa2616f79f
Parents: d5a0128
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Sep 10 16:22:38 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 11 09:07:49 2015 -0400
----------------------------------------------------------------------
.../core/client/impl/ServerLocatorImpl.java | 71 +++++++++++---------
.../jms/cluster/MultipleThreadsOpeningTest.java | 33 ++++++---
2 files changed, 64 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f5a72725/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
index bed47b7..c979246 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
@@ -561,32 +561,34 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
clusterTransportConfiguration = locator.clusterTransportConfiguration;
}
- private synchronized TransportConfiguration selectConnector() {
+ private TransportConfiguration selectConnector() {
Pair<TransportConfiguration, TransportConfiguration>[] usedTopology;
synchronized (topologyArrayGuard) {
usedTopology = topologyArray;
}
- // if the topologyArray is null, we will use the initialConnectors
- if (usedTopology != null) {
- if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) {
- ActiveMQClientLogger.LOGGER.trace("Selecting connector from toplogy.");
- }
- int pos = loadBalancingPolicy.select(usedTopology.length);
- Pair<TransportConfiguration, TransportConfiguration> pair = usedTopology[pos];
+ synchronized (this) {
+ // if the topologyArray is null, we will use the initialConnectors
+ if (usedTopology != null) {
+ if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) {
+ ActiveMQClientLogger.LOGGER.trace("Selecting connector from toplogy.");
+ }
+ int pos = loadBalancingPolicy.select(usedTopology.length);
+ Pair<TransportConfiguration, TransportConfiguration> pair = usedTopology[pos];
- return pair.getA();
- }
- else {
- // Get from initialconnectors
- if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) {
- ActiveMQClientLogger.LOGGER.trace("Selecting connector from initial connectors.");
+ return pair.getA();
}
+ else {
+ // Get from initialconnectors
+ if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) {
+ ActiveMQClientLogger.LOGGER.trace("Selecting connector from initial connectors.");
+ }
- int pos = loadBalancingPolicy.select(initialConnectors.length);
+ int pos = loadBalancingPolicy.select(initialConnectors.length);
- return initialConnectors[pos];
+ return initialConnectors[pos];
+ }
}
}
@@ -637,16 +639,23 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
}
private ClientSessionFactoryInternal connect(final boolean skipWarnings) throws ActiveMQException {
+ ClientSessionFactoryInternal returnFactory = null;
+
synchronized (this) {
// static list of initial connectors
if (getNumInitialConnectors() > 0 && discoveryGroup == null) {
- ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) staticConnector.connect(skipWarnings);
- addFactory(sf);
- return sf;
+ returnFactory = (ClientSessionFactoryInternal) staticConnector.connect(skipWarnings);
}
}
- // wait for discovery group to get the list of initial connectors
- return (ClientSessionFactoryInternal) createSessionFactory();
+
+ if (returnFactory != null) {
+ addFactory(returnFactory);
+ return returnFactory;
+ }
+ else {
+ // wait for discovery group to get the list of initial connectors
+ return (ClientSessionFactoryInternal) createSessionFactory();
+ }
}
@Override
@@ -844,11 +853,11 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
factory.cleanup();
throw ActiveMQClientMessageBundle.BUNDLE.connectionTimedOutOnReceiveTopology(discoveryGroup);
}
+ }
- addFactory(factory);
+ addFactory(factory);
- return factory;
- }
+ return factory;
}
public boolean isHA() {
@@ -1494,16 +1503,18 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
}
public void factoryClosed(final ClientSessionFactory factory) {
+ boolean isEmpty;
synchronized (factories) {
factories.remove(factory);
+ isEmpty = factories.isEmpty();
+ }
- if (!clusterConnection && factories.isEmpty()) {
- // Go back to using the broadcast or static list
- synchronized (topologyArrayGuard) {
- receivedTopology = false;
+ if (!clusterConnection && isEmpty) {
+ // Go back to using the broadcast or static list
+ synchronized (topologyArrayGuard) {
+ receivedTopology = false;
- topologyArray = null;
- }
+ topologyArray = null;
}
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f5a72725/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java
index 47669da..6475a13 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/MultipleThreadsOpeningTest.java
@@ -23,8 +23,8 @@ import java.util.concurrent.CountDownLatch;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.api.jms.JMSFactoryType;
-import org.apache.activemq.artemis.tests.util.JMSClusteredTestBase;
import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.artemis.tests.util.JMSClusteredTestBase;
import org.junit.Test;
public class MultipleThreadsOpeningTest extends JMSClusteredTestBase {
@@ -33,7 +33,7 @@ public class MultipleThreadsOpeningTest extends JMSClusteredTestBase {
public void testMultipleOpen() throws Exception {
cf1 = ActiveMQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(1)));
- final int numberOfOpens = 2000;
+ final int numberOfOpens = 500;
int numberOfThreads = 20;
// I want all the threads aligned, just ready to start creating connections like in a car race
final CountDownLatch flagAlignSemaphore = new CountDownLatch(numberOfThreads);
@@ -41,6 +41,10 @@ public class MultipleThreadsOpeningTest extends JMSClusteredTestBase {
class ThreadOpen extends Thread {
+ ThreadOpen(int i) {
+ super("MultipleThreadsOpeningTest/ThreadOpen::" + i);
+ }
+
int errors = 0;
public void run() {
@@ -50,8 +54,8 @@ public class MultipleThreadsOpeningTest extends JMSClusteredTestBase {
flagStartRace.await();
for (int i = 0; i < numberOfOpens; i++) {
- if (i % 1000 == 0)
- System.out.println("tests " + i);
+ if (i % 100 == 0)
+ System.out.println("connections created on Thread " + Thread.currentThread() + " " + i);
Connection conn = cf1.createConnection();
Session sess = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
sess.close();
@@ -68,18 +72,27 @@ public class MultipleThreadsOpeningTest extends JMSClusteredTestBase {
ThreadOpen[] threads = new ThreadOpen[numberOfThreads];
for (int i = 0; i < numberOfThreads; i++) {
- threads[i] = new ThreadOpen();
+ threads[i] = new ThreadOpen(i);
threads[i].start();
}
flagAlignSemaphore.await();
flagStartRace.countDown();
- for (ThreadOpen t : threads) {
- // 5 minutes seems long but this may take a bit of time in a slower box
- t.join(300000);
- assertFalse(t.isAlive());
- assertEquals("There are Errors on the test thread", 0, t.errors);
+ try {
+ for (ThreadOpen t : threads) {
+ t.join(60000);
+ assertFalse(t.isAlive());
+ assertEquals("There are Errors on the test thread", 0, t.errors);
+ }
+ }
+ finally {
+ for (ThreadOpen t : threads) {
+ if (t.isAlive()) {
+ t.interrupt();
+ }
+ t.join(1000);
+ }
}
}
}
[5/8] activemq-artemis git commit: Improving test.
Posted by ma...@apache.org.
Improving test.
There's a race here that only happens on Virtual Machines (VMWare.. etc)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d5a01287
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d5a01287
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d5a01287
Branch: refs/heads/master
Commit: d5a01287a5c54c3a6f1c1e8b22f7a4885cb83163
Parents: d3ea9ac
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Sep 10 17:50:07 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 11 09:06:38 2015 -0400
----------------------------------------------------------------------
.../activemq/artemis/tests/integration/proton/ProtonTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5a01287/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
index e779c14..7663f69 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
@@ -131,6 +131,7 @@ public class ProtonTest extends ActiveMQTestBase {
@After
public void tearDown() throws Exception {
try {
+ Thread.sleep(250);
if (connection != null) {
connection.close();
}
@@ -257,6 +258,10 @@ public class ProtonTest extends ActiveMQTestBase {
cons.close();
+ for (int i = 0; i < 100 && serverQueue.getConsumerCount() != 0; i++) {
+ Thread.sleep(500);
+ }
+
assertEquals(0, serverQueue.getConsumerCount());
session.close();
@@ -330,7 +335,7 @@ public class ProtonTest extends ActiveMQTestBase {
connection = createConnection();
session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer consumer = session.createConsumer(queue);
- Thread.sleep(1000);
+ Thread.sleep(100);
consumer.close();
connection.close();
Assert.assertEquals(numMessages, getMessageCount(q));