You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2013/01/22 13:42:47 UTC
svn commit: r1436875 - in /qpid/proton/branches/jni-binding/proton-j:
proton-api/src/main/java/org/apache/qpid/proton/engine/
proton-api/src/main/java/org/apache/qpid/proton/message/
proton-api/src/main/scripts/ proton/src/main/java/org/apache/qpid/pro...
Author: kwall
Date: Tue Jan 22 12:42:46 2013
New Revision: 1436875
URL: http://svn.apache.org/viewvc?rev=1436875&view=rev
Log:
PROTON-192: Pull-up SESSION_WINDOW and DEFAULT_PRIORITY constants from their impls to their respective interfaces.
Modified:
qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Transport.java
qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/message/Message.java
qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/scripts/proton.py
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java
Modified: qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Transport.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Transport.java?rev=1436875&r1=1436874&r2=1436875&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Transport.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Transport.java Tue Jan 22 12:42:46 2013
@@ -29,6 +29,7 @@ package org.apache.qpid.proton.engine;
public interface Transport extends Endpoint
{
+ public int SESSION_WINDOW = 1024;
public int END_OF_STREAM = -1;
public void bind(Connection connection);
Modified: qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/message/Message.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/message/Message.java?rev=1436875&r1=1436874&r2=1436875&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/message/Message.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/message/Message.java Tue Jan 22 12:42:46 2013
@@ -30,6 +30,8 @@ import org.apache.qpid.proton.amqp.messa
public interface Message
{
+ short DEFAULT_PRIORITY = 4;
+
boolean isDurable();
long getDeliveryCount();
Modified: qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/scripts/proton.py
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/scripts/proton.py?rev=1436875&r1=1436874&r2=1436875&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/scripts/proton.py (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/scripts/proton.py Tue Jan 22 12:42:46 2013
@@ -23,7 +23,8 @@ from org.apache.qpid.proton.engine impor
EngineFactory, Transport as JTransport, Sender as JSender, Receiver as JReceiver, \
Sasl, SslDomain as JSslDomain, \
EndpointState, TransportException
-from org.apache.qpid.proton.message import MessageFormat, MessageFactory
+from org.apache.qpid.proton.message import \
+ MessageFormat, MessageFactory, Message as JMessage
from org.apache.qpid.proton.messenger import MessengerException, Status
from org.apache.qpid.proton.amqp.messaging import Source, Target, Accepted, AmqpValue
from org.apache.qpid.proton.amqp import UnsignedInteger
@@ -35,9 +36,7 @@ LANGUAGE = "Java"
class Skipped(Exception):
skipped = True
-# PHTODO resolve hardcoding
-#PN_SESSION_WINDOW = TransportImpl.SESSION_WINDOW
-PN_SESSION_WINDOW = 1024
+PN_SESSION_WINDOW = JTransport.SESSION_WINDOW
PENDING = "PENDING"
ACCEPTED = "ACCEPTED"
@@ -609,9 +608,7 @@ class Message(object):
DATA = MessageFormat.DATA
JSON = MessageFormat.JSON
- # PHTODO remove hardcoding
- #DEFAULT_PRIORITY = MessageImpl.DEFAULT_PRIORITY
- DEFAULT_PRIORITY = 4
+ DEFAULT_PRIORITY = JMessage.DEFAULT_PRIORITY
def __init__(self):
self.impl = messageFactory.createMessage()
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java?rev=1436875&r1=1436874&r2=1436875&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java Tue Jan 22 12:42:46 2013
@@ -56,8 +56,6 @@ import org.apache.qpid.proton.amqp.trans
public class TransportImpl extends EndpointImpl implements Transport, FrameBody.FrameBodyHandler<Integer>,FrameTransport
{
- public static final int SESSION_WINDOW = 1024;
-
public static final byte[] HEADER = new byte[8];
public static final org.apache.qpid.proton.amqp.messaging.Accepted ACCEPTED =
new org.apache.qpid.proton.amqp.messaging.Accepted();
Modified: qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java?rev=1436875&r1=1436874&r2=1436875&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java Tue Jan 22 12:42:46 2013
@@ -34,8 +34,6 @@ import org.apache.qpid.proton.message.*;
public class MessageImpl implements Message
{
- public static final short DEFAULT_PRIORITY = 4;
-
private final AMQPMessageFormat _parser = new AMQPMessageFormat();
private Header _header;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org