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 2012/12/12 14:33:07 UTC
svn commit: r1420665 [7/7] - in /qpid/proton/trunk/proton-j:
contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/
contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/
proton/src/main/java/org/apache/qpid/proton/amq...
Added: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/TransferType.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/TransferType.java?rev=1420665&view=auto
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/TransferType.java (added)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/transport/TransferType.java Wed Dec 12 13:32:32 2012
@@ -0,0 +1,207 @@
+
+/*
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+*/
+
+
+package org.apache.qpid.proton.codec.transport;
+
+import java.util.AbstractList;
+import java.util.List;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.UnsignedByte;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+import org.apache.qpid.proton.amqp.UnsignedLong;
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
+import org.apache.qpid.proton.amqp.transport.ReceiverSettleMode;
+import org.apache.qpid.proton.amqp.transport.Transfer;
+import org.apache.qpid.proton.codec.AbstractDescribedType;
+import org.apache.qpid.proton.codec.DecodeException;
+import org.apache.qpid.proton.codec.Decoder;
+import org.apache.qpid.proton.codec.DescribedTypeConstructor;
+import org.apache.qpid.proton.codec.EncoderImpl;
+
+
+public final class TransferType extends AbstractDescribedType<Transfer,List> implements DescribedTypeConstructor<Transfer>
+{
+ private static final Object[] DESCRIPTORS =
+ {
+ UnsignedLong.valueOf(0x0000000000000014L), Symbol.valueOf("amqp:transfer:list"),
+ };
+
+ private static final UnsignedLong DESCRIPTOR = UnsignedLong.valueOf(0x0000000000000014L);
+
+ private TransferType(EncoderImpl encoder)
+ {
+ super(encoder);
+ }
+
+
+ public UnsignedLong getDescriptor()
+ {
+ return DESCRIPTOR;
+ }
+
+ @Override
+ protected List wrap(Transfer val)
+ {
+ return new TransferWrapper(val);
+ }
+
+
+ public static class TransferWrapper extends AbstractList
+ {
+
+ private Transfer _transfer;
+
+ public TransferWrapper(Transfer transfer)
+ {
+ _transfer = transfer;
+ }
+
+ public Object get(final int index)
+ {
+
+ switch(index)
+ {
+ case 0:
+ return _transfer.getHandle();
+ case 1:
+ return _transfer.getDeliveryId();
+ case 2:
+ return _transfer.getDeliveryTag();
+ case 3:
+ return _transfer.getMessageFormat();
+ case 4:
+ return _transfer.getSettled();
+ case 5:
+ return _transfer.getMore();
+ case 6:
+ return _transfer.getRcvSettleMode() == null ? null : _transfer.getRcvSettleMode().getValue();
+ case 7:
+ return _transfer.getState();
+ case 8:
+ return _transfer.getResume();
+ case 9:
+ return _transfer.getAborted();
+ case 10:
+ return _transfer.getBatchable();
+ }
+
+ throw new IllegalStateException("Unknown index " + index);
+
+ }
+
+ public int size()
+ {
+ return _transfer.getBatchable()
+ ? 11
+ : _transfer.getAborted()
+ ? 10
+ : _transfer.getResume()
+ ? 9
+ : _transfer.getState() != null
+ ? 8
+ : _transfer.getRcvSettleMode() != null
+ ? 7
+ : _transfer.getMore()
+ ? 6
+ : _transfer.getSettled() != null
+ ? 5
+ : _transfer.getMessageFormat() != null
+ ? 4
+ : _transfer.getDeliveryTag() != null
+ ? 3
+ : _transfer.getDeliveryId() != null
+ ? 2
+ : 1;
+
+ }
+
+ }
+
+ public Transfer newInstance(Object described)
+ {
+ List l = (List) described;
+
+ Transfer o = new Transfer();
+
+ if(l.isEmpty())
+ {
+ throw new DecodeException("The handle field cannot be omitted");
+ }
+
+ switch(11 - l.size())
+ {
+
+ case 0:
+ Boolean batchable = (Boolean) l.get(10);
+ o.setBatchable(batchable == null ? false : batchable);
+ case 1:
+ Boolean aborted = (Boolean) l.get(9);
+ o.setAborted(aborted == null ? false : aborted);
+ case 2:
+ Boolean resume = (Boolean) l.get(8);
+ o.setResume(resume == null ? false : resume);
+ case 3:
+ o.setState( (DeliveryState) l.get( 7 ) );
+ case 4:
+ UnsignedByte receiverSettleMode = (UnsignedByte) l.get(6);
+ o.setRcvSettleMode(receiverSettleMode == null ? null : ReceiverSettleMode.values()[receiverSettleMode.intValue()]);
+ case 5:
+ Boolean more = (Boolean) l.get(5);
+ o.setMore(more == null ? false : more );
+ case 6:
+ o.setSettled( (Boolean) l.get( 4 ) );
+ case 7:
+ o.setMessageFormat( (UnsignedInteger) l.get( 3 ) );
+ case 8:
+ o.setDeliveryTag( (Binary) l.get( 2 ) );
+ case 9:
+ o.setDeliveryId( (UnsignedInteger) l.get( 1 ) );
+ case 10:
+ o.setHandle( (UnsignedInteger) l.get( 0 ) );
+ }
+
+
+ return o;
+ }
+
+ public Class<Transfer> getTypeClass()
+ {
+ return Transfer.class;
+ }
+
+
+
+
+ public static void register(Decoder decoder, EncoderImpl encoder)
+ {
+ TransferType type = new TransferType(encoder);
+ for(Object descriptor : DESCRIPTORS)
+ {
+ decoder.register(descriptor, type);
+ }
+ encoder.register(type);
+ }
+
+}
+
\ No newline at end of file
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/driver/Driver.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/driver/Driver.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/driver/Driver.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/driver/Driver.java Wed Dec 12 13:32:32 2012
@@ -113,7 +113,7 @@ public interface Driver
/**
* Create a connector using the existing file descriptor.
*
- * @param c existing SocketChannel for listener to listen on
+ * @param fd existing SocketChannel for listener to listen on
* @param context application-supplied, can be accessed via
* {@link Connector#getContext() getContext()} method on a listener.
*
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Delivery.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Delivery.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Delivery.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Delivery.java Wed Dec 12 13:32:32 2012
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.proton.engine;
-import org.apache.qpid.proton.type.transport.DeliveryState;
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
/**
* Delivery
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Link.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Link.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Link.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/Link.java Wed Dec 12 13:32:32 2012
@@ -22,9 +22,11 @@ package org.apache.qpid.proton.engine;
import java.util.EnumSet;
import java.util.Iterator;
-import org.apache.qpid.proton.type.UnsignedByte;
-import org.apache.qpid.proton.type.transport.Source;
-import org.apache.qpid.proton.type.transport.Target;
+import org.apache.qpid.proton.amqp.UnsignedByte;
+import org.apache.qpid.proton.amqp.transport.ReceiverSettleMode;
+import org.apache.qpid.proton.amqp.transport.SenderSettleMode;
+import org.apache.qpid.proton.amqp.transport.Source;
+import org.apache.qpid.proton.amqp.transport.Target;
/**
* Link
@@ -95,17 +97,17 @@ public interface Link extends Endpoint
public Session getSession();
- UnsignedByte getSenderSettleMode();
+ SenderSettleMode getSenderSettleMode();
- void setSenderSettleMode(UnsignedByte senderSettleMode);
+ void setSenderSettleMode(SenderSettleMode senderSettleMode);
- UnsignedByte getRemoteSenderSettleMode();
+ SenderSettleMode getRemoteSenderSettleMode();
- void setRemoteSenderSettleMode(UnsignedByte remoteSenderSettleMode);
+ void setRemoteSenderSettleMode(SenderSettleMode remoteSenderSettleMode);
- UnsignedByte getReceiverSettleMode();
+ ReceiverSettleMode getReceiverSettleMode();
- void setReceiverSettleMode(UnsignedByte receiverSettleMode);
+ void setReceiverSettleMode(ReceiverSettleMode receiverSettleMode);
- UnsignedByte getRemoteReceiverSettleMode();
+ ReceiverSettleMode getRemoteReceiverSettleMode();
}
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=1420665&r1=1420664&r2=1420665&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 Dec 12 13:32:32 2012
@@ -25,7 +25,7 @@ import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
import org.apache.qpid.proton.engine.*;
-import org.apache.qpid.proton.type.transport.Open;
+import org.apache.qpid.proton.amqp.transport.Open;
public class ConnectionImpl extends EndpointImpl implements Connection
{
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java Wed Dec 12 13:32:32 2012
@@ -21,7 +21,7 @@
package org.apache.qpid.proton.engine.impl;
import org.apache.qpid.proton.engine.Delivery;
-import org.apache.qpid.proton.type.transport.DeliveryState;
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
public class DeliveryImpl implements Delivery
{
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/FrameParser.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/FrameParser.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/FrameParser.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/FrameParser.java Wed Dec 12 13:32:32 2012
@@ -29,9 +29,9 @@ import org.apache.qpid.proton.codec.Enco
import org.apache.qpid.proton.engine.EndpointError;
import org.apache.qpid.proton.engine.TransportException;
import org.apache.qpid.proton.framing.TransportFrame;
-import org.apache.qpid.proton.type.AMQPDefinedTypes;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.transport.FrameBody;
+import org.apache.qpid.proton.codec.AMQPDefinedTypes;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.transport.FrameBody;
import java.nio.ByteBuffer;
import java.util.Formatter;
@@ -88,7 +88,7 @@ class FrameParser implements TransportIn
private EncoderImpl _encoder = new EncoderImpl(_decoder);
{
- AMQPDefinedTypes.registerAllTypes(_decoder);
+ AMQPDefinedTypes.registerAllTypes(_decoder, _encoder);
}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java Wed Dec 12 13:32:32 2012
@@ -21,11 +21,13 @@
package org.apache.qpid.proton.engine.impl;
import java.util.EnumSet;
+import org.apache.qpid.proton.amqp.transport.ReceiverSettleMode;
+import org.apache.qpid.proton.amqp.transport.SenderSettleMode;
import org.apache.qpid.proton.engine.EndpointState;
import org.apache.qpid.proton.engine.Link;
-import org.apache.qpid.proton.type.UnsignedByte;
-import org.apache.qpid.proton.type.transport.Source;
-import org.apache.qpid.proton.type.transport.Target;
+import org.apache.qpid.proton.amqp.UnsignedByte;
+import org.apache.qpid.proton.amqp.transport.Source;
+import org.apache.qpid.proton.amqp.transport.Target;
public abstract class LinkImpl extends EndpointImpl implements Link
{
@@ -45,10 +47,10 @@ public abstract class LinkImpl extends E
private int _unsettled;
- private UnsignedByte _senderSettleMode;
- private UnsignedByte _remoteSenderSettleMode;
- private UnsignedByte _receiverSettleMode;
- private UnsignedByte _remoteReceiverSettleMode;
+ private SenderSettleMode _senderSettleMode;
+ private SenderSettleMode _remoteSenderSettleMode;
+ private ReceiverSettleMode _receiverSettleMode;
+ private ReceiverSettleMode _remoteReceiverSettleMode;
private final LinkNode<LinkImpl> _node;
@@ -302,48 +304,48 @@ public abstract class LinkImpl extends E
}
@Override
- public UnsignedByte getSenderSettleMode()
+ public SenderSettleMode getSenderSettleMode()
{
return _senderSettleMode;
}
@Override
- public void setSenderSettleMode(UnsignedByte senderSettleMode)
+ public void setSenderSettleMode(SenderSettleMode senderSettleMode)
{
_senderSettleMode = senderSettleMode;
}
@Override
- public UnsignedByte getRemoteSenderSettleMode()
+ public SenderSettleMode getRemoteSenderSettleMode()
{
return _remoteSenderSettleMode;
}
@Override
- public void setRemoteSenderSettleMode(UnsignedByte remoteSenderSettleMode)
+ public void setRemoteSenderSettleMode(SenderSettleMode remoteSenderSettleMode)
{
_remoteSenderSettleMode = remoteSenderSettleMode;
}
@Override
- public UnsignedByte getReceiverSettleMode()
+ public ReceiverSettleMode getReceiverSettleMode()
{
return _receiverSettleMode;
}
@Override
- public void setReceiverSettleMode(UnsignedByte receiverSettleMode)
+ public void setReceiverSettleMode(ReceiverSettleMode receiverSettleMode)
{
_receiverSettleMode = receiverSettleMode;
}
@Override
- public UnsignedByte getRemoteReceiverSettleMode()
+ public ReceiverSettleMode getRemoteReceiverSettleMode()
{
return _remoteReceiverSettleMode;
}
- void setRemoteReceiverSettleMode(UnsignedByte remoteReceiverSettleMode)
+ void setRemoteReceiverSettleMode(ReceiverSettleMode remoteReceiverSettleMode)
{
_remoteReceiverSettleMode = remoteReceiverSettleMode;
}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ProtocolTracer.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ProtocolTracer.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ProtocolTracer.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ProtocolTracer.java Wed Dec 12 13:32:32 2012
@@ -21,11 +21,6 @@
package org.apache.qpid.proton.engine.impl;
import org.apache.qpid.proton.framing.TransportFrame;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.DescribedType;
-import org.apache.qpid.proton.type.transport.FrameBody;
-
-import java.nio.ByteBuffer;
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslFrameParser.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslFrameParser.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslFrameParser.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslFrameParser.java Wed Dec 12 13:32:32 2012
@@ -25,8 +25,8 @@ import java.nio.ByteBuffer;
import java.util.Formatter;
import org.apache.qpid.proton.codec.DecodeException;
import org.apache.qpid.proton.engine.EndpointError;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.security.SaslFrameBody;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.security.SaslFrameBody;
class SaslFrameParser
{
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java Wed Dec 12 13:32:32 2012
@@ -28,11 +28,11 @@ import org.apache.qpid.proton.codec.Deco
import org.apache.qpid.proton.codec.EncoderImpl;
import org.apache.qpid.proton.codec.WritableBuffer;
import org.apache.qpid.proton.engine.Sasl;
-import org.apache.qpid.proton.type.AMQPDefinedTypes;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.Symbol;
-import org.apache.qpid.proton.type.UnsignedByte;
-import org.apache.qpid.proton.type.security.*;
+import org.apache.qpid.proton.codec.AMQPDefinedTypes;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.UnsignedByte;
+import org.apache.qpid.proton.amqp.security.*;
public class SaslImpl implements Sasl, SaslFrameBody.SaslFrameBodyHandler<Void>
{
@@ -79,7 +79,7 @@ public class SaslImpl implements Sasl, S
public SaslImpl()
{
_frameParser = new SaslFrameParser(this);
- AMQPDefinedTypes.registerAllTypes(_decoder);
+ AMQPDefinedTypes.registerAllTypes(_decoder,_encoder);
_overflowBuffer.flip();
}
@@ -153,9 +153,9 @@ public class SaslImpl implements Sasl, S
if(_done)
{
- org.apache.qpid.proton.type.security.SaslOutcome outcome =
- new org.apache.qpid.proton.type.security.SaslOutcome();
- outcome.setCode(UnsignedByte.valueOf(_outcome.getCode()));
+ org.apache.qpid.proton.amqp.security.SaslOutcome outcome =
+ new org.apache.qpid.proton.amqp.security.SaslOutcome();
+ outcome.setCode(SaslCode.values()[_outcome.getCode()]);
written+=writeFrame(buffer, outcome);
}
}
@@ -180,7 +180,7 @@ public class SaslImpl implements Sasl, S
int oldPosition = buffer.position();
buffer.position(buffer.position()+8);
_encoder.setByteBuffer(buffer);
- _encoder.writeDescribedType(frameBody);
+ _encoder.writeObject(frameBody);
int frameSize = buffer.position() - oldPosition;
int limit = buffer.position();
@@ -395,14 +395,14 @@ public class SaslImpl implements Sasl, S
}
- public void handleOutcome(org.apache.qpid.proton.type.security.SaslOutcome saslOutcome,
+ public void handleOutcome(org.apache.qpid.proton.amqp.security.SaslOutcome saslOutcome,
Binary payload,
Void context)
{
checkRole(Role.CLIENT);
for(SaslOutcome outcome : SaslOutcome.values())
{
- if(outcome.getCode() == saslOutcome.getCode().byteValue())
+ if(outcome.getCode() == saslOutcome.getCode().ordinal())
{
_outcome = outcome;
break;
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportDelivery.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportDelivery.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportDelivery.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportDelivery.java Wed Dec 12 13:32:32 2012
@@ -21,7 +21,7 @@
package org.apache.qpid.proton.engine.impl;
-import org.apache.qpid.proton.type.UnsignedInteger;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
public class TransportDelivery
{
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=1420665&r1=1420664&r2=1420665&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 Dec 12 13:32:32 2012
@@ -20,6 +20,11 @@ package org.apache.qpid.proton.engine.im
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+import org.apache.qpid.proton.amqp.UnsignedShort;
+import org.apache.qpid.proton.codec.AMQPDefinedTypes;
import org.apache.qpid.proton.codec.CompositeWritableBuffer;
import org.apache.qpid.proton.codec.DecoderImpl;
import org.apache.qpid.proton.codec.EncoderImpl;
@@ -33,26 +38,26 @@ import org.apache.qpid.proton.engine.Tra
import org.apache.qpid.proton.engine.TransportException;
import org.apache.qpid.proton.engine.impl.ssl.SslImpl;
import org.apache.qpid.proton.framing.TransportFrame;
-import org.apache.qpid.proton.type.*;
-import org.apache.qpid.proton.type.transport.Attach;
-import org.apache.qpid.proton.type.transport.Begin;
-import org.apache.qpid.proton.type.transport.Close;
-import org.apache.qpid.proton.type.transport.Detach;
-import org.apache.qpid.proton.type.transport.Disposition;
-import org.apache.qpid.proton.type.transport.End;
-import org.apache.qpid.proton.type.transport.Flow;
-import org.apache.qpid.proton.type.transport.FrameBody;
-import org.apache.qpid.proton.type.transport.Open;
-import org.apache.qpid.proton.type.transport.Role;
-import org.apache.qpid.proton.type.transport.Transfer;
+import org.apache.qpid.proton.amqp.transport.Attach;
+import org.apache.qpid.proton.amqp.transport.Begin;
+import org.apache.qpid.proton.amqp.transport.Close;
+import org.apache.qpid.proton.amqp.transport.Detach;
+import org.apache.qpid.proton.amqp.transport.Disposition;
+import org.apache.qpid.proton.amqp.transport.End;
+import org.apache.qpid.proton.amqp.transport.ErrorCondition;
+import org.apache.qpid.proton.amqp.transport.Flow;
+import org.apache.qpid.proton.amqp.transport.FrameBody;
+import org.apache.qpid.proton.amqp.transport.Open;
+import org.apache.qpid.proton.amqp.transport.Role;
+import org.apache.qpid.proton.amqp.transport.Transfer;
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.type.messaging.Accepted ACCEPTED =
- new org.apache.qpid.proton.type.messaging.Accepted();
+ public static final org.apache.qpid.proton.amqp.messaging.Accepted ACCEPTED =
+ new org.apache.qpid.proton.amqp.messaging.Accepted();
static
{
@@ -98,7 +103,7 @@ public class TransportImpl extends Endpo
{
- AMQPDefinedTypes.registerAllTypes(_decoder);
+ AMQPDefinedTypes.registerAllTypes(_decoder, _encoder);
_overflowBuffer.flip();
}
@@ -292,7 +297,7 @@ public class TransportImpl extends Endpo
EndpointError localError = link.getLocalError();
if( localError !=null ) {
- org.apache.qpid.proton.type.transport.Error error = new org.apache.qpid.proton.type.transport.Error();
+ ErrorCondition error = new ErrorCondition();
error.setCondition(Symbol.getSymbol(localError.getName()));
error.setDescription(localError.getDescription());
detach.setError(error);
@@ -881,7 +886,7 @@ public class TransportImpl extends Endpo
private int writeFrame(WritableBuffer buffer,
int channel,
- DescribedType frameBody,
+ FrameBody frameBody,
ByteBuffer payload,
Runnable onPayloadTooLarge)
{
@@ -889,7 +894,7 @@ public class TransportImpl extends Endpo
buffer.position(oldPosition+8);
_encoder.setByteBuffer(buffer);
- _encoder.writeDescribedType(frameBody);
+ _encoder.writeObject(frameBody);
if(payload != null && (payload.remaining() + buffer.position() - oldPosition) > _maxFrameSize)
{
@@ -898,7 +903,7 @@ public class TransportImpl extends Endpo
onPayloadTooLarge.run();
}
buffer.position(oldPosition+8);
- _encoder.writeDescribedType(frameBody);
+ _encoder.writeObject(frameBody);
}
if( _protocolTracer!=null )
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportLink.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportLink.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportLink.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportLink.java Wed Dec 12 13:32:32 2012
@@ -21,8 +21,8 @@
package org.apache.qpid.proton.engine.impl;
-import org.apache.qpid.proton.type.UnsignedInteger;
-import org.apache.qpid.proton.type.transport.Flow;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+import org.apache.qpid.proton.amqp.transport.Flow;
class TransportLink<T extends LinkImpl>
{
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportReceiver.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportReceiver.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportReceiver.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportReceiver.java Wed Dec 12 13:32:32 2012
@@ -21,7 +21,7 @@
package org.apache.qpid.proton.engine.impl;
-import org.apache.qpid.proton.type.transport.Flow;
+import org.apache.qpid.proton.amqp.transport.Flow;
class TransportReceiver extends TransportLink<ReceiverImpl>
{
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSender.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSender.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSender.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSender.java Wed Dec 12 13:32:32 2012
@@ -21,8 +21,8 @@
package org.apache.qpid.proton.engine.impl;
-import org.apache.qpid.proton.type.UnsignedInteger;
-import org.apache.qpid.proton.type.transport.Flow;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+import org.apache.qpid.proton.amqp.transport.Flow;
class TransportSender extends TransportLink<SenderImpl>
{
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportSession.java Wed Dec 12 13:32:32 2012
@@ -23,11 +23,12 @@ package org.apache.qpid.proton.engine.im
import java.util.HashMap;
import java.util.Map;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.UnsignedInteger;
-import org.apache.qpid.proton.type.transport.Disposition;
-import org.apache.qpid.proton.type.transport.Flow;
-import org.apache.qpid.proton.type.transport.Transfer;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+import org.apache.qpid.proton.amqp.transport.Disposition;
+import org.apache.qpid.proton.amqp.transport.Flow;
+import org.apache.qpid.proton.amqp.transport.Role;
+import org.apache.qpid.proton.amqp.transport.Transfer;
class TransportSession
{
@@ -323,7 +324,7 @@ class TransportSession
UnsignedInteger id = disposition.getFirst();
UnsignedInteger last = disposition.getLast() == null ? id : disposition.getLast();
final Map<UnsignedInteger, DeliveryImpl> unsettledDeliveries =
- disposition.getRole() ? _unsettledOutgoingDeliveriesById
+ disposition.getRole() == Role.RECEIVER ? _unsettledOutgoingDeliveriesById
: _unsettledIncomingDeliveriesById;
while(id.compareTo(last)<=0)
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/framing/TransportFrame.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/framing/TransportFrame.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/framing/TransportFrame.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/framing/TransportFrame.java Wed Dec 12 13:32:32 2012
@@ -20,10 +20,8 @@
*/
package org.apache.qpid.proton.framing;
-import org.apache.qpid.proton.type.Binary;
-import org.apache.qpid.proton.type.transport.FrameBody;
-
-import java.nio.ByteBuffer;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.transport.FrameBody;
public class TransportFrame
{
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/message/AMQPMessageFormat.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/message/AMQPMessageFormat.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/message/AMQPMessageFormat.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/message/AMQPMessageFormat.java Wed Dec 12 13:32:32 2012
@@ -25,9 +25,9 @@ import java.math.BigDecimal;
import java.nio.CharBuffer;
import java.text.DecimalFormat;
import java.util.*;
-import org.apache.qpid.proton.type.DescribedType;
-import org.apache.qpid.proton.type.Symbol;
-import org.apache.qpid.proton.type.transport.Flow;
+import org.apache.qpid.proton.amqp.DescribedType;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.transport.Flow;
public class AMQPMessageFormat
{
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/message/Message.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/message/Message.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/message/Message.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/message/Message.java Wed Dec 12 13:32:32 2012
@@ -23,11 +23,16 @@ package org.apache.qpid.proton.message;
import java.nio.ByteBuffer;
import java.util.Date;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.UnsignedByte;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+import org.apache.qpid.proton.amqp.messaging.Section;
+import org.apache.qpid.proton.codec.AMQPDefinedTypes;
import org.apache.qpid.proton.codec.DecoderImpl;
import org.apache.qpid.proton.codec.EncoderImpl;
import org.apache.qpid.proton.codec.WritableBuffer;
-import org.apache.qpid.proton.type.*;
-import org.apache.qpid.proton.type.messaging.*;
+import org.apache.qpid.proton.amqp.messaging.*;
public class Message
{
@@ -502,7 +507,7 @@ public class Message
DecoderImpl decoder = new DecoderImpl();
EncoderImpl encoder = new EncoderImpl(decoder);
- AMQPDefinedTypes.registerAllTypes(decoder);
+ AMQPDefinedTypes.registerAllTypes(decoder, encoder);
final ByteBuffer buffer = ByteBuffer.wrap(data, offset, length);
decoder.setByteBuffer(buffer);
@@ -623,7 +628,7 @@ public class Message
int length = buffer.remaining();
DecoderImpl decoder = new DecoderImpl();
EncoderImpl encoder = new EncoderImpl(decoder);
- AMQPDefinedTypes.registerAllTypes(decoder);
+ AMQPDefinedTypes.registerAllTypes(decoder, encoder);
encoder.setByteBuffer(buffer);
if(getHeader() != null)
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java Wed Dec 12 13:32:32 2012
@@ -47,9 +47,9 @@ import org.apache.qpid.proton.messenger.
import org.apache.qpid.proton.messenger.MessengerException;
import org.apache.qpid.proton.messenger.Status;
import org.apache.qpid.proton.messenger.Tracker;
-import org.apache.qpid.proton.type.messaging.Accepted;
-import org.apache.qpid.proton.type.messaging.Source;
-import org.apache.qpid.proton.type.messaging.Target;
+import org.apache.qpid.proton.amqp.messaging.Accepted;
+import org.apache.qpid.proton.amqp.messaging.Source;
+import org.apache.qpid.proton.amqp.messaging.Target;
public class MessengerImpl implements Messenger
{
@@ -132,7 +132,10 @@ public class MessengerImpl implements Me
try
{
URI address = new URI(m.getAddress());
- if (address.getHost() == null) throw new MessengerException("unable to send to address: " + m.getAddress());
+ if (address.getHost() == null)
+ {
+ throw new MessengerException("unable to send to address: " + m.getAddress());
+ }
int port = address.getPort() < 0 ? defaultPort(address.getScheme()) : address.getPort();
Sender sender = getLink(address.getHost(), port, new SenderFinder(address.getPath()));
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/TrackerQueue.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/TrackerQueue.java?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/TrackerQueue.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/TrackerQueue.java Wed Dec 12 13:32:32 2012
@@ -26,13 +26,13 @@ import org.apache.qpid.proton.engine.Del
import org.apache.qpid.proton.messenger.Messenger;
import org.apache.qpid.proton.messenger.Status;
import org.apache.qpid.proton.messenger.Tracker;
-import org.apache.qpid.proton.type.messaging.Accepted;
-import org.apache.qpid.proton.type.messaging.Rejected;
-import org.apache.qpid.proton.type.transport.DeliveryState;
+import org.apache.qpid.proton.amqp.messaging.Accepted;
+import org.apache.qpid.proton.amqp.messaging.Rejected;
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
class TrackerQueue
{
- private static final Accepted ACCEPTED = new Accepted();
+ private static final Accepted ACCEPTED = Accepted.getInstance();
private static final Rejected REJECTED = new Rejected();
private int _window = 0;
private int _hwm = 0;
Modified: qpid/proton/trunk/proton-j/proton/src/main/scripts/proton.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/scripts/proton.py?rev=1420665&r1=1420664&r2=1420665&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/scripts/proton.py (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/scripts/proton.py Wed Dec 12 13:32:32 2012
@@ -24,8 +24,8 @@ from org.apache.qpid.proton.message impo
MessageFormat
from org.apache.qpid.proton.messenger import AcceptMode, MessengerException, Status
from org.apache.qpid.proton.messenger.impl import MessengerImpl
-from org.apache.qpid.proton.type.messaging import Source, Target, Accepted, AmqpValue
-from org.apache.qpid.proton.type import UnsignedInteger
+from org.apache.qpid.proton.amqp.messaging import Source, Target, Accepted, AmqpValue
+from org.apache.qpid.proton.amqp import UnsignedInteger
from jarray import zeros
from java.util import EnumSet, UUID as JUUID
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org