You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/08/05 15:57:00 UTC

[1/4] activemq-artemis git commit: new method to create ServerLocator

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 72b7f8271 -> 5c7720dba


new method to create ServerLocator


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

Branch: refs/heads/master
Commit: ee84d7efdf953ffce53b893d007b1aa350bb2e37
Parents: 896813f
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Aug 5 09:22:41 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 5 09:24:22 2015 -0400

----------------------------------------------------------------------
 .../core/client/impl/ServerLocatorImpl.java     | 28 ++++++++++++++++++++
 .../jms/client/ActiveMQConnectionFactory.java   |  4 +--
 2 files changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ee84d7ef/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 8ed0116..64b5b92 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
@@ -19,6 +19,7 @@ package org.apache.activemq.artemis.core.client.impl;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.lang.reflect.Array;
+import java.net.URI;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
@@ -48,6 +49,7 @@ import org.apache.activemq.artemis.api.core.TransportConfiguration;
 import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
 import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
 import org.apache.activemq.artemis.api.core.client.TopologyMember;
 import org.apache.activemq.artemis.api.core.client.loadbalance.ConnectionLoadBalancingPolicy;
 import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
@@ -60,6 +62,7 @@ import org.apache.activemq.artemis.core.remoting.FailureListener;
 import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManager;
 import org.apache.activemq.artemis.spi.core.remoting.ClientProtocolManagerFactory;
 import org.apache.activemq.artemis.spi.core.remoting.Connector;
+import org.apache.activemq.artemis.uri.ServerLocatorParser;
 import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
 import org.apache.activemq.artemis.utils.ClassloadingUtil;
 import org.apache.activemq.artemis.utils.UUIDGenerator;
@@ -471,6 +474,31 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
       clusterConnection = false;
    }
 
+   public static ServerLocator newLocator(String uri)
+   {
+      try
+      {
+         return newLocator(new URI(uri));
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public static ServerLocator newLocator(URI uri)
+   {
+      try
+      {
+         ServerLocatorParser parser = new ServerLocatorParser();
+         return parser.newObject(uri, null);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
    /**
     * Create a ServerLocatorImpl using UDP discovery to lookup cluster
     */

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ee84d7ef/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
index 1a84830..0630876 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
@@ -47,6 +47,7 @@ import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
 import org.apache.activemq.artemis.api.core.client.ServerLocator;
 import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
 import org.apache.activemq.artemis.jms.referenceable.ConnectionFactoryObjectFactory;
 import org.apache.activemq.artemis.jms.referenceable.SerializableObjectRefAddr;
 import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
@@ -162,11 +163,10 @@ public class ActiveMQConnectionFactory implements Externalizable, Referenceable,
    public ActiveMQConnectionFactory(String url)
    {
       ConnectionFactoryParser cfParser = new ConnectionFactoryParser();
-      ServerLocatorParser locatorParser = new ServerLocatorParser();
       try
       {
          URI uri = new URI(url);
-         serverLocator = locatorParser.newObject(uri, null);
+         serverLocator = ServerLocatorImpl.newLocator(uri);
          cfParser.populateObject(uri, this);
       }
       catch (Exception e)


[2/4] activemq-artemis git commit: Fix org.apache.activemq.JmsQueueCompositeSendReceiveTest#testDuplicate This test uses activemq5 native API to examine queue message count The fix uses core's QueueQuery API to do the job instead.

Posted by cl...@apache.org.
Fix org.apache.activemq.JmsQueueCompositeSendReceiveTest#testDuplicate
    This test uses activemq5 native API to examine queue message count
    The fix uses core's QueueQuery API to do the job instead.


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

Branch: refs/heads/master
Commit: 896813fc1c8058e91242a68e3a09aabd6c9b60bc
Parents: 72b7f82
Author: Howard Gao <hg...@redhat.com>
Authored: Wed Aug 5 21:00:33 2015 +0800
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 5 09:24:22 2015 -0400

----------------------------------------------------------------------
 tests/activemq5-unit-tests/pom.xml              |  6 ++++
 .../artemiswrapper/ArtemisBrokerWrapper.java    |  2 +-
 .../JmsQueueCompositeSendReceiveTest.java       | 38 ++++++++++----------
 3 files changed, 27 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/896813fc/tests/activemq5-unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/pom.xml b/tests/activemq5-unit-tests/pom.xml
index 8bb15d9..2b04dca 100644
--- a/tests/activemq5-unit-tests/pom.xml
+++ b/tests/activemq5-unit-tests/pom.xml
@@ -84,6 +84,12 @@
          <groupId>org.apache.activemq</groupId>
          <artifactId>activemq-leveldb-store</artifactId>
          <version>${activemq5.project.version}</version>
+         <exclusions>
+             <exclusion>
+                 <groupId>commons-beanutils</groupId>
+                 <artifactId>commons-beanutils-core</artifactId>
+             </exclusion>
+         </exclusions>
       </dependency>
 
       <dependency>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/896813fc/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
index 811d6e5..77926c1 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
@@ -62,7 +62,7 @@ public class ArtemisBrokerWrapper extends ArtemisBrokerBase
       server.getConfiguration().getAcceptorConfigurations().clear();
       HashMap<String, Object> params = new HashMap<String, Object>();
       params.put(TransportConstants.PORT_PROP_NAME, "61616");
-      params.put(TransportConstants.PROTOCOLS_PROP_NAME, "OPENWIRE");
+      params.put(TransportConstants.PROTOCOLS_PROP_NAME, "OPENWIRE,CORE");
       TransportConfiguration transportConfiguration = new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params);
 
       Configuration serverConfig = server.getConfiguration();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/896813fc/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
index f381ec0..108dd0b 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
@@ -20,16 +20,17 @@ import javax.jms.DeliveryMode;
 import javax.jms.Destination;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
+import javax.jms.Session;
 import javax.jms.Topic;
 
-import org.apache.activemq.broker.BrokerRegistry;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.region.Queue;
-import org.apache.activemq.broker.region.RegionBroker;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.jms.client.ActiveMQSession;
+import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.test.JmsTopicSendReceiveTest;
-import org.apache.activemq.util.Wait;
+
+import java.net.URI;
 
 
 /**
@@ -94,7 +95,7 @@ public class JmsQueueCompositeSendReceiveTest extends JmsTopicSendReceiveTest {
     }
     
     public void testDuplicate() throws Exception {
-    	ActiveMQDestination queue = (ActiveMQDestination)session.createQueue("TEST,TEST");
+        ActiveMQDestination queue = (ActiveMQDestination)session.createQueue("TEST,TEST");
         for (int i = 0; i < data.length; i++) {
             Message message = createMessage(i);
             configureMessage(message);
@@ -104,16 +105,17 @@ public class JmsQueueCompositeSendReceiveTest extends JmsTopicSendReceiveTest {
             producer.send(queue, message);
         }
         
-        Thread.sleep(200); // wait for messages to be queued
-        
-        BrokerService broker = BrokerRegistry.getInstance().lookup("localhost");
-        final Queue dest = (Queue)((RegionBroker)broker.getRegionBroker()).getQueueRegion().getDestinationMap().get(new ActiveMQQueue("TEST"));
-        assertTrue("all messages were received", Wait.waitFor(new Wait.Condition(){
-            public boolean isSatisified() throws Exception {
-                return data.length == dest.getDestinationStatistics().getMessages().getCount();
-            }}));
-        
-        dest.purge();
-        assertEquals(0, dest.getDestinationStatistics().getMessages().getCount());
+        Thread.sleep(200); // wait for messages to be queue;
+
+        org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory factory = new org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory("tcp://localhost:61616?type=CF");
+        org.apache.activemq.artemis.jms.client.ActiveMQConnection conn = (org.apache.activemq.artemis.jms.client.ActiveMQConnection) factory.createConnection();
+        try {
+            ActiveMQSession session = (ActiveMQSession) conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            ClientSession.QueueQuery query = session.getCoreSession().queueQuery(new SimpleString("jms.queue.TEST"));
+            assertNotNull(query);
+            assertEquals(data.length, query.getMessageCount());
+        } finally {
+            conn.close();
+        }
     }
 }


[4/4] activemq-artemis git commit: This closes #109 openWire fixes

Posted by cl...@apache.org.
This closes #109 openWire fixes


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

Branch: refs/heads/master
Commit: 5c7720dba382adf05a34c0da52909b7ad1779696
Parents: 72b7f82 2ad821a
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Aug 5 09:32:37 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 5 09:32:37 2015 -0400

----------------------------------------------------------------------
 .../core/client/impl/ServerLocatorImpl.java     | 28 +++++++++++++
 .../jms/client/ActiveMQConnectionFactory.java   |  4 +-
 tests/activemq5-unit-tests/pom.xml              |  6 +++
 .../artemiswrapper/ArtemisBrokerWrapper.java    |  2 +-
 .../JmsQueueCompositeSendReceiveTest.java       | 43 +++++++++-----------
 5 files changed, 57 insertions(+), 26 deletions(-)
----------------------------------------------------------------------



[3/4] activemq-artemis git commit: small improvement on org.apache.activemq.JmsQueueCompositeSendReceiveTest

Posted by cl...@apache.org.
small improvement on org.apache.activemq.JmsQueueCompositeSendReceiveTest


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

Branch: refs/heads/master
Commit: 2ad821a0ca716379f838c6637ed83fb937533780
Parents: ee84d7e
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Aug 5 09:32:09 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Aug 5 09:32:09 2015 -0400

----------------------------------------------------------------------
 .../JmsQueueCompositeSendReceiveTest.java       | 29 ++++++++------------
 1 file changed, 12 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2ad821a0/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
index 108dd0b..d7f5ea3 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
@@ -20,26 +20,24 @@ import javax.jms.DeliveryMode;
 import javax.jms.Destination;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
-import javax.jms.Session;
 import javax.jms.Topic;
 
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.api.core.client.ClientSession;
-import org.apache.activemq.artemis.jms.client.ActiveMQSession;
-import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.test.JmsTopicSendReceiveTest;
 
-import java.net.URI;
-
 
 /**
- * 
+ *
  */
 public class JmsQueueCompositeSendReceiveTest extends JmsTopicSendReceiveTest {
     private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
             .getLog(JmsQueueCompositeSendReceiveTest.class);
-    
+
     /**
      * Sets a test to have a queue destination and non-persistent delivery mode.
      *
@@ -70,7 +68,7 @@ public class JmsQueueCompositeSendReceiveTest extends JmsTopicSendReceiveTest {
     protected String getProducerSubject() {
         return "FOO.BAR.HUMBUG,FOO.BAR.HUMBUG2";
     }
-   
+
     /**
      * Test if all the messages sent are being received.
      *
@@ -93,7 +91,7 @@ public class JmsQueueCompositeSendReceiveTest extends JmsTopicSendReceiveTest {
         assertMessagesAreReceived();
         LOG.info("" + data.length + " messages(s) received, closing down connections");
     }
-    
+
     public void testDuplicate() throws Exception {
         ActiveMQDestination queue = (ActiveMQDestination)session.createQueue("TEST,TEST");
         for (int i = 0; i < data.length; i++) {
@@ -104,18 +102,15 @@ public class JmsQueueCompositeSendReceiveTest extends JmsTopicSendReceiveTest {
             }
             producer.send(queue, message);
         }
-        
+
         Thread.sleep(200); // wait for messages to be queue;
 
-        org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory factory = new org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory("tcp://localhost:61616?type=CF");
-        org.apache.activemq.artemis.jms.client.ActiveMQConnection conn = (org.apache.activemq.artemis.jms.client.ActiveMQConnection) factory.createConnection();
-        try {
-            ActiveMQSession session = (ActiveMQSession) conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            ClientSession.QueueQuery query = session.getCoreSession().queueQuery(new SimpleString("jms.queue.TEST"));
+        try (ServerLocator locator = ServerLocatorImpl.newLocator("tcp://localhost:61616");
+             ClientSessionFactory factory = locator.createSessionFactory();
+             ClientSession session = factory.createSession()) {
+            ClientSession.QueueQuery query = session.queueQuery(new SimpleString("jms.queue.TEST"));
             assertNotNull(query);
             assertEquals(data.length, query.getMessageCount());
-        } finally {
-            conn.close();
         }
     }
 }