You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2013/02/13 12:22:38 UTC
svn commit: r1445555 - in /qpid/proton/trunk:
proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/
proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/
proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/
Author: rgodfrey
Date: Wed Feb 13 11:22:37 2013
New Revision: 1445555
URL: http://svn.apache.org/r1445555
Log:
PROTON-61 : allow setting of connection properties
Modified:
qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java
qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Connection.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
Modified: qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java?rev=1445555&r1=1445554&r2=1445555&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java (original)
+++ qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java Wed Feb 13 11:22:37 2013
@@ -24,7 +24,9 @@ import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
+import java.util.Map;
import org.apache.qpid.proton.ProtonCEquivalent;
+import org.apache.qpid.proton.ProtonUnsupportedOperationException;
import org.apache.qpid.proton.amqp.Symbol;
import org.apache.qpid.proton.codec.Data;
import org.apache.qpid.proton.codec.jni.JNIData;
@@ -210,6 +212,7 @@ public class JNIConnection implements Co
}
@Override
+ @ProtonCEquivalent("pn_connection_offered_capabilities")
public void setOfferedCapabilities(Symbol[] capabilities)
{
JNIData data = new JNIData(Proton.pn_connection_offered_capabilities(_impl));
@@ -221,6 +224,7 @@ public class JNIConnection implements Co
}
@Override
+ @ProtonCEquivalent("pn_connection_desired_capabilities")
public void setDesiredCapabilities(Symbol[] capabilities)
{
JNIData data = new JNIData(Proton.pn_connection_desired_capabilities(_impl));
@@ -231,7 +235,9 @@ public class JNIConnection implements Co
}
}
+
@Override
+ @ProtonCEquivalent("pn_connection_remote_offered_capabilities")
public Symbol[] getRemoteOfferedCapabilities()
{
JNIData data = new JNIData(Proton.pn_connection_remote_offered_capabilities(_impl));
@@ -244,6 +250,7 @@ public class JNIConnection implements Co
}
@Override
+ @ProtonCEquivalent("pn_connection_remote_desired_capabilities")
public Symbol[] getRemoteDesiredCapabilities()
{
JNIData data = new JNIData(Proton.pn_connection_remote_desired_capabilities(_impl));
@@ -254,4 +261,16 @@ public class JNIConnection implements Co
}
return EMPTY_CAPABILTIES;
}
+
+ @Override
+ public Map<Symbol, Object> getRemoteProperties()
+ {
+ throw new ProtonUnsupportedOperationException();
+ }
+
+ @Override
+ public void setProperties(Map<Symbol, Object> properties)
+ {
+ throw new ProtonUnsupportedOperationException();
+ }
}
Modified: qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Connection.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Connection.java?rev=1445555&r1=1445554&r2=1445555&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Connection.java (original)
+++ qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Connection.java Wed Feb 13 11:22:37 2013
@@ -21,6 +21,7 @@
package org.apache.qpid.proton.engine;
import java.util.EnumSet;
+import java.util.Map;
import org.apache.qpid.proton.amqp.Symbol;
@@ -62,4 +63,8 @@ public interface Connection extends Endp
Symbol[] getRemoteOfferedCapabilities();
Symbol[] getRemoteDesiredCapabilities();
+
+ Map<Symbol,Object> getRemoteProperties();
+
+ void setProperties(Map<Symbol,Object> properties);
}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java?rev=1445555&r1=1445554&r2=1445555&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java Wed Feb 13 11:22:37 2013
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.qpid.proton.amqp.Symbol;
import org.apache.qpid.proton.engine.*;
import org.apache.qpid.proton.amqp.transport.Open;
@@ -59,6 +60,8 @@ public class ConnectionImpl extends Endp
private Symbol[] _desiredCapabilities;
private Symbol[] _remoteOfferedCapabilities;
private Symbol[] _remoteDesiredCapabilities;
+ private Map<Symbol, Object> _properties;
+ private Map<Symbol, Object> _remoteProperties;
private static final Symbol[] EMPTY_SYMBOL_ARRAY = new Symbol[0];
@@ -194,6 +197,7 @@ public class ConnectionImpl extends Endp
setRemoteContainer(open.getContainerId());
setRemoteDesiredCapabilities(open.getDesiredCapabilities());
setRemoteOfferedCapabilities(open.getOfferedCapabilities());
+ setRemoteProperties(open.getProperties());
}
@@ -335,6 +339,27 @@ public class ConnectionImpl extends Endp
_remoteDesiredCapabilities = remoteDesiredCapabilities;
}
+
+ Map<Symbol, Object> getProperties()
+ {
+ return _properties;
+ }
+
+ public void setProperties(Map<Symbol, Object> properties)
+ {
+ _properties = properties;
+ }
+
+ public Map<Symbol, Object> getRemoteProperties()
+ {
+ return _remoteProperties;
+ }
+
+ void setRemoteProperties(Map<Symbol, Object> remoteProperties)
+ {
+ _remoteProperties = remoteProperties;
+ }
+
public String getHostname()
{
return _localHostname;
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java?rev=1445555&r1=1445554&r2=1445555&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java Wed Feb 13 11:22:37 2013
@@ -740,6 +740,7 @@ public class TransportImpl extends Endpo
open.setHostname(_connectionEndpoint.getHostname());
open.setDesiredCapabilities(_connectionEndpoint.getDesiredCapabilities());
open.setOfferedCapabilities(_connectionEndpoint.getOfferedCapabilities());
+ open.setProperties(_connectionEndpoint.getProperties());
// TODO - populate;
_isOpenSent = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org