activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject activemq-artemis git commit: Fix compilation issues during -Prelease
Date Fri, 04 Nov 2016 16:50:34 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/ARTEMIS-780 6303fcb43 -> 70aa8bc6c


Fix compilation issues during -Prelease


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

Branch: refs/heads/ARTEMIS-780
Commit: 70aa8bc6cb35c299a3555091d69dfbbaf0a77720
Parents: 6303fcb
Author: jbertram <jbertram@apache.com>
Authored: Fri Nov 4 11:50:03 2016 -0500
Committer: jbertram <jbertram@apache.com>
Committed: Fri Nov 4 11:50:03 2016 -0500

----------------------------------------------------------------------
 .../rest/jms-to-rest/src/main/java/JmsReceive.java        |  2 +-
 .../standard/rest/jms-to-rest/src/main/java/JmsSend.java  |  2 +-
 .../standard/rest/push/src/main/java/PostOrder.java       |  2 +-
 .../standard/rest/push/src/main/java/ReceiveShipping.java |  2 +-
 .../broker/artemiswrapper/ArtemisBrokerWrapper.java       | 10 +++++-----
 .../org/apache/activemq/transport/SoWriteTimeoutTest.java |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/70aa8bc6/examples/features/standard/rest/jms-to-rest/src/main/java/JmsReceive.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/rest/jms-to-rest/src/main/java/JmsReceive.java b/examples/features/standard/rest/jms-to-rest/src/main/java/JmsReceive.java
index b16b7f1..5af794b 100644
--- a/examples/features/standard/rest/jms-to-rest/src/main/java/JmsReceive.java
+++ b/examples/features/standard/rest/jms-to-rest/src/main/java/JmsReceive.java
@@ -32,7 +32,7 @@ public class JmsReceive {
    public static void main(String[] args) throws Exception {
       System.out.println("Receive Setup...");
       ConnectionFactory factory = new ActiveMQJMSConnectionFactory("tcp://localhost:61616");
-      Destination destination = ActiveMQDestination.fromAddress("orders");
+      Destination destination = ActiveMQDestination.fromPrefixedName("queue://orders");
 
       try (Connection conn = factory.createConnection()) {
          Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/70aa8bc6/examples/features/standard/rest/jms-to-rest/src/main/java/JmsSend.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/rest/jms-to-rest/src/main/java/JmsSend.java b/examples/features/standard/rest/jms-to-rest/src/main/java/JmsSend.java
index 608cab5..9c4217a 100644
--- a/examples/features/standard/rest/jms-to-rest/src/main/java/JmsSend.java
+++ b/examples/features/standard/rest/jms-to-rest/src/main/java/JmsSend.java
@@ -29,7 +29,7 @@ public class JmsSend {
 
    public static void main(String[] args) throws Exception {
       ConnectionFactory factory = new ActiveMQJMSConnectionFactory("tcp://localhost:61616");
-      Destination destination = ActiveMQDestination.fromAddress("orders");
+      Destination destination = ActiveMQDestination.fromPrefixedName("queue://orders");
 
       try (Connection conn = factory.createConnection()) {
          Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/70aa8bc6/examples/features/standard/rest/push/src/main/java/PostOrder.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/rest/push/src/main/java/PostOrder.java b/examples/features/standard/rest/push/src/main/java/PostOrder.java
index d32e9d5..9e6d869 100644
--- a/examples/features/standard/rest/push/src/main/java/PostOrder.java
+++ b/examples/features/standard/rest/push/src/main/java/PostOrder.java
@@ -29,7 +29,7 @@ public class PostOrder {
 
    public static void main(String[] args) throws Exception {
       ConnectionFactory factory = new ActiveMQJMSConnectionFactory("tcp://localhost:61616");
-      Destination destination = ActiveMQDestination.fromAddress("orders");
+      Destination destination = ActiveMQDestination.fromPrefixedName("queue://orders");
 
       try (Connection conn = factory.createConnection()) {
          Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/70aa8bc6/examples/features/standard/rest/push/src/main/java/ReceiveShipping.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/rest/push/src/main/java/ReceiveShipping.java b/examples/features/standard/rest/push/src/main/java/ReceiveShipping.java
index 6eba27e..ca6838b 100644
--- a/examples/features/standard/rest/push/src/main/java/ReceiveShipping.java
+++ b/examples/features/standard/rest/push/src/main/java/ReceiveShipping.java
@@ -31,7 +31,7 @@ public class ReceiveShipping {
 
    public static void main(String[] args) throws Exception {
       ConnectionFactory factory = new ActiveMQJMSConnectionFactory("tcp://localhost:61616");
-      Destination destination = ActiveMQDestination.fromAddress("shipping");
+      Destination destination = ActiveMQDestination.fromPrefixedName("queue://shipping");
 
       try (Connection conn = factory.createConnection()) {
          Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/70aa8bc6/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 caa4cc3..05e08ff 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
@@ -222,11 +222,11 @@ public class ArtemisBrokerWrapper extends ArtemisBrokerBase {
    private String getCorePattern(org.apache.activemq.command.ActiveMQDestination dest) {
       String physicalName = dest.getPhysicalName();
       String pattern = physicalName.replace(">", "#");
-      if (dest.isTopic()) {
-         pattern = pattern;
-      } else {
-         pattern = pattern;
-      }
+//      if (dest.isTopic()) {
+//         pattern = pattern;
+//      } else {
+//         pattern = pattern;
+//      }
 
       return pattern;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/70aa8bc6/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java
index 29805c0..82c872e 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java
@@ -120,7 +120,7 @@ public class SoWriteTimeoutTest extends JmsTestSupport {
       frame = stompConnection.receiveFrame();
       assertTrue(frame.startsWith("CONNECTED"));
 
-      frame = "SUBSCRIBE\n" + "destination:dest.getQueueName() + "\n" + "ack:client\n\n"
+ Stomp.NULL;
+      frame = "SUBSCRIBE\n" + "destination:" + dest.getQueueName() + "\n" + "ack:client\n\n"
+ Stomp.NULL;
       stompConnection.sendFrame(frame);
 
       // ensure dispatch has started before pause


Mime
View raw message