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 2016/04/15 12:10:20 UTC
svn commit: r1739270 [4/8] - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/queue/
broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/
broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/pro...
Copied: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionEndpoint.java (from r1739261, qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEndpoint.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionEndpoint.java?p2=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionEndpoint.java&p1=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEndpoint.java&r1=1739261&r2=1739270&rev=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEndpoint.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionEndpoint.java Fri Apr 15 10:10:16 2016
@@ -19,40 +19,35 @@
*
*/
-package org.apache.qpid.amqp_1_0.transport;
+package org.apache.qpid.server.protocol.v1_0;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.concurrent.TimeoutException;
-import org.apache.qpid.amqp_1_0.framing.OversizeFrameException;
-import org.apache.qpid.amqp_1_0.type.Binary;
-import org.apache.qpid.amqp_1_0.type.DeliveryState;
-import org.apache.qpid.amqp_1_0.type.DistributionMode;
-import org.apache.qpid.amqp_1_0.type.FrameBody;
-import org.apache.qpid.amqp_1_0.type.Outcome;
-import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
-import org.apache.qpid.amqp_1_0.type.messaging.Source;
-import org.apache.qpid.amqp_1_0.type.messaging.Target;
-import org.apache.qpid.amqp_1_0.type.messaging.TerminusDurability;
-import org.apache.qpid.amqp_1_0.type.messaging.TerminusExpiryPolicy;
-import org.apache.qpid.amqp_1_0.type.transaction.Coordinator;
-import org.apache.qpid.amqp_1_0.type.transaction.TxnCapability;
-import org.apache.qpid.amqp_1_0.type.transport.AmqpError;
-import org.apache.qpid.amqp_1_0.type.transport.Attach;
-import org.apache.qpid.amqp_1_0.type.transport.Begin;
-import org.apache.qpid.amqp_1_0.type.transport.Detach;
-import org.apache.qpid.amqp_1_0.type.transport.Disposition;
-import org.apache.qpid.amqp_1_0.type.transport.End;
-import org.apache.qpid.amqp_1_0.type.transport.Error;
-import org.apache.qpid.amqp_1_0.type.transport.Flow;
-import org.apache.qpid.amqp_1_0.type.transport.LinkError;
-import org.apache.qpid.amqp_1_0.type.transport.Role;
-import org.apache.qpid.amqp_1_0.type.transport.Transfer;
+import org.apache.qpid.server.protocol.v1_0.framing.OversizeFrameException;
+import org.apache.qpid.server.protocol.v1_0.type.Binary;
+import org.apache.qpid.server.protocol.v1_0.type.DeliveryState;
+import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
+import org.apache.qpid.server.protocol.v1_0.type.Outcome;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Source;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Target;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.TerminusDurability;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.TerminusExpiryPolicy;
+import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Attach;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Begin;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Detach;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Disposition;
+import org.apache.qpid.server.protocol.v1_0.type.transport.End;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Flow;
+import org.apache.qpid.server.protocol.v1_0.type.transport.LinkError;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Role;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class SessionEndpoint
@@ -66,7 +61,7 @@ public class SessionEndpoint
private long _timeout;
- private ConnectionEndpoint _connection;
+ private AMQPConnection_1_0 _connection;
private long _lastAttachedTime;
private short _receivingChannel;
@@ -105,12 +100,12 @@ public class SessionEndpoint
- public SessionEndpoint(final ConnectionEndpoint connectionEndpoint)
+ public SessionEndpoint(final AMQPConnection_1_0 connectionEndpoint)
{
this(connectionEndpoint, UnsignedInteger.valueOf(0));
}
- public SessionEndpoint(final ConnectionEndpoint connectionEndpoint, Begin begin)
+ public SessionEndpoint(final AMQPConnection_1_0 connectionEndpoint, Begin begin)
{
this(connectionEndpoint, UnsignedInteger.valueOf(0));
_state = SessionState.BEGIN_RECVD;
@@ -118,7 +113,7 @@ public class SessionEndpoint
}
- public SessionEndpoint(final ConnectionEndpoint connectionEndpoint, UnsignedInteger nextOutgoingId)
+ public SessionEndpoint(final AMQPConnection_1_0 connectionEndpoint, UnsignedInteger nextOutgoingId)
{
_connection = connectionEndpoint;
@@ -182,66 +177,59 @@ public class SessionEndpoint
public void end(End end)
{
- synchronized(getLock())
+ switch (_state)
{
- switch(_state)
- {
- case BEGIN_SENT:
- _connection.sendEnd(getSendingChannel(), end, false);
- _state = SessionState.END_PIPE;
- break;
- case ACTIVE:
- detachLinks();
- short sendChannel = getSendingChannel();
- _connection.sendEnd(sendChannel, end, true);
- _state = SessionState.END_SENT;
- break;
- default:
- sendChannel = getSendingChannel();
- End reply = new End();
- Error error = new Error();
- error.setCondition(AmqpError.ILLEGAL_STATE);
- error.setDescription("END called on Session which has not been opened");
- reply.setError(error);
- _connection.sendEnd(sendChannel, reply, true);
- break;
+ case BEGIN_SENT:
+ _connection.sendEnd(getSendingChannel(), end, false);
+ _state = SessionState.END_PIPE;
+ break;
+ case ACTIVE:
+ detachLinks();
+ short sendChannel = getSendingChannel();
+ _connection.sendEnd(sendChannel, end, true);
+ _state = SessionState.END_SENT;
+ break;
+ default:
+ sendChannel = getSendingChannel();
+ End reply = new End();
+ Error error = new Error();
+ error.setCondition(AmqpError.ILLEGAL_STATE);
+ error.setDescription("END called on Session which has not been opened");
+ reply.setError(error);
+ _connection.sendEnd(sendChannel, reply, true);
+ break;
- }
- getLock().notifyAll();
}
}
public void receiveEnd(final End end)
{
- synchronized(getLock())
+ switch (_state)
{
- switch(_state)
- {
- case END_SENT:
- _state = SessionState.ENDED;
- break;
- case ACTIVE:
- detachLinks();
- _sessionEventListener.remoteEnd(end);
- short sendChannel = getSendingChannel();
- _connection.sendEnd(sendChannel, new End(), true);
- _state = SessionState.ENDED;
- break;
- default:
- sendChannel = getSendingChannel();
- End reply = new End();
- Error error = new Error();
- error.setCondition(AmqpError.ILLEGAL_STATE);
- error.setDescription("END called on Session which has not been opened");
- reply.setError(error);
- _connection.sendEnd(sendChannel, reply, true);
- break;
+ case END_SENT:
+ _state = SessionState.ENDED;
+ break;
+ case ACTIVE:
+ detachLinks();
+ _sessionEventListener.remoteEnd(end);
+ short sendChannel = getSendingChannel();
+ _connection.sendEnd(sendChannel, new End(), true);
+ _state = SessionState.ENDED;
+ break;
+ default:
+ sendChannel = getSendingChannel();
+ End reply = new End();
+ Error error = new Error();
+ error.setCondition(AmqpError.ILLEGAL_STATE);
+ error.setDescription("END called on Session which has not been opened");
+ reply.setError(error);
+ _connection.sendEnd(sendChannel, reply, true);
+ break;
- }
- getLock().notifyAll();
}
+
}
private void detachLinks()
@@ -320,13 +308,13 @@ public class SessionEndpoint
private void send(final FrameBody frameBody)
{
- _connection.send(this.getSendingChannel(), frameBody);
+ _connection.sendFrame(this.getSendingChannel(), frameBody);
}
private int send(final FrameBody frameBody, QpidByteBuffer payload)
{
- return _connection.send(this.getSendingChannel(), frameBody, payload);
+ return _connection.sendFrame(this.getSendingChannel(), frameBody, payload);
}
private UnsignedInteger findNextAvailableHandle()
@@ -370,129 +358,110 @@ public class SessionEndpoint
public void receiveTransfer(final Transfer transfer)
{
- synchronized(getLock())
- {
- _nextIncomingTransferId.incr();
+ _nextIncomingTransferId.incr();
/*
_availableIncomingCredit--;
*/
- UnsignedInteger handle = transfer.getHandle();
-
+ UnsignedInteger handle = transfer.getHandle();
- LinkEndpoint endpoint = _remoteLinkEndpoints.get(handle);
+ LinkEndpoint endpoint = _remoteLinkEndpoints.get(handle);
- if(endpoint == null)
- {
- //TODO - error unknown link
- System.err.println("Unknown endpoint " + transfer);
+ if (endpoint == null)
+ {
+ //TODO - error unknown link
+ System.err.println("Unknown endpoint " + transfer);
- }
+ }
- UnsignedInteger deliveryId = transfer.getDeliveryId();
- if(deliveryId == null)
- {
- deliveryId = ((ReceivingLinkEndpoint)endpoint).getLastDeliveryId();
- }
+ UnsignedInteger deliveryId = transfer.getDeliveryId();
+ if (deliveryId == null)
+ {
+ deliveryId = ((ReceivingLinkEndpoint) endpoint).getLastDeliveryId();
+ }
- Delivery delivery = _incomingUnsettled.get(deliveryId);
- if(delivery == null)
+ Delivery delivery = _incomingUnsettled.get(deliveryId);
+ if (delivery == null)
+ {
+ delivery = new Delivery(transfer, endpoint);
+ _incomingUnsettled.put(deliveryId, delivery);
+ if (delivery.isSettled() || Boolean.TRUE.equals(transfer.getAborted()))
{
- delivery = new Delivery(transfer, endpoint);
- _incomingUnsettled.put(deliveryId,delivery);
- if(delivery.isSettled() || Boolean.TRUE.equals(transfer.getAborted()))
- {
/*
_availableIncomingCredit++;
*/
- }
+ }
- if(Boolean.TRUE.equals(transfer.getMore()))
- {
- ((ReceivingLinkEndpoint)endpoint).setLastDeliveryId(transfer.getDeliveryId());
- }
+ if (Boolean.TRUE.equals(transfer.getMore()))
+ {
+ ((ReceivingLinkEndpoint) endpoint).setLastDeliveryId(transfer.getDeliveryId());
}
- else
+ }
+ else
+ {
+ if (delivery.getDeliveryId().equals(deliveryId))
{
- if(delivery.getDeliveryId().equals(deliveryId))
+ delivery.addTransfer(transfer);
+ if (delivery.isSettled())
{
- delivery.addTransfer(transfer);
- if(delivery.isSettled())
- {
/*
_availableIncomingCredit++;
*/
- }
- else if(Boolean.TRUE.equals(transfer.getAborted()))
- {
+ }
+ else if (Boolean.TRUE.equals(transfer.getAborted()))
+ {
/*
_availableIncomingCredit += delivery.getTransfers().size();
*/
- }
-
- if(!Boolean.TRUE.equals(transfer.getMore()))
- {
- ((ReceivingLinkEndpoint)endpoint).setLastDeliveryId(null);
- }
}
- else
+
+ if (!Boolean.TRUE.equals(transfer.getMore()))
{
- // TODO - error
- System.err.println("Incorrect transfer id " + transfer);
+ ((ReceivingLinkEndpoint) endpoint).setLastDeliveryId(null);
}
}
-
- if(endpoint != null)
+ else
{
- endpoint.receiveTransfer(transfer, delivery);
+ // TODO - error
+ System.err.println("Incorrect transfer id " + transfer);
}
+ }
- if((delivery.isComplete() && delivery.isSettled() || Boolean.TRUE.equals(transfer.getAborted())))
- {
- _incomingUnsettled.remove(deliveryId);
- }
+ if (endpoint != null)
+ {
+ endpoint.receiveTransfer(transfer, delivery);
}
+
+ if ((delivery.isComplete() && delivery.isSettled() || Boolean.TRUE.equals(transfer.getAborted())))
+ {
+ _incomingUnsettled.remove(deliveryId);
+ }
+
}
public void receiveFlow(final Flow flow)
{
- synchronized (getLock())
- {
- UnsignedInteger handle = flow.getHandle();
- final LinkEndpoint endpoint = handle == null ? null : _remoteLinkEndpoints.get(handle);
+ UnsignedInteger handle = flow.getHandle();
+ final LinkEndpoint endpoint = handle == null ? null : _remoteLinkEndpoints.get(handle);
- final UnsignedInteger nextOutgoingId =
- flow.getNextIncomingId() == null ? _initialOutgoingId : flow.getNextIncomingId();
- int limit = (nextOutgoingId.intValue() + flow.getIncomingWindow().intValue());
- _outgoingSessionCredit = UnsignedInteger.valueOf(limit - _nextOutgoingTransferId.intValue());
+ final UnsignedInteger nextOutgoingId =
+ flow.getNextIncomingId() == null ? _initialOutgoingId : flow.getNextIncomingId();
+ int limit = (nextOutgoingId.intValue() + flow.getIncomingWindow().intValue());
+ _outgoingSessionCredit = UnsignedInteger.valueOf(limit - _nextOutgoingTransferId.intValue());
- if (endpoint != null)
+ if (endpoint != null)
+ {
+ endpoint.receiveFlow(flow);
+ }
+ else
+ {
+ final Collection<LinkEndpoint> allLinkEndpoints = _remoteLinkEndpoints.values();
+ for (LinkEndpoint le : allLinkEndpoints)
{
- endpoint.receiveFlow(flow);
+ le.flowStateChanged();
}
- else
- {
- final Collection<LinkEndpoint> allLinkEndpoints = _remoteLinkEndpoints.values();
- getConnection().addPostLockAction(new Runnable()
- {
- @Override
- public void run()
- {
-
- for(LinkEndpoint le : allLinkEndpoints)
- {
- le.flowStateChanged();
- }
- }
- });
- }
-
- getLock().notifyAll();
}
-
-
-
}
public void receiveDisposition(final Disposition disposition)
@@ -572,18 +541,13 @@ public class SessionEndpoint
}
- public SendingLinkEndpoint createSendingLinkEndpoint(final String name, final Source source, final org.apache.qpid.amqp_1_0.type.Target target)
- {
- return createSendingLinkEndpoint(name, source, target, null);
- }
-
- public SendingLinkEndpoint createSendingLinkEndpoint(final String name, final Source source, final org.apache.qpid.amqp_1_0.type.Target target, Map<Binary, Outcome> unsettled)
+ public SendingLinkEndpoint createSendingLinkEndpoint(final String name, final Source source, final org.apache.qpid.server.protocol.v1_0.type.Target target, Map<Binary, Outcome> unsettled)
{
return createSendingLinkEndpoint(name, source, target, unsettled, null);
}
public SendingLinkEndpoint createSendingLinkEndpoint(final String name, final Source source,
- final org.apache.qpid.amqp_1_0.type.Target target,
+ final org.apache.qpid.server.protocol.v1_0.type.Target target,
Map<Binary, Outcome> unsettled,
DeliveryStateHandler deliveryStateHandler)
{
@@ -670,62 +634,6 @@ public class SessionEndpoint
{
e.printStackTrace();
}
-
- }
-
- public Object getLock()
- {
- return _connection.getLock();
- }
-
-
- public long getSyncTimeout()
- {
- return _connection.getSyncTimeout();
- }
-
- public void waitUntil(Predicate predicate) throws TimeoutException, InterruptedException
- {
- _connection.waitUntil(predicate);
- }
-
- public void waitUntil(Predicate predicate, long timeout) throws TimeoutException, InterruptedException
- {
- _connection.waitUntil(predicate, timeout);
- }
-
-
- public ReceivingLinkEndpoint createReceivingLinkEndpoint(final String name,
- String targetAddr,
- String sourceAddr,
- UnsignedInteger initialCredit,
- final DistributionMode distributionMode)
- {
- Source source = new Source();
- source.setAddress(sourceAddr);
- source.setDistributionMode(distributionMode);
- Target target = new Target();
- target.setAddress(targetAddr);
-
- return createReceivingLinkEndpoint(name, target, source, initialCredit);
- }
-
- public ReceivingLinkEndpoint createReceivingLinkEndpoint(final String name,
- Target target,
- Source source,
- UnsignedInteger initialCredit)
- {
- ReceivingLinkEndpoint endpoint = new ReceivingLinkEndpoint(this, name);
- endpoint.setLinkCredit(initialCredit);
- endpoint.setSource(source);
- endpoint.setTarget(target);
- UnsignedInteger handle = findNextAvailableHandle();
- _localLinkEndpoints.put(endpoint, handle);
- endpoint.setLocalHandle(handle);
- getLinkMap().put(name, endpoint);
-
- return endpoint;
-
}
public void updateDisposition(final Role role,
@@ -879,21 +787,11 @@ public class SessionEndpoint
_sessionEventListener = sessionEventListener;
}
- public ConnectionEndpoint getConnection()
+ public AMQPConnection_1_0 getConnection()
{
return _connection;
}
- public SendingLinkEndpoint createTransactionController(String name, TxnCapability... capabilities)
- {
- Coordinator coordinator = new Coordinator();
- coordinator.setCapabilities(capabilities);
-
- Source src = new Source();
-
- return createSendingLinkEndpoint(name, src, coordinator);
- }
-
Map<String, LinkEndpoint> getLinkMap()
{
return _linkMap;
Copied: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionEventListener.java (from r1739261, qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEventListener.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionEventListener.java?p2=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionEventListener.java&p1=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEventListener.java&r1=1739261&r2=1739270&rev=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEventListener.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionEventListener.java Fri Apr 15 10:10:16 2016
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.qpid.amqp_1_0.transport;
+package org.apache.qpid.server.protocol.v1_0;
-import org.apache.qpid.amqp_1_0.type.transport.End;
+import org.apache.qpid.server.protocol.v1_0.type.transport.End;
public interface SessionEventListener
{
Copied: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionState.java (from r1739261, qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionState.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionState.java?p2=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionState.java&p1=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionState.java&r1=1739261&r2=1739270&rev=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionState.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionState.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.transport;
+package org.apache.qpid.server.protocol.v1_0;
public enum SessionState
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java Fri Apr 15 10:10:16 2016
@@ -44,33 +44,26 @@ import javax.security.auth.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.amqp_1_0.transport.LinkEndpoint;
-import org.apache.qpid.amqp_1_0.transport.ReceivingLinkEndpoint;
-import org.apache.qpid.amqp_1_0.transport.ReceivingLinkListener;
-import org.apache.qpid.amqp_1_0.transport.SendingLinkEndpoint;
-import org.apache.qpid.amqp_1_0.transport.SendingLinkListener;
-import org.apache.qpid.amqp_1_0.transport.SessionEndpoint;
-import org.apache.qpid.amqp_1_0.transport.SessionEventListener;
-import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
-import org.apache.qpid.amqp_1_0.type.Binary;
-import org.apache.qpid.amqp_1_0.type.LifetimePolicy;
-import org.apache.qpid.amqp_1_0.type.Symbol;
-import org.apache.qpid.amqp_1_0.type.messaging.DeleteOnClose;
-import org.apache.qpid.amqp_1_0.type.messaging.DeleteOnNoLinks;
-import org.apache.qpid.amqp_1_0.type.messaging.DeleteOnNoLinksOrMessages;
-import org.apache.qpid.amqp_1_0.type.messaging.DeleteOnNoMessages;
-import org.apache.qpid.amqp_1_0.type.messaging.Source;
-import org.apache.qpid.amqp_1_0.type.messaging.Target;
-import org.apache.qpid.amqp_1_0.type.messaging.TerminusDurability;
-import org.apache.qpid.amqp_1_0.type.transaction.Coordinator;
-import org.apache.qpid.amqp_1_0.type.transaction.TxnCapability;
-import org.apache.qpid.amqp_1_0.type.transport.AmqpError;
-import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-import org.apache.qpid.amqp_1_0.type.transport.Detach;
-import org.apache.qpid.amqp_1_0.type.transport.End;
-import org.apache.qpid.amqp_1_0.type.transport.Error;
-import org.apache.qpid.amqp_1_0.type.transport.Role;
-import org.apache.qpid.amqp_1_0.type.transport.Transfer;
+import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
+import org.apache.qpid.server.protocol.v1_0.type.Binary;
+import org.apache.qpid.server.protocol.v1_0.type.LifetimePolicy;
+import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.DeleteOnClose;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.DeleteOnNoLinks;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.DeleteOnNoLinksOrMessages;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.DeleteOnNoMessages;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Source;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Target;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.TerminusDurability;
+import org.apache.qpid.server.protocol.v1_0.type.transaction.Coordinator;
+import org.apache.qpid.server.protocol.v1_0.type.transaction.TxnCapability;
+import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError;
+import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Detach;
+import org.apache.qpid.server.protocol.v1_0.type.transport.End;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Role;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.connection.SessionPrincipal;
import org.apache.qpid.server.consumer.ConsumerImpl;
@@ -110,7 +103,7 @@ public class Session_1_0 implements Sess
private final CopyOnWriteArrayList<Action<? super Session_1_0>> _taskList =
new CopyOnWriteArrayList<Action<? super Session_1_0>>();
- private final Connection_1_0 _connection;
+ private final AMQPConnection_1_0 _connection;
private UUID _id = UUID.randomUUID();
private AtomicBoolean _closed = new AtomicBoolean();
private final Subject _subject = new Subject();
@@ -123,7 +116,7 @@ public class Session_1_0 implements Sess
private final List<ConsumerTarget_1_0> _consumersWithPendingWork = new ArrayList<>();
- public Session_1_0(final Connection_1_0 connection, final SessionEndpoint endpoint)
+ public Session_1_0(final AMQPConnection_1_0 connection, final SessionEndpoint endpoint)
{
_endpoint = endpoint;
_connection = connection;
@@ -592,7 +585,7 @@ public class Session_1_0 implements Sess
@Override
public AMQPConnection<?> getAMQPConnection()
{
- return _connection.getAmqpConnection();
+ return _connection;
}
@Override
@@ -773,7 +766,7 @@ public class Session_1_0 implements Sess
return getId().compareTo(o.getId());
}
- public Connection_1_0 getConnection()
+ public AMQPConnection_1_0 getConnection()
{
return _connection;
}
@@ -965,7 +958,7 @@ public class Session_1_0 implements Sess
@Override
public void addTicker(final Ticker ticker)
{
- getConnection().getAmqpConnection().getAggregateTicker().addTicker(ticker);
+ getConnection().getAggregateTicker().addTicker(ticker);
// trigger a wakeup to ensure the ticker will be taken into account
getAMQPConnection().notifyWork();
}
@@ -973,7 +966,7 @@ public class Session_1_0 implements Sess
@Override
public void removeTicker(final Ticker ticker)
{
- getConnection().getAmqpConnection().getAggregateTicker().removeTicker(ticker);
+ getConnection().getAggregateTicker().removeTicker(ticker);
}
@Override
Copied: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StateChangeListener.java (from r1739261, qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/StateChangeListener.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StateChangeListener.java?p2=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StateChangeListener.java&p1=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/StateChangeListener.java&r1=1739261&r2=1739270&rev=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/StateChangeListener.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StateChangeListener.java Fri Apr 15 10:10:16 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.qpid.amqp_1_0.transport;
+package org.apache.qpid.server.protocol.v1_0;
public interface StateChangeListener
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java Fri Apr 15 10:10:16 2016
@@ -28,24 +28,21 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.amqp_1_0.messaging.SectionDecoder;
-import org.apache.qpid.amqp_1_0.messaging.SectionDecoderImpl;
-import org.apache.qpid.amqp_1_0.transport.LinkEndpoint;
-import org.apache.qpid.amqp_1_0.transport.ReceivingLinkEndpoint;
-import org.apache.qpid.amqp_1_0.transport.ReceivingLinkListener;
-import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
-import org.apache.qpid.amqp_1_0.type.Binary;
-import org.apache.qpid.amqp_1_0.type.Section;
-import org.apache.qpid.amqp_1_0.type.UnsignedInteger;
-import org.apache.qpid.amqp_1_0.type.messaging.Accepted;
-import org.apache.qpid.amqp_1_0.type.messaging.AmqpValue;
-import org.apache.qpid.amqp_1_0.type.transaction.Declare;
-import org.apache.qpid.amqp_1_0.type.transaction.Declared;
-import org.apache.qpid.amqp_1_0.type.transaction.Discharge;
-import org.apache.qpid.amqp_1_0.type.transport.AmqpError;
-import org.apache.qpid.amqp_1_0.type.transport.Detach;
-import org.apache.qpid.amqp_1_0.type.transport.Error;
-import org.apache.qpid.amqp_1_0.type.transport.Transfer;
+import org.apache.qpid.server.protocol.v1_0.messaging.SectionDecoder;
+import org.apache.qpid.server.protocol.v1_0.messaging.SectionDecoderImpl;
+import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
+import org.apache.qpid.server.protocol.v1_0.type.Binary;
+import org.apache.qpid.server.protocol.v1_0.type.Section;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Accepted;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.AmqpValue;
+import org.apache.qpid.server.protocol.v1_0.type.transaction.Declare;
+import org.apache.qpid.server.protocol.v1_0.type.transaction.Declared;
+import org.apache.qpid.server.protocol.v1_0.type.transaction.Discharge;
+import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Detach;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.txn.LocalTransaction;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/UnsettledAction.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/UnsettledAction.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/UnsettledAction.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/UnsettledAction.java Fri Apr 15 10:10:16 2016
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.protocol.v1_0;
-import org.apache.qpid.amqp_1_0.type.DeliveryState;
+import org.apache.qpid.server.protocol.v1_0.type.DeliveryState;
public interface UnsettledAction
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractDescribedTypeWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractDescribedTypeWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractDescribedTypeWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractDescribedTypeWriter.java Fri Apr 15 10:10:16 2016
@@ -19,9 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
-
-import java.nio.ByteBuffer;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractListWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractListWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractListWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractListWriter.java Fri Apr 15 10:10:16 2016
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
public abstract class AbstractListWriter<V> extends CompoundWriter<V>
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractMapWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractMapWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractMapWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractMapWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
public abstract class AbstractMapWriter<V> extends CompoundWriter<V>
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
-import org.apache.qpid.amqp_1_0.type.transport.AmqpError;
+import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
+import org.apache.qpid.server.protocol.v1_0.type.transport.AmqpError;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.lang.reflect.Array;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayWriter.java Fri Apr 15 10:10:16 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryString.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryString.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryString.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryString.java Fri Apr 15 10:10:16 2016
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
final class BinaryString
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -18,14 +18,12 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
-import org.apache.qpid.amqp_1_0.type.Binary;
+import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
+import org.apache.qpid.server.protocol.v1_0.type.Binary;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import java.nio.ByteBuffer;
-
public class BinaryTypeConstructor extends VariableWidthTypeConstructor
{
private static final BinaryTypeConstructor INSTANCE_1 = new BinaryTypeConstructor(1);
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryWriter.java Fri Apr 15 10:10:16 2016
@@ -19,9 +19,9 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.Binary;
+import org.apache.qpid.server.protocol.v1_0.type.Binary;
public class BinaryWriter extends SimpleVariableWidthWriter<Binary>
{
@@ -72,4 +72,4 @@ public class BinaryWriter extends Simple
{
registry.register(Binary.class, FACTORY);
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BooleanConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BooleanConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BooleanConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BooleanConstructor.java Fri Apr 15 10:10:16 2016
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
-import org.apache.qpid.amqp_1_0.type.transport.*;
-import org.apache.qpid.amqp_1_0.type.transport.Error;
+import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
+import org.apache.qpid.server.protocol.v1_0.type.transport.*;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class BooleanConstructor
@@ -52,7 +52,7 @@ public class BooleanConstructor
}
else
{
- org.apache.qpid.amqp_1_0.type.transport.Error error = new Error();
+ org.apache.qpid.server.protocol.v1_0.type.transport.Error error = new Error();
error.setCondition(ConnectionError.FRAMING_ERROR);
error.setDescription("Cannot construct boolean: insufficient input data");
throw new AmqpErrorException(error);
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BooleanWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BooleanWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BooleanWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BooleanWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteArrayWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteArrayWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteArrayWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteArrayWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
public class ByteArrayWriter extends SimpleVariableWidthWriter<byte[]>
{
@@ -63,4 +63,4 @@ public class ByteArrayWriter extends Sim
registry.register(byte[].class, FACTORY);
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -18,11 +18,11 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.*;
-import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-import org.apache.qpid.amqp_1_0.type.transport.Error;
+import org.apache.qpid.server.protocol.v1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ByteTypeConstructor implements TypeConstructor
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CharTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CharTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CharTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CharTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.*;
-import org.apache.qpid.amqp_1_0.type.transport.*;
+import org.apache.qpid.server.protocol.v1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.transport.*;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class CharTypeConstructor implements TypeConstructor
@@ -55,7 +55,7 @@ public class CharTypeConstructor impleme
}
else
{
- org.apache.qpid.amqp_1_0.type.transport.Error error = new org.apache.qpid.amqp_1_0.type.transport.Error();
+ org.apache.qpid.server.protocol.v1_0.type.transport.Error error = new org.apache.qpid.server.protocol.v1_0.type.transport.Error();
error.setCondition(ConnectionError.FRAMING_ERROR);
error.setDescription("Cannot construct char: insufficient input data");
throw new AmqpErrorException(error);
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CharWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CharWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CharWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CharWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
public class CharWriter extends FixedFourWriter<Character>
{
@@ -50,4 +50,4 @@ public class CharWriter extends FixedFou
{
registry.register(Character.class, FACTORY);
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeAssembler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeAssembler.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeAssembler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeAssembler.java Fri Apr 15 10:10:16 2016
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
+import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
public interface CompoundTypeAssembler
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -18,14 +18,13 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.*;
-import org.apache.qpid.amqp_1_0.type.transport.*;
-import org.apache.qpid.amqp_1_0.type.transport.Error;
+import org.apache.qpid.server.protocol.v1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.transport.*;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Formatter;
import java.util.HashMap;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundWriter.java Fri Apr 15 10:10:16 2016
@@ -19,9 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
-
-import java.nio.ByteBuffer;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DecimalConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DecimalConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DecimalConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DecimalConstructor.java Fri Apr 15 10:10:16 2016
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
-import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
+import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
+import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
import java.math.BigDecimal;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -42,29 +42,4 @@ public class DefaultDescribedTypeConstru
return new DescribedType(_descriptor, underlying);
}
-
- public static void main(String[] args) throws IOException, ParseException
- {
- LineNumberReader reader = new LineNumberReader(new InputStreamReader(System.in));
- SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss,SSS");
- String line;
- Pattern pattern = Pattern.compile("^\\d+ (\\d{4}-\\d{2}-\\d{2} \\d\\d:\\d\\d:\\d\\d,\\d\\d\\d)");
-
- long prevTime = Long.MAX_VALUE;
-
- while((line = reader.readLine()) != null)
- {
- Matcher m = pattern.matcher(line);
- if(m.matches())
- {
- String timeStr = m.group(1);
- long time = df.parse(timeStr).getTime();
- if(time - prevTime > 20000)
- {
- System.out.println(df.format(prevTime) + " - " + df.format(time));
- }
- prevTime = time;
- }
- }
- }
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DelegatingValueWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DelegatingValueWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DelegatingValueWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DelegatingValueWriter.java Fri Apr 15 10:10:16 2016
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedType.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedType.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedType.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedType.java Fri Apr 15 10:10:16 2016
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
public class DescribedType
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
+import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
public abstract class DescribedTypeConstructor<T extends Object>
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedTypeConstructorRegistry.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedTypeConstructorRegistry.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedTypeConstructorRegistry.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedTypeConstructorRegistry.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
public interface DescribedTypeConstructorRegistry
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DoubleTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DoubleTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DoubleTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DoubleTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -18,11 +18,11 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
-import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-import org.apache.qpid.amqp_1_0.type.transport.Error;
+import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
+import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class DoubleTypeConstructor implements TypeConstructor
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DoubleWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DoubleWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DoubleWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DoubleWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
public class DoubleWriter extends FixedEightWriter<Double>
{
@@ -51,4 +51,4 @@ public class DoubleWriter extends FixedE
{
registry.register(Double.class, FACTORY);
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedEightWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedEightWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedEightWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedEightWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedFourWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedFourWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedFourWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedFourWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedOneWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedOneWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedOneWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedOneWriter.java Fri Apr 15 10:10:16 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedSixteenWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedSixteenWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedSixteenWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedSixteenWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedTwoWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedTwoWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedTwoWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedTwoWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -18,11 +18,11 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.*;
-import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
-import org.apache.qpid.amqp_1_0.type.transport.Error;
+import org.apache.qpid.server.protocol.v1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class FloatTypeConstructor implements TypeConstructor
@@ -47,7 +47,7 @@ public class FloatTypeConstructor implem
}
else
{
- org.apache.qpid.amqp_1_0.type.transport.Error error = new Error();
+ org.apache.qpid.server.protocol.v1_0.type.transport.Error error = new Error();
error.setCondition(ConnectionError.FRAMING_ERROR);
error.setDescription("Cannot construct float: insufficient input data");
throw new AmqpErrorException(error);
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
public class FloatWriter extends FixedFourWriter<Float>
{
@@ -51,4 +51,4 @@ public class FloatWriter extends FixedFo
{
registry.register(Float.class, FACTORY);
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FrameWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FrameWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FrameWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FrameWriter.java Fri Apr 15 10:10:16 2016
@@ -19,9 +19,9 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.framing.AMQFrame;
+import org.apache.qpid.server.protocol.v1_0.framing.AMQFrame;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class FrameWriter implements ValueWriter<AMQFrame>
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.*;
-import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
+import org.apache.qpid.server.protocol.v1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class IntTypeConstructor implements TypeConstructor
@@ -46,7 +46,7 @@ public class IntTypeConstructor implemen
}
else
{
- org.apache.qpid.amqp_1_0.type.transport.Error error = new org.apache.qpid.amqp_1_0.type.transport.Error();
+ org.apache.qpid.server.protocol.v1_0.type.transport.Error error = new org.apache.qpid.server.protocol.v1_0.type.transport.Error();
error.setCondition(ConnectionError.FRAMING_ERROR);
error.setDescription("Cannot construct int: insufficient input data");
throw new AmqpErrorException(error);
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntegerWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntegerWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntegerWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntegerWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import java.util.List;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.*;
-import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
+import org.apache.qpid.server.protocol.v1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class LongTypeConstructor implements TypeConstructor
@@ -46,7 +46,7 @@ public class LongTypeConstructor impleme
}
else
{
- org.apache.qpid.amqp_1_0.type.transport.Error error = new org.apache.qpid.amqp_1_0.type.transport.Error();
+ org.apache.qpid.server.protocol.v1_0.type.transport.Error error = new org.apache.qpid.server.protocol.v1_0.type.transport.Error();
error.setCondition(ConnectionError.FRAMING_ERROR);
error.setDescription("Cannot construct long: insufficient input data");
throw new AmqpErrorException(error);
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import java.util.Iterator;
import java.util.Map;
@@ -99,4 +99,4 @@ public class MapWriter extends AbstractM
{
registry.register(Map.class, FACTORY);
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.AmqpErrorException;
+import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
class NullTypeConstructor implements TypeConstructor<Void>
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ProtocolHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ProtocolHandler.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ProtocolHandler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ProtocolHandler.java Fri Apr 15 10:10:16 2016
@@ -18,9 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
-
-import java.nio.ByteBuffer;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/RestrictedTypeValueWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/RestrictedTypeValueWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/RestrictedTypeValueWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/RestrictedTypeValueWriter.java Fri Apr 15 10:10:16 2016
@@ -18,9 +18,9 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.RestrictedType;
+import org.apache.qpid.server.protocol.v1_0.type.RestrictedType;
public class RestrictedTypeValueWriter<V> extends DelegatingValueWriter<RestrictedType<V>>
{
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortTypeConstructor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortTypeConstructor.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortTypeConstructor.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortTypeConstructor.java Fri Apr 15 10:10:16 2016
@@ -18,10 +18,10 @@
* under the License.
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
-import org.apache.qpid.amqp_1_0.type.*;
-import org.apache.qpid.amqp_1_0.type.transport.ConnectionError;
+import org.apache.qpid.server.protocol.v1_0.type.*;
+import org.apache.qpid.server.protocol.v1_0.type.transport.ConnectionError;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
public class ShortTypeConstructor implements TypeConstructor
@@ -46,7 +46,7 @@ public class ShortTypeConstructor implem
}
else
{
- org.apache.qpid.amqp_1_0.type.transport.Error error = new org.apache.qpid.amqp_1_0.type.transport.Error();
+ org.apache.qpid.server.protocol.v1_0.type.transport.Error error = new org.apache.qpid.server.protocol.v1_0.type.transport.Error();
error.setCondition(ConnectionError.FRAMING_ERROR);
error.setDescription("Cannot construct short: insufficient input data");
throw new AmqpErrorException(error);
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
public class ShortWriter extends FixedTwoWriter<Short>
{
@@ -52,4 +52,4 @@ public class ShortWriter extends FixedTw
{
registry.register(Short.class, FACTORY);
}
-}
\ No newline at end of file
+}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SimpleVariableWidthWriter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SimpleVariableWidthWriter.java?rev=1739270&r1=1739269&r2=1739270&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SimpleVariableWidthWriter.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SimpleVariableWidthWriter.java Fri Apr 15 10:10:16 2016
@@ -19,7 +19,7 @@
*
*/
-package org.apache.qpid.amqp_1_0.codec;
+package org.apache.qpid.server.protocol.v1_0.codec;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org