Author: rgodfrey
Date: Mon Jan 30 11:53:52 2012
New Revision: 1237612
URL: http://svn.apache.org/viewvc?rev=1237612&view=rev
Log:
QPID-3789 : [Java] Remove dead code and empty directories
Removed:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/configuration/
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugin/
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/MessageRouter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/LoggingProxy.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/LoggingProxyTest.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/bio/
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/security/
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueNoSize.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java?rev=1237612&r1=1237611&r2=1237612&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
Mon Jan 30 11:53:52 2012
@@ -27,7 +27,6 @@ import org.apache.qpid.AMQSecurityExcept
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.queue.IncomingMessage;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -154,24 +153,4 @@ public class DefaultExchangeRegistry imp
}
}
-
- /**
- * Routes content through exchanges, delivering it to 1 or more queues.
- * @param payload
- * @throws AMQException if something goes wrong delivering data
- */
- public void routeContent(IncomingMessage payload) throws AMQException
- {
- final AMQShortString exchange = payload.getExchange();
- final Exchange exch = getExchange(exchange);
- // there is a small window of opportunity for the exchange to be
deleted in between
- // the BasicPublish being received (where the exchange is validated)
and the final
- // content body being received (which triggers this method)
- // TODO: check where the exchange is validated
- if (exch == null)
- {
- throw new AMQException("Exchange '" + exchange + "' does not
exist");
- }
- payload.enqueue(exch.route(payload));
- }
}
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java?rev=1237612&r1=1237611&r2=1237612&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
Mon Jan 30 11:53:52 2012
@@ -26,7 +26,7 @@ import org.apache.qpid.framing.AMQShortS
import java.util.Collection;
-public interface ExchangeRegistry extends MessageRouter
+public interface ExchangeRegistry
{
void registerExchange(Exchange exchange) throws AMQException;
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java?rev=1237612&r1=1237611&r2=1237612&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
Mon Jan 30 11:53:52 2012
@@ -3,9 +3,7 @@ package org.apache.qpid.server.exchange.
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.AMQShortStringTokenizer;
-import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java?rev=1237612&r1=1237611&r2=1237612&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java
Mon Jan 30 11:53:52 2012
@@ -23,14 +23,8 @@ package org.apache.qpid.server.flow;
public class CreditCreditManager extends AbstractFlowCreditManager implements
FlowCreditManager_0_10
{
- private volatile long _bytesCredit;
- private volatile long _messageCredit;
-
-
- public CreditCreditManager()
- {
- this(0L, 0L);
- }
+ private volatile long _bytesCredit;
+ private volatile long _messageCredit;
public CreditCreditManager(long bytesCredit, long messageCredit)
{
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java?rev=1237612&r1=1237611&r2=1237612&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
Mon Jan 30 11:53:52 2012
@@ -44,7 +44,6 @@ import org.apache.qpid.server.virtualhos
import java.util.Collections;
import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
public class QueueDeclareHandler implements
StateAwareMethodListener<QueueDeclareBody>
{
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=1237612&r1=1237611&r2=1237612&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
Mon Jan 30 11:53:52 2012
@@ -69,7 +69,6 @@ import javax.security.auth.Subject;
import javax.security.sasl.SaslServer;
import java.io.DataOutput;
import java.io.IOException;
-import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
@@ -1462,30 +1461,6 @@ public class AMQProtocolEngine implement
return getAuthorizedPrincipal().getName();
}
- private static class ByteBufferOutputStream extends OutputStream
- {
-
-
- private final ByteBuffer _buf;
-
- public ByteBufferOutputStream(ByteBuffer buf)
- {
- _buf = buf;
- }
-
- @Override
- public void write(int b) throws IOException
- {
- _buf.put((byte) b);
- }
-
- @Override
- public void write(byte[] b, int off, int len) throws IOException
- {
- _buf.put(b, off, len);
- }
- }
-
public final class WriteDeliverMethod
implements ClientDeliveryMethod
{
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
