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/07/22 12:54:44 UTC

[1/2] activemq-artemis git commit: This closes #92 Deprecating property

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 9ec45c023 -> 1cb372bcd


This closes #92 Deprecating property


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

Branch: refs/heads/master
Commit: 1cb372bcd8713dd7aa7e6fb3eb38fde204193c3d
Parents: 9ec45c0 d6f8ed8
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jul 22 11:54:18 2015 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jul 22 11:54:18 2015 +0100

----------------------------------------------------------------------
 .../artemis/core/remoting/impl/netty/TransportConstants.java       | 2 ++
 .../artemis/tests/integration/stomp/v11/StompV11TestBase.java      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[2/2] activemq-artemis git commit: Deprecate PROTOCOL_PROP_NAME, avoid deprecation warning on STOMP tests

Posted by cl...@apache.org.
Deprecate PROTOCOL_PROP_NAME, avoid deprecation warning on STOMP 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/d6f8ed8d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d6f8ed8d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d6f8ed8d

Branch: refs/heads/master
Commit: d6f8ed8d70d9dc8d3e7760ca8234d1ff87f38150
Parents: 9ec45c0
Author: Ville Skyttä <vi...@iki.fi>
Authored: Wed Jul 22 10:21:25 2015 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jul 22 11:54:18 2015 +0100

----------------------------------------------------------------------
 .../artemis/core/remoting/impl/netty/TransportConstants.java       | 2 ++
 .../artemis/tests/integration/stomp/v11/StompV11TestBase.java      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d6f8ed8d/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
index 091fba5..9415339 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
@@ -53,6 +53,8 @@ public class TransportConstants
 
    public static final String USE_INVM_PROP_NAME = "useInvm";
 
+   /** @deprecated use PROTOCOLS_PROP_NAME */
+   @Deprecated
    public static final String PROTOCOL_PROP_NAME = "protocol";
 
    public static final String PROTOCOLS_PROP_NAME = "protocols";

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d6f8ed8d/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
index 9965475..8fee859 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
@@ -100,7 +100,7 @@ public abstract class StompV11TestBase extends ActiveMQTestBase
    protected JMSServerManager createServer() throws Exception
    {
       Map<String, Object> params = new HashMap<String, Object>();
-      params.put(TransportConstants.PROTOCOL_PROP_NAME, StompProtocolManagerFactory.STOMP_PROTOCOL_NAME);
+      params.put(TransportConstants.PROTOCOLS_PROP_NAME, StompProtocolManagerFactory.STOMP_PROTOCOL_NAME);
       params.put(TransportConstants.PORT_PROP_NAME, TransportConstants.DEFAULT_STOMP_PORT);
       params.put(TransportConstants.STOMP_CONSUMERS_CREDIT, "-1");
       TransportConfiguration stompTransport = new TransportConfiguration(NettyAcceptorFactory.class.getName(), params);