QPID-5297: simplify the 1.0 plugin to only have a single ProtocolEngineCreator

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1539202 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 0 insertions, 508 deletions

diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0.java
deleted file mode 100644
index c06af603de..0000000000
--- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0.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.server.protocol.v1_0;
-
-import org.apache.qpid.protocol.ServerProtocolEngine;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
-import org.apache.qpid.server.plugin.ProtocolEngineCreator;
-import org.apache.qpid.transport.network.NetworkConnection;
-
-public class ProtocolEngineCreator_1_0_0 implements ProtocolEngineCreator
-{
-    private static final byte[] AMQP_1_0_0_HEADER =
-            new byte[] { (byte) 'A',
-                         (byte) 'M',
-                         (byte) 'Q',
-                         (byte) 'P',
-                         (byte) 0,
-                         (byte) 1,
-                         (byte) 0,
-                         (byte) 0
-            };
-
-    public ProtocolEngineCreator_1_0_0()
-    {
-    }
-
-    public AmqpProtocolVersion getVersion()
-    {
-        return AmqpProtocolVersion.v1_0_0;
-    }
-
-
-    public byte[] getHeaderIdentifier()
-    {
-        return AMQP_1_0_0_HEADER;
-    }
-
-    public ServerProtocolEngine newProtocolEngine(Broker broker,
-                                                  NetworkConnection network,
-                                                  Port port,
-                                                  Transport transport,
-                                                  long id)
-    {
-        return new ProtocolEngine_1_0_0(network, broker, id, port, transport);
-    }
-
-    private static ProtocolEngineCreator INSTANCE = new ProtocolEngineCreator_1_0_0();
-
-    public static ProtocolEngineCreator getInstance()
-    {
-        return INSTANCE;
-    }
-
-    @Override
-    public String getType()
-    {
-        return getVersion().toString() + "_NO_SASL";
-    }
-}
diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0.java
deleted file mode 100755
index 1bddda2f38..0000000000
--- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0.java
+++ /dev/null
@@ -1,427 +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.server.protocol.v1_0;
-
-import java.net.SocketAddress;
-import java.nio.ByteBuffer;
-import java.security.Principal;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-import org.apache.qpid.amqp_1_0.codec.FrameWriter;
-import org.apache.qpid.amqp_1_0.framing.AMQFrame;
-import org.apache.qpid.amqp_1_0.framing.FrameHandler;
-import org.apache.qpid.amqp_1_0.framing.OversizeFrameException;
-import org.apache.qpid.amqp_1_0.transport.SaslServerProvider;
-import org.apache.qpid.amqp_1_0.transport.ConnectionEndpoint;
-import org.apache.qpid.amqp_1_0.transport.Container;
-import org.apache.qpid.amqp_1_0.transport.FrameOutputHandler;
-import org.apache.qpid.amqp_1_0.type.Binary;
-import org.apache.qpid.amqp_1_0.type.FrameBody;
-import org.apache.qpid.amqp_1_0.type.Symbol;
-import org.apache.qpid.common.QpidProperties;
-import org.apache.qpid.common.ServerPropertyNames;
-import org.apache.qpid.protocol.ServerProtocolEngine;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.protocol.v1_0.Connection_1_0;
-import org.apache.qpid.server.security.SubjectCreator;
-import org.apache.qpid.server.security.auth.UsernamePrincipal;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.transport.Sender;
-import org.apache.qpid.transport.network.NetworkConnection;
-
-public class ProtocolEngine_1_0_0 implements ServerProtocolEngine, FrameOutputHandler
-{
-    static final AtomicLong _connectionIdSource = new AtomicLong(0L);
-    private final Port _port;
-    private final Transport _transport;
-
-    //private NetworkConnection _networkDriver;
-    private long _readBytes;
-    private long _writtenBytes;
-    private long _lastReadTime;
-    private long _lastWriteTime;
-    private final Broker _broker;
-    private long _createTime = System.currentTimeMillis();
-    private ConnectionEndpoint _conn;
-    private final long _connectionId;
-
-    private static final ByteBuffer HEADER =
-            ByteBuffer.wrap(new byte[]
-                    {
-                        (byte)'A',
-                        (byte)'M',
-                        (byte)'Q',
-                        (byte)'P',
-                        (byte) 0,
-                        (byte) 1,
-                        (byte) 0,
-                        (byte) 0
-                    });
-
-    private FrameWriter _frameWriter;
-    private FrameHandler _frameHandler;
-    private Object _sendLock = new Object();
-    private byte _major;
-    private byte _minor;
-    private byte _revision;
-    private NetworkConnection _network;
-    private Sender<ByteBuffer> _sender;
-
-
-    static enum State {
-        A,
-        M,
-        Q,
-        P,
-        PROTOCOL,
-        MAJOR,
-        MINOR,
-        REVISION,
-        FRAME
-    }
-
-    private State _state = State.A;
-
-
-
-    public ProtocolEngine_1_0_0(final NetworkConnection networkDriver,
-                                final Broker broker,
-                                long id,
-                                Port port,
-                                Transport transport)
-    {
-        _broker = broker;
-        _port = port;
-        _transport = transport;
-        _connectionId = id;
-        if(networkDriver != null)
-        {
-            setNetworkConnection(networkDriver, networkDriver.getSender());
-        }
-    }
-
-
-    public SocketAddress getRemoteAddress()
-    {
-        return _network.getRemoteAddress();
-    }
-
-    public SocketAddress getLocalAddress()
-    {
-        return _network.getLocalAddress();
-    }
-
-    public long getReadBytes()
-    {
-        return _readBytes;
-    }
-
-    public long getWrittenBytes()
-    {
-        return _writtenBytes;
-    }
-
-    public void writerIdle()
-    {
-        //Todo
-    }
-
-    public void readerIdle()
-    {
-        //Todo
-    }
-
-    public void setNetworkConnection(final NetworkConnection network, final Sender<ByteBuffer> sender)
-    {
-        _network = network;
-        _sender = sender;
-
-        Container container = new Container(_broker.getId().toString());
-
-        VirtualHost virtualHost = _broker.getVirtualHostRegistry().getVirtualHost((String)_broker.getAttribute(Broker.DEFAULT_VIRTUAL_HOST));
-
-        _conn = new ConnectionEndpoint(container, asSaslServerProvider(_broker.getSubjectCreator(
-                getLocalAddress())));
-
-        Map<Symbol,Object> serverProperties = new LinkedHashMap<Symbol, Object>();
-        serverProperties.put(Symbol.valueOf(ServerPropertyNames.PRODUCT), QpidProperties.getProductName());
-        serverProperties.put(Symbol.valueOf(ServerPropertyNames.VERSION), QpidProperties.getReleaseVersion());
-        serverProperties.put(Symbol.valueOf(ServerPropertyNames.QPID_BUILD), QpidProperties.getBuildVersion());
-        serverProperties.put(Symbol.valueOf(ServerPropertyNames.QPID_INSTANCE_NAME), _broker.getName());
-
-        _conn.setProperties(serverProperties);
-
-        _conn.setRemoteAddress(_network.getRemoteAddress());
-        _conn.setConnectionEventListener(new Connection_1_0(virtualHost, _conn, _connectionId, _port, _transport));
-        _conn.setFrameOutputHandler(this);
-
-        _frameWriter =  new FrameWriter(_conn.getDescribedTypeRegistry());
-        _frameHandler = new FrameHandler(_conn);
-
-        _sender.send(HEADER.duplicate());
-        _sender.flush();
-    }
-
-    private SaslServerProvider asSaslServerProvider(final SubjectCreator subjectCreator)
-    {
-        return new SaslServerProvider()
-        {
-            @Override
-            public SaslServer getSaslServer(String mechanism, String fqdn) throws SaslException
-            {
-                return subjectCreator.createSaslServer(mechanism, fqdn, null);
-            }
-
-            @Override
-            public Principal getAuthenticatedPrincipal(SaslServer server)
-            {
-                return new UsernamePrincipal(server.getAuthorizationID());
-            }
-        };
-    }
-
-    public String getAddress()
-    {
-        return getRemoteAddress().toString();
-    }
-
-    public boolean isDurable()
-    {
-        return false;
-    }
-
-    public synchronized void received(ByteBuffer msg)
-    {
-        _lastReadTime = System.currentTimeMillis();
-        if(RAW_LOGGER.isLoggable(Level.FINE))
-        {
-            ByteBuffer dup = msg.duplicate();
-            byte[] data = new byte[dup.remaining()];
-            dup.get(data);
-            Binary bin = new Binary(data);
-            RAW_LOGGER.fine("RECV[" + getRemoteAddress() + "] : " + bin.toString());
-        }
-        _readBytes += msg.remaining();
-            switch(_state)
-            {
-                case A:
-                    if(msg.hasRemaining())
-                    {
-                        msg.get();
-                    }
-                    else
-                    {
-                        break;
-                    }
-                case M:
-                    if(msg.hasRemaining())
-                    {
-                        msg.get();
-                    }
-                    else
-                    {
-                        _state = State.M;
-                        break;
-                    }
-
-                case Q:
-                    if(msg.hasRemaining())
-                    {
-                        msg.get();
-                    }
-                    else
-                    {
-                        _state = State.Q;
-                        break;
-                    }
-                case P:
-                    if(msg.hasRemaining())
-                    {
-                        msg.get();
-                    }
-                    else
-                    {
-                        _state = State.P;
-                        break;
-                    }
-                case PROTOCOL:
-                    if(msg.hasRemaining())
-                    {
-                        msg.get();
-                    }
-                    else
-                    {
-                        _state = State.PROTOCOL;
-                        break;
-                    }
-                case MAJOR:
-                    if(msg.hasRemaining())
-                    {
-                        _major = msg.get();
-                    }
-                    else
-                    {
-                        _state = State.MAJOR;
-                        break;
-                    }
-                case MINOR:
-                    if(msg.hasRemaining())
-                    {
-                        _minor = msg.get();
-                    }
-                    else
-                    {
-                        _state = State.MINOR;
-                        break;
-                    }
-                case REVISION:
-                    if(msg.hasRemaining())
-                    {
-                        _revision = msg.get();
-
-                        _state = State.FRAME;
-                    }
-                    else
-                    {
-                        _state = State.REVISION;
-                        break;
-                    }
-                case FRAME:
-                    if(msg.hasRemaining())
-                    {
-                        _frameHandler.parse(msg);
-                    }
-            }
-
-    }
-
-    public void exception(Throwable t)
-    {
-        t.printStackTrace();
-    }
-
-    public void closed()
-    {
-        _conn.inputClosed();
-        if(_conn != null && _conn.getConnectionEventListener() != null)
-        {
-            ((Connection_1_0)_conn.getConnectionEventListener()).closed();
-        }
-
-    }
-
-    public long getCreateTime()
-    {
-        return _createTime;
-    }
-
-
-    public boolean canSend()
-    {
-        return true;
-    }
-
-    public void send(final AMQFrame amqFrame)
-    {
-        send(amqFrame, null);
-    }
-
-    private final Logger FRAME_LOGGER = Logger.getLogger("FRM");
-    private final Logger RAW_LOGGER = Logger.getLogger("RAW");
-
-
-    public void send(final AMQFrame amqFrame, ByteBuffer buf)
-    {
-        synchronized(_sendLock)
-        {
-
-            _lastWriteTime = System.currentTimeMillis();
-            if(FRAME_LOGGER.isLoggable(Level.FINE))
-            {
-                FRAME_LOGGER.fine("SEND[" + getRemoteAddress() + "|" + amqFrame.getChannel() + "] : " + amqFrame.getFrameBody());
-            }
-
-
-            _frameWriter.setValue(amqFrame);
-
-
-
-            ByteBuffer dup = ByteBuffer.allocate(_conn.getMaxFrameSize());
-
-            int size = _frameWriter.writeToBuffer(dup);
-            if(size > _conn.getMaxFrameSize())
-            {
-                throw new OversizeFrameException(amqFrame,size);
-            }
-
-            dup.flip();
-            _writtenBytes += dup.limit();
-
-            if(RAW_LOGGER.isLoggable(Level.FINE))
-             {
-                ByteBuffer dup2 = dup.duplicate();
-                byte[] data = new byte[dup2.remaining()];
-                dup2.get(data);
-                Binary bin = new Binary(data);
-                RAW_LOGGER.fine("SEND[" + getRemoteAddress() + "] : " + bin.toString());
-             }
-
-
-            _sender.send(dup);
-            _sender.flush();
-
-        }
-    }
-
-    public void send(short channel, FrameBody body)
-    {
-        AMQFrame frame = AMQFrame.createAMQFrame(channel, body);
-        send(frame);
-
-    }
-
-    public void close()
-    {
-        //TODO
-    }
-
-    public long getConnectionId()
-    {
-        return _connectionId;
-    }
-
-    public long getLastReadTime()
-    {
-        return _lastReadTime;
-    }
-
-    public long getLastWriteTime()
-    {
-        return _lastWriteTime;
-    }
-}
diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
index fafbacd0a1..190574b7cc 100644
--- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/resources/META-INF/services/org.apache.qpid.server.plugin.ProtocolEngineCreator
@@ -16,5 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-org.apache.qpid.server.protocol.v1_0.ProtocolEngineCreator_1_0_0
 org.apache.qpid.server.protocol.v1_0.ProtocolEngineCreator_1_0_0_SASL