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 2016/01/27 19:21:09 UTC

[1/3] activemq-artemis git commit: This closes #356

Repository: activemq-artemis
Updated Branches:
  refs/heads/master f90a867e2 -> fa368de5f


This closes #356


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

Branch: refs/heads/master
Commit: fa368de5f7fa260bd446951a5981c1bbf647c2d9
Parents: f90a867 51f1253
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jan 27 13:20:55 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jan 27 13:20:55 2016 -0500

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/core/protocol/stomp/Stomp.java   | 4 +++-
 .../apache/activemq/artemis/core/protocol/stomp/StompUtils.java  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



[2/3] activemq-artemis git commit: Add "persistent" header to outbound STOMP messages

Posted by cl...@apache.org.
Add "persistent" header to outbound STOMP messages


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

Branch: refs/heads/master
Commit: 51f125387bbcb4b6b68276450c0e87385b17298f
Parents: bdea213
Author: Ville Skyttä <vi...@iki.fi>
Authored: Wed Jan 27 19:09:19 2016 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jan 27 13:20:55 2016 -0500

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/core/protocol/stomp/Stomp.java     | 2 ++
 .../apache/activemq/artemis/core/protocol/stomp/StompUtils.java    | 1 +
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/51f12538/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java
index 59a6916..1607666 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java
@@ -123,6 +123,8 @@ public interface Stomp {
          String SUBSCRIPTION = "subscription";
 
          String ACK = "ack";
+
+         String PERSISTENT = "persistent";
       }
 
       public interface Subscribe {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/51f12538/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java
index 2acd74f..d27a4bc 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java
@@ -92,6 +92,7 @@ public class StompUtils {
       command.addHeader(Stomp.Headers.Message.EXPIRATION_TIME, "" + message.getExpiration());
       command.addHeader(Stomp.Headers.Message.REDELIVERED, String.valueOf(deliveryCount > 1));
       command.addHeader(Stomp.Headers.Message.PRIORITY, "" + message.getPriority());
+      command.addHeader(Stomp.Headers.Message.PERSISTENT, "" + message.isDurable());
       if (message.getStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME) != null) {
          command.addHeader(Stomp.Headers.Message.REPLY_TO, message.getStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME));
       }


[3/3] activemq-artemis git commit: Rename Stomp.Headers.Message.PRORITY to .PRIORITY

Posted by cl...@apache.org.
Rename Stomp.Headers.Message.PRORITY to .PRIORITY


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

Branch: refs/heads/master
Commit: bdea213e887528c2010d85c5e2f80d0f72331ad6
Parents: f90a867
Author: Ville Skyttä <vi...@iki.fi>
Authored: Wed Jan 27 19:07:24 2016 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jan 27 13:20:55 2016 -0500

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/core/protocol/stomp/Stomp.java     | 2 +-
 .../apache/activemq/artemis/core/protocol/stomp/StompUtils.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bdea213e/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java
index d1cf45c..59a6916 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/Stomp.java
@@ -112,7 +112,7 @@ public interface Stomp {
 
          String REPLY_TO = "reply-to";
 
-         String PRORITY = "priority";
+         String PRIORITY = "priority";
 
          String REDELIVERED = "redelivered";
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bdea213e/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java
index 00acb44..2acd74f 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompUtils.java
@@ -91,7 +91,7 @@ public class StompUtils {
       }
       command.addHeader(Stomp.Headers.Message.EXPIRATION_TIME, "" + message.getExpiration());
       command.addHeader(Stomp.Headers.Message.REDELIVERED, String.valueOf(deliveryCount > 1));
-      command.addHeader(Stomp.Headers.Message.PRORITY, "" + message.getPriority());
+      command.addHeader(Stomp.Headers.Message.PRIORITY, "" + message.getPriority());
       if (message.getStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME) != null) {
          command.addHeader(Stomp.Headers.Message.REPLY_TO, message.getStringProperty(ClientMessageImpl.REPLYTO_HEADER_NAME));
       }