You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/01/09 15:25:02 UTC

[26/34] qpid-proton git commit: PROTON-1385: remove proton-j from the existing repo, it now has its own repo at: https://git-wip-us.apache.org/repos/asf/qpid-proton-j.git

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java
deleted file mode 100644
index 844dfa4..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/Terminus.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *
- * 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.amqp.messaging;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.qpid.proton.amqp.Symbol;
-import org.apache.qpid.proton.amqp.UnsignedInteger;
-
-public abstract class Terminus
-{
-    private String _address;
-    private TerminusDurability _durable = TerminusDurability.NONE;
-    private TerminusExpiryPolicy _expiryPolicy = TerminusExpiryPolicy.SESSION_END;
-    private UnsignedInteger _timeout = UnsignedInteger.valueOf(0);
-    private boolean _dynamic;
-    private Map _dynamicNodeProperties;
-    private Symbol[] _capabilities;
-
-    Terminus()
-    {
-    }
-
-    protected Terminus(Terminus other) {
-        _address = other._address;
-        _durable = other._durable;
-        _expiryPolicy = other._expiryPolicy;
-        _timeout = other._timeout;
-        _dynamic = other._dynamic;
-        if (other._dynamicNodeProperties != null) {
-            // TODO: Do we need to copy or can we make a simple reference?
-            _dynamicNodeProperties = new HashMap(other._dynamicNodeProperties);
-        }
-        if (other._capabilities != null) {
-            _capabilities = other._capabilities.clone();
-        }
-    }
-
-    public final String getAddress()
-    {
-        return _address;
-    }
-
-    public final void setAddress(String address)
-    {
-        _address = address;
-    }
-
-    public final TerminusDurability getDurable()
-    {
-        return _durable;
-    }
-
-    public final void setDurable(TerminusDurability durable)
-    {
-        _durable = durable == null ? TerminusDurability.NONE : durable;
-    }
-
-    public final TerminusExpiryPolicy getExpiryPolicy()
-    {
-        return _expiryPolicy;
-    }
-
-    public final void setExpiryPolicy(TerminusExpiryPolicy expiryPolicy)
-    {
-        _expiryPolicy = expiryPolicy == null ? TerminusExpiryPolicy.SESSION_END : expiryPolicy;
-    }
-
-    public final UnsignedInteger getTimeout()
-    {
-        return _timeout;
-    }
-
-    public final void setTimeout(UnsignedInteger timeout)
-    {
-        _timeout = timeout;
-    }
-
-    public final boolean getDynamic()
-    {
-        return _dynamic;
-    }
-
-    public final void setDynamic(boolean dynamic)
-    {
-        _dynamic = dynamic;
-    }
-
-    public final Map getDynamicNodeProperties()
-    {
-        return _dynamicNodeProperties;
-    }
-
-    public final void setDynamicNodeProperties(Map dynamicNodeProperties)
-    {
-        _dynamicNodeProperties = dynamicNodeProperties;
-    }
-
-
-    public final Symbol[] getCapabilities()
-    {
-        return _capabilities;
-    }
-
-    public final void setCapabilities(Symbol... capabilities)
-    {
-        _capabilities = capabilities;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusDurability.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusDurability.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusDurability.java
deleted file mode 100644
index 2c056d8..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusDurability.java
+++ /dev/null
@@ -1,52 +0,0 @@
-
-/*
-*
-* 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.amqp.messaging;
-
-import org.apache.qpid.proton.amqp.UnsignedInteger;
-
-public enum TerminusDurability
-{
-    NONE, CONFIGURATION, UNSETTLED_STATE;
-
-    public UnsignedInteger getValue()
-    {
-        return UnsignedInteger.valueOf(ordinal());
-    }
-
-    public static TerminusDurability get(UnsignedInteger value)
-    {
-
-        switch (value.intValue())
-        {
-            case 0:
-                return NONE;
-            case 1:
-                return CONFIGURATION;
-            case 2:
-                return UNSETTLED_STATE;
-        }
-        throw new IllegalArgumentException("Unknown TerminusDurablity: " + value);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusExpiryPolicy.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusExpiryPolicy.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusExpiryPolicy.java
deleted file mode 100644
index 406c19a..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/messaging/TerminusExpiryPolicy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-/*
-*
-* 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.amqp.messaging;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.qpid.proton.amqp.Symbol;
-
-public enum TerminusExpiryPolicy
-{
-    LINK_DETACH("link-detach"),
-    SESSION_END("session-end"),
-    CONNECTION_CLOSE("connection-close"),
-    NEVER("never");
-
-    private Symbol _policy;
-    private static final Map<Symbol, TerminusExpiryPolicy> _map = new HashMap<Symbol, TerminusExpiryPolicy>();
-
-    TerminusExpiryPolicy(String policy)
-    {
-        _policy = Symbol.valueOf(policy);
-    }
-
-    public Symbol getPolicy()
-    {
-        return _policy;
-    }
-
-    static
-    {
-        _map.put(LINK_DETACH.getPolicy(), LINK_DETACH);
-        _map.put(SESSION_END.getPolicy(), SESSION_END);
-        _map.put(CONNECTION_CLOSE.getPolicy(), CONNECTION_CLOSE);
-        _map.put(NEVER.getPolicy(), NEVER);
-    }
-
-    public static TerminusExpiryPolicy valueOf(Symbol policy)
-    {
-        TerminusExpiryPolicy expiryPolicy = _map.get(policy);
-        if(expiryPolicy == null)
-        {
-            throw new IllegalArgumentException("Unknown TerminusExpiryPolicy: " + policy);
-        }
-        return expiryPolicy;
-    }
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslChallenge.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslChallenge.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslChallenge.java
deleted file mode 100644
index 83246b4..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslChallenge.java
+++ /dev/null
@@ -1,80 +0,0 @@
-
-/*
-*
-* 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.amqp.security;
-
-
-import org.apache.qpid.proton.amqp.Binary;
-
-
-public final class SaslChallenge implements SaslFrameBody
-{
-    private Binary _challenge;
-
-    public Binary getChallenge()
-    {
-        return _challenge;
-    }
-
-    public void setChallenge(Binary challenge)
-    {
-        if( challenge == null )
-        {
-            throw new NullPointerException("the challenge field is mandatory");
-        }
-
-        _challenge = challenge;
-    }
-
-    public Object get(final int index)
-    {
-
-        switch(index)
-        {
-            case 0:
-                return _challenge;
-        }
-
-        throw new IllegalStateException("Unknown index " + index);
-
-    }
-
-    public int size()
-    {
-        return 1;
-
-    }
-
-    public <E> void invoke(SaslFrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        handler.handleChallenge(this, payload, context);
-    }
-
-    @Override
-    public String toString()
-    {
-        return "SaslChallenge{" +
-               "challenge=" + _challenge +
-               '}';
-    }
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslCode.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslCode.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslCode.java
deleted file mode 100644
index ad35da8..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslCode.java
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/*
-*
-* 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.amqp.security;
-
-import org.apache.qpid.proton.amqp.UnsignedByte;
-
-public enum SaslCode
-{
-    OK, AUTH, SYS, SYS_PERM, SYS_TEMP;
-
-    public UnsignedByte getValue()
-    {
-        return UnsignedByte.valueOf((byte)ordinal());
-    }
-
-    public static SaslCode valueOf(UnsignedByte v)
-    {
-        return SaslCode.values()[v.byteValue()];
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslFrameBody.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslFrameBody.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslFrameBody.java
deleted file mode 100644
index 3db2652..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslFrameBody.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *
- * 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.amqp.security;
-
-import org.apache.qpid.proton.amqp.Binary;
-
-public interface SaslFrameBody
-{
-    interface SaslFrameBodyHandler<E>
-    {
-        void handleMechanisms(SaslMechanisms saslMechanisms, Binary payload, E context);
-        void handleInit(SaslInit saslInit, Binary payload, E context);
-        void handleChallenge(SaslChallenge saslChallenge, Binary payload, E context);
-        void handleResponse(SaslResponse saslResponse, Binary payload, E context);
-        void handleOutcome(SaslOutcome saslOutcome, Binary payload, E context);
-    }
-
-    <E> void invoke(SaslFrameBodyHandler<E> handler, Binary payload, E context);
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslInit.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslInit.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslInit.java
deleted file mode 100644
index 1764d35..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslInit.java
+++ /dev/null
@@ -1,87 +0,0 @@
-
-/*
-*
-* 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.amqp.security;
-
-import org.apache.qpid.proton.amqp.Binary;
-import org.apache.qpid.proton.amqp.Symbol;
-
-public final class SaslInit
-      implements SaslFrameBody
-{
-
-    private Symbol _mechanism;
-    private Binary _initialResponse;
-    private String _hostname;
-
-    public Symbol getMechanism()
-    {
-        return _mechanism;
-    }
-
-    public void setMechanism(Symbol mechanism)
-    {
-        if( mechanism == null )
-        {
-            throw new NullPointerException("the mechanism field is mandatory");
-        }
-
-        _mechanism = mechanism;
-    }
-
-    public Binary getInitialResponse()
-    {
-        return _initialResponse;
-    }
-
-    public void setInitialResponse(Binary initialResponse)
-    {
-        _initialResponse = initialResponse;
-    }
-
-    public String getHostname()
-    {
-        return _hostname;
-    }
-
-    public void setHostname(String hostname)
-    {
-        _hostname = hostname;
-    }
-
-
-    public <E> void invoke(SaslFrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        handler.handleInit(this, payload, context);
-    }
-
-    @Override
-    public String toString()
-    {
-        return "SaslInit{" +
-               "mechanism=" + _mechanism +
-               ", initialResponse=" + _initialResponse +
-               ", hostname='" + _hostname + '\'' +
-               '}';
-    }
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslMechanisms.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslMechanisms.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslMechanisms.java
deleted file mode 100644
index 7d51afd..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslMechanisms.java
+++ /dev/null
@@ -1,67 +0,0 @@
-
-/*
-*
-* 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.amqp.security;
-
-import java.util.Arrays;
-import org.apache.qpid.proton.amqp.Binary;
-import org.apache.qpid.proton.amqp.Symbol;
-
-public final class SaslMechanisms
-      implements SaslFrameBody
-{
-
-    private Symbol[] _saslServerMechanisms;
-
-    public Symbol[] getSaslServerMechanisms()
-    {
-        return _saslServerMechanisms;
-    }
-
-    public void setSaslServerMechanisms(Symbol... saslServerMechanisms)
-    {
-        if( saslServerMechanisms == null )
-        {
-            throw new NullPointerException("the sasl-server-mechanisms field is mandatory");
-        }
-
-        _saslServerMechanisms = saslServerMechanisms;
-    }
-
-
-    public <E> void invoke(SaslFrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        handler.handleMechanisms(this, payload, context);
-    }
-
-
-
-    @Override
-    public String toString()
-    {
-        return "SaslMechanisms{" +
-               "saslServerMechanisms=" + (_saslServerMechanisms == null ? null : Arrays.asList(_saslServerMechanisms))
-               +
-               '}';
-    }
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslOutcome.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslOutcome.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslOutcome.java
deleted file mode 100644
index 9071145..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslOutcome.java
+++ /dev/null
@@ -1,80 +0,0 @@
-
-/*
-*
-* 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.amqp.security;
-
-
-
-import org.apache.qpid.proton.amqp.Binary;
-
-
-public final class SaslOutcome
-      implements SaslFrameBody
-{
-
-    private SaslCode _code;
-    private Binary _additionalData;
-
-    public SaslCode getCode()
-    {
-        return _code;
-    }
-
-    public void setCode(SaslCode code)
-    {
-        if( code == null )
-        {
-            throw new NullPointerException("the code field is mandatory");
-        }
-
-        _code = code;
-    }
-
-    public Binary getAdditionalData()
-    {
-        return _additionalData;
-    }
-
-    public void setAdditionalData(Binary additionalData)
-    {
-        _additionalData = additionalData;
-    }
-
-
-    @Override
-    public String toString()
-    {
-        return "SaslOutcome{" +
-               "_code=" + _code +
-               ", _additionalData=" + _additionalData +
-               '}';
-    }
-
-    public <E> void invoke(SaslFrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        handler.handleOutcome(this, payload, context);
-    }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslResponse.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslResponse.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslResponse.java
deleted file mode 100644
index e926e06..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/security/SaslResponse.java
+++ /dev/null
@@ -1,63 +0,0 @@
-
-/*
-*
-* 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.amqp.security;
-
-import org.apache.qpid.proton.amqp.Binary;
-
-public final class SaslResponse
-      implements SaslFrameBody
-{
-
-    private Binary _response;
-
-    public Binary getResponse()
-    {
-        return _response;
-    }
-
-    public void setResponse(Binary response)
-    {
-        if( response == null )
-        {
-            throw new NullPointerException("the response field is mandatory");
-        }
-
-        _response = response;
-    }
-
-
-    @Override
-    public String toString()
-    {
-        return "SaslResponse{response=" + _response +
-               '}';
-    }
-
-    public <E> void invoke(SaslFrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        handler.handleResponse(this, payload, context);
-    }
-
-
-    }

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java
deleted file mode 100644
index 7ff000a..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Coordinator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-
-/*
-*
-* 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.amqp.transaction;
-
-import java.util.Arrays;
-import org.apache.qpid.proton.amqp.Symbol;
-import org.apache.qpid.proton.amqp.transport.Target;
-
-
-public final class Coordinator
-      implements Target
-{
-    private Symbol[] _capabilities;
-
-    public Symbol[] getCapabilities()
-    {
-        return _capabilities;
-    }
-
-    public void setCapabilities(Symbol... capabilities)
-    {
-        _capabilities = capabilities;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Coordinator{" +
-               "capabilities=" + (_capabilities == null ? null : Arrays.asList(_capabilities)) +
-               '}';
-    }
-
-    public String getAddress()
-    {
-        return null;
-    }
-
-    @Override
-    public Target copy() {
-        return null;
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Declare.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Declare.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Declare.java
deleted file mode 100644
index 714db5c..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Declare.java
+++ /dev/null
@@ -1,49 +0,0 @@
-
-/*
-*
-* 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.amqp.transaction;
-
-public final class Declare
-{
-
-    private GlobalTxId _globalId;
-
-    public GlobalTxId getGlobalId()
-    {
-        return _globalId;
-    }
-
-    public void setGlobalId(GlobalTxId globalId)
-    {
-        _globalId = globalId;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Declare{" +
-               "globalId=" + _globalId +
-               '}';
-    }
-}
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Declared.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Declared.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Declared.java
deleted file mode 100644
index e049cd5..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Declared.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-/*
-*
-* 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.amqp.transaction;
-
-import org.apache.qpid.proton.amqp.Binary;
-import org.apache.qpid.proton.amqp.Symbol;
-import org.apache.qpid.proton.amqp.messaging.Outcome;
-import org.apache.qpid.proton.amqp.transport.DeliveryState;
-
-
-public final class Declared
-      implements DeliveryState, Outcome
-{
-    public static final Symbol DESCRIPTOR_SYMBOL = Symbol.valueOf("amqp:declared:list");
-
-    private Binary _txnId;
-
-    public Binary getTxnId()
-    {
-        return _txnId;
-    }
-
-    public void setTxnId(Binary txnId)
-    {
-        if( txnId == null )
-        {
-            throw new NullPointerException("the txn-id field is mandatory");
-        }
-
-        _txnId = txnId;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Declared{" +
-               "txnId=" + _txnId +
-               '}';
-    }
-}
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Discharge.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Discharge.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Discharge.java
deleted file mode 100644
index 959d49b..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/Discharge.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-/*
-*
-* 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.amqp.transaction;
-
-import org.apache.qpid.proton.amqp.Binary;
-
-public final class Discharge
-{
-
-    private Binary _txnId;
-    private Boolean _fail;
-
-    public Binary getTxnId()
-    {
-        return _txnId;
-    }
-
-    public void setTxnId(Binary txnId)
-    {
-        if( txnId == null )
-        {
-            throw new NullPointerException("the txn-id field is mandatory");
-        }
-
-        _txnId = txnId;
-    }
-
-    public Boolean getFail()
-    {
-        return _fail;
-    }
-
-    public void setFail(Boolean fail)
-    {
-        _fail = fail;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Discharge{" +
-               "txnId=" + _txnId +
-               ", fail=" + _fail +
-               '}';
-    }
-}
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/GlobalTxId.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/GlobalTxId.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/GlobalTxId.java
deleted file mode 100644
index 3724893..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/GlobalTxId.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *
- * 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.amqp.transaction;
-
-public interface GlobalTxId
-{
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionErrors.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionErrors.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionErrors.java
deleted file mode 100644
index d304e26..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionErrors.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-/*
-*
-* 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.amqp.transaction;
-
-import org.apache.qpid.proton.amqp.Symbol;
-
-public interface TransactionErrors
-{
-    final static Symbol UNKNOWN_ID = Symbol.valueOf("amqp:transaction:unknown-id");
-
-    final static Symbol TRANSACTION_ROLLBACK = Symbol.valueOf("amqp:transaction:rollback");
-
-    final static Symbol TRANSACTION_TIMEOUT = Symbol.valueOf("amqp:transaction:timeout");
-
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionalState.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionalState.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionalState.java
deleted file mode 100644
index 313d846..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/TransactionalState.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-/*
-*
-* 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.amqp.transaction;
-
-import org.apache.qpid.proton.amqp.Binary;
-import org.apache.qpid.proton.amqp.transport.DeliveryState;
-import org.apache.qpid.proton.amqp.messaging.Outcome;
-
-public final class TransactionalState
-      implements DeliveryState
-{
-
-    private Binary _txnId;
-    private Outcome _outcome;
-
-    public Binary getTxnId()
-    {
-        return _txnId;
-    }
-
-    public void setTxnId(Binary txnId)
-    {
-        if( txnId == null )
-        {
-            throw new NullPointerException("the txn-id field is mandatory");
-        }
-
-        _txnId = txnId;
-    }
-
-    public Outcome getOutcome()
-    {
-        return _outcome;
-    }
-
-    public void setOutcome(Outcome outcome)
-    {
-        _outcome = outcome;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "TransactionalState{" +
-               "txnId=" + _txnId +
-               ", outcome=" + _outcome +
-               '}';
-    }
-}
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/TxnCapability.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/TxnCapability.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/TxnCapability.java
deleted file mode 100644
index 544f43e..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transaction/TxnCapability.java
+++ /dev/null
@@ -1,40 +0,0 @@
-
-/*
-*
-* 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.amqp.transaction;
-
-import org.apache.qpid.proton.amqp.Symbol;
-
-public interface TxnCapability
-{
-    final static Symbol LOCAL_TXN = Symbol.valueOf("amqp:local-transactions");
-
-    final static Symbol DISTRIBUTED_TXN = Symbol.valueOf("amqp:distributed-transactions");
-
-    final static Symbol PROMOTABLE_TXN = Symbol.valueOf("amqp:promotable-transactions");
-
-    final static Symbol MULTI_TXNS_PER_SSN = Symbol.valueOf("amqp:multi-txns-per-ssn");
-
-    final static Symbol MULTI_SSNS_PER_TXN = Symbol.valueOf("amqp:multi-ssns-per-txn");
-
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/AmqpError.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/AmqpError.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/AmqpError.java
deleted file mode 100644
index 90be358..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/AmqpError.java
+++ /dev/null
@@ -1,56 +0,0 @@
-
-/*
-*
-* 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.amqp.transport;
-
-import org.apache.qpid.proton.amqp.Symbol;
-
-public interface AmqpError
-{
-    final static Symbol INTERNAL_ERROR = Symbol.valueOf("amqp:internal-error");
-
-    final static Symbol NOT_FOUND = Symbol.valueOf("amqp:not-found");
-
-    final static Symbol UNAUTHORIZED_ACCESS = Symbol.valueOf("amqp:unauthorized-access");
-
-    final static Symbol DECODE_ERROR = Symbol.valueOf("amqp:decode-error");
-
-    final static Symbol RESOURCE_LIMIT_EXCEEDED = Symbol.valueOf("amqp:resource-limit-exceeded");
-
-    final static Symbol NOT_ALLOWED = Symbol.valueOf("amqp:not-allowed");
-
-    final static Symbol INVALID_FIELD = Symbol.valueOf("amqp:invalid-field");
-
-    final static Symbol NOT_IMPLEMENTED = Symbol.valueOf("amqp:not-implemented");
-
-    final static Symbol RESOURCE_LOCKED = Symbol.valueOf("amqp:resource-locked");
-
-    final static Symbol PRECONDITION_FAILED = Symbol.valueOf("amqp:precondition-failed");
-
-    final static Symbol RESOURCE_DELETED = Symbol.valueOf("amqp:resource-deleted");
-
-    final static Symbol ILLEGAL_STATE = Symbol.valueOf("amqp:illegal-state");
-
-    final static Symbol FRAME_SIZE_TOO_SMALL = Symbol.valueOf("amqp:frame-size-too-small");
-
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Attach.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Attach.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Attach.java
deleted file mode 100644
index 1d1746f..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Attach.java
+++ /dev/null
@@ -1,232 +0,0 @@
-
-/*
-*
-* 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.amqp.transport;
-
-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.UnsignedLong;
-
-import java.util.Arrays;
-import java.util.Map;
-
-public final class Attach implements FrameBody
-{
-
-    private String _name;
-    private UnsignedInteger _handle;
-    private Role _role = Role.SENDER;
-    private SenderSettleMode _sndSettleMode = SenderSettleMode.MIXED;
-    private ReceiverSettleMode _rcvSettleMode = ReceiverSettleMode.FIRST;
-    private Source _source;
-    private Target _target;
-    private Map _unsettled;
-    private boolean _incompleteUnsettled;
-    private UnsignedInteger _initialDeliveryCount;
-    private UnsignedLong _maxMessageSize;
-    private Symbol[] _offeredCapabilities;
-    private Symbol[] _desiredCapabilities;
-    private Map _properties;
-
-    public String getName()
-    {
-        return _name;
-    }
-
-    public void setName(String name)
-    {
-        if( name == null )
-        {
-            throw new NullPointerException("the name field is mandatory");
-        }
-
-        _name = name;
-    }
-
-    public UnsignedInteger getHandle()
-    {
-        return _handle;
-    }
-
-    public void setHandle(UnsignedInteger handle)
-    {
-        if( handle == null )
-        {
-            throw new NullPointerException("the handle field is mandatory");
-        }
-
-        _handle = handle;
-    }
-
-    public Role getRole()
-    {
-        return _role;
-    }
-
-    public void setRole(Role role)
-    {
-        if(role == null)
-        {
-            throw new NullPointerException("Role cannot be null");
-        }
-        _role = role;
-    }
-
-    public SenderSettleMode getSndSettleMode()
-    {
-        return _sndSettleMode;
-    }
-
-    public void setSndSettleMode(SenderSettleMode sndSettleMode)
-    {
-        _sndSettleMode = sndSettleMode == null ? SenderSettleMode.MIXED : sndSettleMode;
-    }
-
-    public ReceiverSettleMode getRcvSettleMode()
-    {
-        return _rcvSettleMode;
-    }
-
-    public void setRcvSettleMode(ReceiverSettleMode rcvSettleMode)
-    {
-        _rcvSettleMode = rcvSettleMode == null ? ReceiverSettleMode.FIRST : rcvSettleMode;
-    }
-
-    public Source getSource()
-    {
-        return _source;
-    }
-
-    public void setSource(Source source)
-    {
-        _source = source;
-    }
-
-    public Target getTarget()
-    {
-        return _target;
-    }
-
-    public void setTarget(Target target)
-    {
-        _target = target;
-    }
-
-    public Map getUnsettled()
-    {
-        return _unsettled;
-    }
-
-    public void setUnsettled(Map unsettled)
-    {
-        _unsettled = unsettled;
-    }
-
-    public boolean getIncompleteUnsettled()
-    {
-        return _incompleteUnsettled;
-    }
-
-    public void setIncompleteUnsettled(boolean incompleteUnsettled)
-    {
-        _incompleteUnsettled = incompleteUnsettled;
-    }
-
-    public UnsignedInteger getInitialDeliveryCount()
-    {
-        return _initialDeliveryCount;
-    }
-
-    public void setInitialDeliveryCount(UnsignedInteger initialDeliveryCount)
-    {
-        _initialDeliveryCount = initialDeliveryCount;
-    }
-
-    public UnsignedLong getMaxMessageSize()
-    {
-        return _maxMessageSize;
-    }
-
-    public void setMaxMessageSize(UnsignedLong maxMessageSize)
-    {
-        _maxMessageSize = maxMessageSize;
-    }
-
-    public Symbol[] getOfferedCapabilities()
-    {
-        return _offeredCapabilities;
-    }
-
-    public void setOfferedCapabilities(Symbol... offeredCapabilities)
-    {
-        _offeredCapabilities = offeredCapabilities;
-    }
-
-    public Symbol[] getDesiredCapabilities()
-    {
-        return _desiredCapabilities;
-    }
-
-    public void setDesiredCapabilities(Symbol... desiredCapabilities)
-    {
-        _desiredCapabilities = desiredCapabilities;
-    }
-
-    public Map getProperties()
-    {
-        return _properties;
-    }
-
-    public void setProperties(Map properties)
-    {
-        _properties = properties;
-    }
-
-    public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        handler.handleAttach(this, payload, context);
-    }
-
-
-    @Override
-    public String toString()
-    {
-        return "Attach{" +
-               "name='" + _name + '\'' +
-               ", handle=" + _handle +
-               ", role=" + _role +
-               ", sndSettleMode=" + _sndSettleMode +
-               ", rcvSettleMode=" + _rcvSettleMode +
-               ", source=" + _source +
-               ", target=" + _target +
-               ", unsettled=" + _unsettled +
-               ", incompleteUnsettled=" + _incompleteUnsettled +
-               ", initialDeliveryCount=" + _initialDeliveryCount +
-               ", maxMessageSize=" + _maxMessageSize +
-               ", offeredCapabilities=" + (_offeredCapabilities == null ? null : Arrays.asList(_offeredCapabilities)) +
-               ", desiredCapabilities=" + (_desiredCapabilities == null ? null : Arrays.asList(_desiredCapabilities)) +
-               ", properties=" + _properties +
-               '}';
-    }
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Begin.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Begin.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Begin.java
deleted file mode 100644
index ead4050..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Begin.java
+++ /dev/null
@@ -1,163 +0,0 @@
-
-/*
-*
-* 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.amqp.transport;
-
-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 java.util.Arrays;
-import java.util.Map;
-
-
-public final class Begin implements FrameBody
-{
-
-    private UnsignedShort _remoteChannel;
-    private UnsignedInteger _nextOutgoingId;
-    private UnsignedInteger _incomingWindow;
-    private UnsignedInteger _outgoingWindow;
-    private UnsignedInteger _handleMax = UnsignedInteger.valueOf(0xffffffff);
-    private Symbol[] _offeredCapabilities;
-    private Symbol[] _desiredCapabilities;
-    private Map _properties;
-
-    public UnsignedShort getRemoteChannel()
-    {
-        return _remoteChannel;
-    }
-
-    public void setRemoteChannel(UnsignedShort remoteChannel)
-    {
-        _remoteChannel = remoteChannel;
-    }
-
-    public UnsignedInteger getNextOutgoingId()
-    {
-        return _nextOutgoingId;
-    }
-
-    public void setNextOutgoingId(UnsignedInteger nextOutgoingId)
-    {
-        if( nextOutgoingId == null )
-        {
-            throw new NullPointerException("the next-outgoing-id field is mandatory");
-        }
-
-        _nextOutgoingId = nextOutgoingId;
-    }
-
-    public UnsignedInteger getIncomingWindow()
-    {
-        return _incomingWindow;
-    }
-
-    public void setIncomingWindow(UnsignedInteger incomingWindow)
-    {
-        if( incomingWindow == null )
-        {
-            throw new NullPointerException("the incoming-window field is mandatory");
-        }
-
-        _incomingWindow = incomingWindow;
-    }
-
-    public UnsignedInteger getOutgoingWindow()
-    {
-        return _outgoingWindow;
-    }
-
-    public void setOutgoingWindow(UnsignedInteger outgoingWindow)
-    {
-        if( outgoingWindow == null )
-        {
-            throw new NullPointerException("the outgoing-window field is mandatory");
-        }
-
-        _outgoingWindow = outgoingWindow;
-    }
-
-    public UnsignedInteger getHandleMax()
-    {
-        return _handleMax;
-    }
-
-    public void setHandleMax(UnsignedInteger handleMax)
-    {
-        _handleMax = handleMax;
-    }
-
-    public Symbol[] getOfferedCapabilities()
-    {
-        return _offeredCapabilities;
-    }
-
-    public void setOfferedCapabilities(Symbol... offeredCapabilities)
-    {
-        _offeredCapabilities = offeredCapabilities;
-    }
-
-    public Symbol[] getDesiredCapabilities()
-    {
-        return _desiredCapabilities;
-    }
-
-    public void setDesiredCapabilities(Symbol... desiredCapabilities)
-    {
-        _desiredCapabilities = desiredCapabilities;
-    }
-
-    public Map getProperties()
-    {
-        return _properties;
-    }
-
-    public void setProperties(Map properties)
-    {
-        _properties = properties;
-    }
-
-    public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        handler.handleBegin(this, payload, context);
-    }
-
-
-    @Override
-    public String toString()
-    {
-        return "Begin{" +
-               "remoteChannel=" + _remoteChannel +
-               ", nextOutgoingId=" + _nextOutgoingId +
-               ", incomingWindow=" + _incomingWindow +
-               ", outgoingWindow=" + _outgoingWindow +
-               ", handleMax=" + _handleMax +
-               ", offeredCapabilities=" + (_offeredCapabilities == null ? null : Arrays.asList(_offeredCapabilities)) +
-               ", desiredCapabilities=" + (_desiredCapabilities == null ? null : Arrays.asList(_desiredCapabilities)) +
-               ", properties=" + _properties +
-               '}';
-    }
-}
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Close.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Close.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Close.java
deleted file mode 100644
index ca141f8..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Close.java
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/*
-*
-* 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.amqp.transport;
-
-import org.apache.qpid.proton.amqp.Binary;
-
-public final class Close implements FrameBody
-{
-    private ErrorCondition _error;
-
-    public ErrorCondition getError()
-    {
-        return _error;
-    }
-
-    public void setError(ErrorCondition error)
-    {
-        _error = error;
-    }
-
-    public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        handler.handleClose(this, payload, context);
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Close{" +
-               "error=" + _error +
-               '}';
-    }
-}
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/ConnectionError.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/ConnectionError.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/ConnectionError.java
deleted file mode 100644
index d31ebf7..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/ConnectionError.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-/*
-*
-* 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.amqp.transport;
-
-import org.apache.qpid.proton.amqp.Symbol;
-
-public interface ConnectionError
-{
-    final static Symbol CONNECTION_FORCED = Symbol.valueOf("amqp:connection:forced");
-
-    final static Symbol FRAMING_ERROR = Symbol.valueOf("amqp:connection:framing-error");
-
-    final static Symbol REDIRECT = Symbol.valueOf("amqp:connection:redirect");
-
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/DeliveryState.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/DeliveryState.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/DeliveryState.java
deleted file mode 100644
index 4fa9806..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/DeliveryState.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *
- * 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.amqp.transport;
-
-/**
- * Describes the state of a delivery at a link end-point.
- *
- * Note that the the sender is the owner of the state.
- * The receiver merely influences the state.
- * TODO clarify the concept of ownership? how is link recovery involved?
- */
-public interface DeliveryState
-{
-
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Detach.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Detach.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Detach.java
deleted file mode 100644
index b0f2936..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Detach.java
+++ /dev/null
@@ -1,86 +0,0 @@
-
-/*
-*
-* 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.amqp.transport;
-
-import org.apache.qpid.proton.amqp.Binary;
-import org.apache.qpid.proton.amqp.UnsignedInteger;
-
-public final class Detach implements FrameBody
-{
-
-    private UnsignedInteger _handle;
-    private boolean _closed;
-    private ErrorCondition _error;
-
-    public UnsignedInteger getHandle()
-    {
-        return _handle;
-    }
-
-    public void setHandle(UnsignedInteger handle)
-    {
-        if( handle == null )
-        {
-            throw new NullPointerException("the handle field is mandatory");
-        }
-
-        _handle = handle;
-    }
-
-    public boolean getClosed()
-    {
-        return _closed;
-    }
-
-    public void setClosed(boolean closed)
-    {
-        _closed = closed;
-    }
-
-    public ErrorCondition getError()
-    {
-        return _error;
-    }
-
-    public void setError(ErrorCondition error)
-    {
-        _error = error;
-    }
-    
-    public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        handler.handleDetach(this, payload, context);
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Detach{" +
-               "handle=" + _handle +
-               ", closed=" + _closed +
-               ", error=" + _error +
-               '}';
-    }
-}
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Disposition.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Disposition.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Disposition.java
deleted file mode 100644
index a850940..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Disposition.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-/*
-*
-* 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.amqp.transport;
-
-import org.apache.qpid.proton.amqp.Binary;
-import org.apache.qpid.proton.amqp.UnsignedInteger;
-
-public final class Disposition implements FrameBody
-{
-    private Role _role = Role.SENDER;
-    private UnsignedInteger _first;
-    private UnsignedInteger _last;
-    private boolean _settled;
-    private DeliveryState _state;
-    private boolean _batchable;
-
-    public Role getRole()
-    {
-        return _role;
-    }
-
-    public void setRole(Role role)
-    {
-        if(role == null)
-        {
-            throw new NullPointerException("Role cannot be null");
-        }
-        _role = role;
-    }
-
-    public UnsignedInteger getFirst()
-    {
-        return _first;
-    }
-
-    public void setFirst(UnsignedInteger first)
-    {
-        if( first == null )
-        {
-            throw new NullPointerException("the first field is mandatory");
-        }
-
-        _first = first;
-    }
-
-    public UnsignedInteger getLast()
-    {
-        return _last;
-    }
-
-    public void setLast(UnsignedInteger last)
-    {
-        _last = last;
-    }
-
-    public boolean getSettled()
-    {
-        return _settled;
-    }
-
-    public void setSettled(boolean settled)
-    {
-        _settled = settled;
-    }
-
-    public DeliveryState getState()
-    {
-        return _state;
-    }
-
-    public void setState(DeliveryState state)
-    {
-        _state = state;
-    }
-
-    public boolean getBatchable()
-    {
-        return _batchable;
-    }
-
-    public void setBatchable(boolean batchable)
-    {
-        _batchable = batchable;
-    }
-
-    public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        handler.handleDisposition(this, payload, context);
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Disposition{" +
-               "role=" + _role +
-               ", first=" + _first +
-               ", last=" + _last +
-               ", settled=" + _settled +
-               ", state=" + _state +
-               ", batchable=" + _batchable +
-               '}';
-    }
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/EmptyFrame.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/EmptyFrame.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/EmptyFrame.java
deleted file mode 100644
index b085e84..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/EmptyFrame.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-*
-* 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.amqp.transport;
-
-import org.apache.qpid.proton.amqp.Binary;
-
-public final class EmptyFrame implements FrameBody
-{
-    @Override
-    public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        // NO-OP
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Empty Frame";
-    }
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/End.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/End.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/End.java
deleted file mode 100644
index e53a456..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/End.java
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/*
-*
-* 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.amqp.transport;
-
-import org.apache.qpid.proton.amqp.Binary;
-
-public final class End implements FrameBody
-{
-    private ErrorCondition _error;
-
-    public ErrorCondition getError()
-    {
-        return _error;
-    }
-
-    public void setError(ErrorCondition error)
-    {
-        _error = error;
-    }
-
-    public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        handler.handleEnd(this, payload, context);
-    }
-
-    @Override
-    public String toString()
-    {
-        return "End{" +
-               "error=" + _error +
-               '}';
-    }
-}
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/ErrorCondition.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/ErrorCondition.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/ErrorCondition.java
deleted file mode 100644
index abebc21..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/ErrorCondition.java
+++ /dev/null
@@ -1,145 +0,0 @@
-
-/*
-*
-* 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.amqp.transport;
-
-import java.util.Map;
-
-import org.apache.qpid.proton.amqp.Symbol;
-
-
-public final class ErrorCondition
-{
-    private Symbol _condition;
-    private String _description;
-    private Map _info;
-
-    public ErrorCondition()
-    {
-    }
-
-    public ErrorCondition(Symbol condition, String description)
-    {
-        _condition = condition;
-        _description = description;
-    }
-
-    public Symbol getCondition()
-    {
-        return _condition;
-    }
-
-    public void setCondition(Symbol condition)
-    {
-        if( condition == null )
-        {
-            throw new NullPointerException("the condition field is mandatory");
-        }
-
-        _condition = condition;
-    }
-
-    public String getDescription()
-    {
-        return _description;
-    }
-
-    public void setDescription(String description)
-    {
-        _description = description;
-    }
-
-    public Map getInfo()
-    {
-        return _info;
-    }
-
-    public void setInfo(Map info)
-    {
-        _info = info;
-    }
-
-    public void clear()
-    {
-        _condition = null;
-        _description = null;
-        _info = null;
-    }
-
-    public void copyFrom(ErrorCondition condition)
-    {
-        _condition = condition._condition;
-        _description = condition._description;
-        _info = condition._info;
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o)
-        {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass())
-        {
-            return false;
-        }
-
-        ErrorCondition that = (ErrorCondition) o;
-
-        if (_condition != null ? !_condition.equals(that._condition) : that._condition != null)
-        {
-            return false;
-        }
-        if (_description != null ? !_description.equals(that._description) : that._description != null)
-        {
-            return false;
-        }
-        if (_info != null ? !_info.equals(that._info) : that._info != null)
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int result = _condition != null ? _condition.hashCode() : 0;
-        result = 31 * result + (_description != null ? _description.hashCode() : 0);
-        result = 31 * result + (_info != null ? _info.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Error{" +
-               "condition=" + _condition +
-               ", description='" + _description + '\'' +
-               ", info=" + _info +
-               '}';
-    }
-}
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Flow.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Flow.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Flow.java
deleted file mode 100644
index b421a00..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/Flow.java
+++ /dev/null
@@ -1,193 +0,0 @@
-
-/*
-*
-* 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.amqp.transport;
-
-import java.util.Map;
-
-import org.apache.qpid.proton.amqp.Binary;
-import org.apache.qpid.proton.amqp.UnsignedInteger;
-
-public final class Flow implements FrameBody
-{
-    private UnsignedInteger _nextIncomingId;
-    private UnsignedInteger _incomingWindow;
-    private UnsignedInteger _nextOutgoingId;
-    private UnsignedInteger _outgoingWindow;
-    private UnsignedInteger _handle;
-    private UnsignedInteger _deliveryCount;
-    private UnsignedInteger _linkCredit;
-    private UnsignedInteger _available;
-    private boolean _drain;
-    private boolean _echo;
-    private Map _properties;
-
-    public UnsignedInteger getNextIncomingId()
-    {
-        return _nextIncomingId;
-    }
-
-    public void setNextIncomingId(UnsignedInteger nextIncomingId)
-    {
-        _nextIncomingId = nextIncomingId;
-    }
-
-    public UnsignedInteger getIncomingWindow()
-    {
-        return _incomingWindow;
-    }
-
-    public void setIncomingWindow(UnsignedInteger incomingWindow)
-    {
-        if( incomingWindow == null )
-        {
-            throw new NullPointerException("the incoming-window field is mandatory");
-        }
-
-        _incomingWindow = incomingWindow;
-    }
-
-    public UnsignedInteger getNextOutgoingId()
-    {
-        return _nextOutgoingId;
-    }
-
-    public void setNextOutgoingId(UnsignedInteger nextOutgoingId)
-    {
-        if( nextOutgoingId == null )
-        {
-            throw new NullPointerException("the next-outgoing-id field is mandatory");
-        }
-
-        _nextOutgoingId = nextOutgoingId;
-    }
-
-    public UnsignedInteger getOutgoingWindow()
-    {
-        return _outgoingWindow;
-    }
-
-    public void setOutgoingWindow(UnsignedInteger outgoingWindow)
-    {
-        if( outgoingWindow == null )
-        {
-            throw new NullPointerException("the outgoing-window field is mandatory");
-        }
-
-        _outgoingWindow = outgoingWindow;
-    }
-
-    public UnsignedInteger getHandle()
-    {
-        return _handle;
-    }
-
-    public void setHandle(UnsignedInteger handle)
-    {
-        _handle = handle;
-    }
-
-    public UnsignedInteger getDeliveryCount()
-    {
-        return _deliveryCount;
-    }
-
-    public void setDeliveryCount(UnsignedInteger deliveryCount)
-    {
-        _deliveryCount = deliveryCount;
-    }
-
-    public UnsignedInteger getLinkCredit()
-    {
-        return _linkCredit;
-    }
-
-    public void setLinkCredit(UnsignedInteger linkCredit)
-    {
-        _linkCredit = linkCredit;
-    }
-
-    public UnsignedInteger getAvailable()
-    {
-        return _available;
-    }
-
-    public void setAvailable(UnsignedInteger available)
-    {
-        _available = available;
-    }
-
-    public boolean getDrain()
-    {
-        return _drain;
-    }
-
-    public void setDrain(boolean drain)
-    {
-        _drain = drain;
-    }
-
-    public boolean getEcho()
-    {
-        return _echo;
-    }
-
-    public void setEcho(boolean echo)
-    {
-        _echo = echo;
-    }
-
-    public Map getProperties()
-    {
-        return _properties;
-    }
-
-    public void setProperties(Map properties)
-    {
-        _properties = properties;
-    }
-
-    public <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context)
-    {
-        handler.handleFlow(this, payload, context);
-    }
-
-    @Override
-    public String toString()
-    {
-        return "Flow{" +
-               "nextIncomingId=" + _nextIncomingId +
-               ", incomingWindow=" + _incomingWindow +
-               ", nextOutgoingId=" + _nextOutgoingId +
-               ", outgoingWindow=" + _outgoingWindow +
-               ", handle=" + _handle +
-               ", deliveryCount=" + _deliveryCount +
-               ", linkCredit=" + _linkCredit +
-               ", available=" + _available +
-               ", drain=" + _drain +
-               ", echo=" + _echo +
-               ", properties=" + _properties +
-               '}';
-    }
-}
-  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/FrameBody.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/FrameBody.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/FrameBody.java
deleted file mode 100644
index 90a2431..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/FrameBody.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.qpid.proton.amqp.transport;
-/*
- *
- * 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.
- *
-*/
-
-
-import org.apache.qpid.proton.amqp.Binary;
-
-public interface FrameBody
-{
-    interface FrameBodyHandler<E>
-    {
-        void handleOpen(Open open, Binary payload, E context);
-        void handleBegin(Begin begin, Binary payload, E context);
-        void handleAttach(Attach attach, Binary payload, E context);
-        void handleFlow(Flow flow, Binary payload, E context);
-        void handleTransfer(Transfer transfer, Binary payload, E context);
-        void handleDisposition(Disposition disposition, Binary payload, E context);
-        void handleDetach(Detach detach, Binary payload, E context);
-        void handleEnd(End end, Binary payload, E context);
-        void handleClose(Close close, Binary payload, E context);
-
-    }
-
-    <E> void invoke(FrameBodyHandler<E> handler, Binary payload, E context);
-}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ccdcf329/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/LinkError.java
----------------------------------------------------------------------
diff --git a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/LinkError.java b/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/LinkError.java
deleted file mode 100644
index 55294f0..0000000
--- a/proton-j/src/main/java/org/apache/qpid/proton/amqp/transport/LinkError.java
+++ /dev/null
@@ -1,40 +0,0 @@
-
-/*
-*
-* 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.amqp.transport;
-
-import org.apache.qpid.proton.amqp.Symbol;
-
-public interface LinkError
-{
-    final static Symbol DETACH_FORCED = Symbol.valueOf("amqp:link:detach-forced");
-
-    final static Symbol TRANSFER_LIMIT_EXCEEDED = Symbol.valueOf("amqp:link:transfer-limit-exceeded");
-
-    final static Symbol MESSAGE_SIZE_EXCEEDED = Symbol.valueOf("amqp:link:message-size-exceeded");
-
-    final static Symbol REDIRECT = Symbol.valueOf("amqp:link:redirect");
-
-    final static Symbol STOLEN = Symbol.valueOf("amqp:link:stolen");
-
-}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org