Repository: activemq
Updated Branches:
refs/heads/activemq-5.12.x ec50d23ca -> 7dfb2aef4
AMQ-5891: update to the proton 0.10 release
(cherry picked from commit 049f8da23605e13f60a8a53a519661cfb226edc1)
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/61890098
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/61890098
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/61890098
Branch: refs/heads/activemq-5.12.x
Commit: 61890098dd534753a6bc755a55ef4b8dde21c63e
Parents: ec50d23
Author: Robert Gemmell <[email protected]>
Authored: Fri Aug 14 12:10:10 2015 +0100
Committer: Timothy Bish <[email protected]>
Committed: Fri Dec 18 17:50:02 2015 -0500
----------------------------------------------------------------------
.../amqp/client/util/UnmodifiableConnection.java | 12 ++++++++++++
.../amqp/client/util/UnmodifiableDelivery.java | 16 ++++++++++++++++
.../amqp/client/util/UnmodifiableLink.java | 10 ++++++++++
.../amqp/client/util/UnmodifiableSession.java | 16 ++++++++++++++++
.../amqp/client/util/UnmodifiableTransport.java | 16 ++++++++++++++++
pom.xml | 2 +-
6 files changed, 71 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/61890098/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java
----------------------------------------------------------------------
diff --git
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java
index 158ae0d..032c0cd 100644
---
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java
+++
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableConnection.java
@@ -26,8 +26,10 @@ import org.apache.qpid.proton.engine.Connection;
import org.apache.qpid.proton.engine.Delivery;
import org.apache.qpid.proton.engine.EndpointState;
import org.apache.qpid.proton.engine.Link;
+import org.apache.qpid.proton.engine.Record;
import org.apache.qpid.proton.engine.Session;
import org.apache.qpid.proton.engine.Transport;
+import org.apache.qpid.proton.reactor.Reactor;
/**
* Unmodifiable Connection wrapper used to prevent test code from accidentally
@@ -187,4 +189,14 @@ public class UnmodifiableConnection implements Connection {
public Transport getTransport() {
return new UnmodifiableTransport(connection.getTransport());
}
+
+ @Override
+ public Record attachments() {
+ return connection.attachments();
+ }
+
+ @Override
+ public Reactor getReactor() {
+ return connection.getReactor();
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/61890098/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java
----------------------------------------------------------------------
diff --git
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java
index fd99665..71cacaf 100644
---
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java
+++
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableDelivery.java
@@ -20,6 +20,7 @@ import org.apache.qpid.proton.amqp.transport.DeliveryState;
import org.apache.qpid.proton.engine.Delivery;
import org.apache.qpid.proton.engine.Link;
import org.apache.qpid.proton.engine.Receiver;
+import org.apache.qpid.proton.engine.Record;
import org.apache.qpid.proton.engine.Sender;
/**
@@ -144,4 +145,19 @@ public class UnmodifiableDelivery implements Delivery {
public boolean isBuffered() {
return delivery.isBuffered();
}
+
+ @Override
+ public Record attachments() {
+ return delivery.attachments();
+ }
+
+ @Override
+ public DeliveryState getDefaultDeliveryState() {
+ return delivery.getDefaultDeliveryState();
+ }
+
+ @Override
+ public void setDefaultDeliveryState(DeliveryState state) {
+ throw new UnsupportedOperationException("Cannot alter the Delivery");
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/61890098/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java
----------------------------------------------------------------------
diff --git
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java
index fd44dcd..fbdfb61 100644
---
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java
+++
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableLink.java
@@ -27,6 +27,7 @@ import org.apache.qpid.proton.engine.Delivery;
import org.apache.qpid.proton.engine.EndpointState;
import org.apache.qpid.proton.engine.Link;
import org.apache.qpid.proton.engine.Receiver;
+import org.apache.qpid.proton.engine.Record;
import org.apache.qpid.proton.engine.Sender;
import org.apache.qpid.proton.engine.Session;
@@ -245,4 +246,13 @@ public class UnmodifiableLink implements Link {
public void detach() {
throw new UnsupportedOperationException("Cannot alter the Link state");
}
+
+ @Override
+ public boolean detached() {
+ return link.detached();
+ }
+
+ public Record attachments() {
+ return link.attachments();
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/61890098/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableSession.java
----------------------------------------------------------------------
diff --git
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableSession.java
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableSession.java
index 6a73e0f..31b0452 100644
---
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableSession.java
+++
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableSession.java
@@ -22,6 +22,7 @@ import org.apache.qpid.proton.amqp.transport.ErrorCondition;
import org.apache.qpid.proton.engine.Connection;
import org.apache.qpid.proton.engine.EndpointState;
import org.apache.qpid.proton.engine.Receiver;
+import org.apache.qpid.proton.engine.Record;
import org.apache.qpid.proton.engine.Sender;
import org.apache.qpid.proton.engine.Session;
@@ -131,4 +132,19 @@ public class UnmodifiableSession implements Session {
public int getOutgoingBytes() {
return session.getOutgoingBytes();
}
+
+ @Override
+ public Record attachments() {
+ return session.attachments();
+ }
+
+ @Override
+ public long getOutgoingWindow() {
+ return session.getOutgoingWindow();
+ }
+
+ @Override
+ public void setOutgoingWindow(long outgoingWindowSize) {
+ throw new UnsupportedOperationException("Cannot alter the Session");
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/61890098/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java
----------------------------------------------------------------------
diff --git
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java
index 3d05d50..8c663c3 100644
---
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java
+++
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/util/UnmodifiableTransport.java
@@ -21,6 +21,7 @@ import java.nio.ByteBuffer;
import org.apache.qpid.proton.amqp.transport.ErrorCondition;
import org.apache.qpid.proton.engine.Connection;
import org.apache.qpid.proton.engine.EndpointState;
+import org.apache.qpid.proton.engine.Record;
import org.apache.qpid.proton.engine.Sasl;
import org.apache.qpid.proton.engine.Ssl;
import org.apache.qpid.proton.engine.SslDomain;
@@ -245,4 +246,19 @@ public class UnmodifiableTransport implements Transport {
public void unbind() {
throw new UnsupportedOperationException("Cannot alter the Transport");
}
+
+ @Override
+ public Record attachments() {
+ return transport.attachments();
+ }
+
+ @Override
+ public long getFramesInput() {
+ return transport.getFramesInput();
+ }
+
+ @Override
+ public long getFramesOutput() {
+ return transport.getFramesOutput();
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/61890098/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9a793e1..791b274 100755
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
<p2psockets-version>1.1.2</p2psockets-version>
<linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
<zookeeper-version>3.4.6</zookeeper-version>
- <qpid-proton-version>0.9.1</qpid-proton-version>
+ <qpid-proton-version>0.10</qpid-proton-version>
<qpid-jms-version>0.6.0</qpid-jms-version>
<netty-all-version>4.0.29.Final</netty-all-version>
<regexp-version>1.3</regexp-version>
