qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgodf...@apache.org
Subject svn commit: r824494 [2/2] - in /qpid/branches/java-broker-0-10/qpid/java: broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/example/ broker/src/main/java/org/apache/qpid/server/ broker/src/main/java/org/apache/qpid/server/exchange/ broker/s...
Date Mon, 12 Oct 2009 20:50:09 GMT
Modified: qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java?rev=824494&r1=824493&r2=824494&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
(original)
+++ qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
Mon Oct 12 20:50:07 2009
@@ -413,6 +413,11 @@
                     //To change body of implemented methods use File | Settings | File Templates.
                 }
 
+                public void routeToAlternate()
+                {
+                    //To change body of implemented methods use File | Settings | File Templates.
+                }
+
                 public boolean isQueueDeleted()
                 {
                     return false;  //To change body of implemented methods use File | Settings
| File Templates.

Copied: qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
(from r824084, qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java)
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java?p2=qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java&p1=qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java&r1=824084&r2=824494&rev=824494&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
(original)
+++ qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
Mon Oct 12 20:50:07 2009
@@ -33,7 +33,7 @@
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 
-public class DestWildExchangeTest extends TestCase
+public class TopicExchangeTest extends TestCase
 {
 
     TopicExchange _exchange;

Propchange: qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java?rev=824494&r1=824493&r2=824494&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
(original)
+++ qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
Mon Oct 12 20:50:07 2009
@@ -336,6 +336,16 @@
         return false;  //To change body of implemented methods use File | Settings | File
Templates.
     }
 
+    public Exchange getAlternateExchange()
+    {
+        return null;  //To change body of implemented methods use File | Settings | File
Templates.
+    }
+
+    public void setAlternateExchange(Exchange exchange)
+    {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
     public Map<String, Object> getArguments()
     {
         return null;  //To change body of implemented methods use File | Settings | File
Templates.

Modified: qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java?rev=824494&r1=824493&r2=824494&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
(original)
+++ qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
Mon Oct 12 20:50:07 2009
@@ -69,6 +69,11 @@
 
     }
 
+    public void routeToAlternate()
+    {
+        
+    }
+
     public void dispose()
     {
 

Modified: qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java?rev=824494&r1=824493&r2=824494&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
(original)
+++ qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
Mon Oct 12 20:50:07 2009
@@ -30,9 +30,11 @@
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.message.ServerMessage;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
+import java.nio.ByteBuffer;
 
 /**
  * A message store that does nothing. Designed to be used in tests that do not want to use
any message store
@@ -160,6 +162,21 @@
         return false;
     }
 
+    public void storeMessageHeader(Long messageNumber, ServerMessage message)
+    {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void storeContent(Long messageNumber, long offset, ByteBuffer body)
+    {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public ServerMessage getMessage(Long messageNumber)
+    {
+        return null;  //To change body of implemented methods use File | Settings | File
Templates.
+    }
+
     public void removeQueue(final AMQQueue queue) throws AMQException
     {
 

Modified: qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=824494&r1=824493&r2=824494&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
(original)
+++ qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Mon Oct 12 20:50:07 2009
@@ -110,10 +110,6 @@
  * <tr><td>
  * </table>
  *
- * @todo Explain the system property: amqj.shared_read_write_pool. How does putting the protocol
codec filter before the
- * async write filter make it a shared pool? The pooling filter uses the same thread pool
for reading and writing
- * anyway, see {@link org.apache.qpid.pool.PoolingFilter}, docs for comments. Will putting
the protocol codec
- * filter before it mean not doing the read/write asynchronously but in the main filter thread?
  * @todo Use a single handler instance, by shifting everything to do with the 'protocol session'
state, including
  * failover state, into AMQProtocolSession, and tracking that from AMQConnection? The lifecycles
of
  * AMQProtocolSesssion and AMQConnection will be the same, so if there is high cohesion between
them, they could
@@ -172,10 +168,10 @@
     private Job _writeJob;
     private ReferenceCountingExecutorService _poolReference = ReferenceCountingExecutorService.getInstance();
     private NetworkDriver _networkDriver;
-    
+
     private long _writtenBytes;
     private long _readBytes;
-    
+
     /**
      * Creates a new protocol handler, associated with the specified client connection instance.
      *
@@ -215,10 +211,6 @@
      * process will be started, provided that it is the clients policy to allow failover,
and provided that a failover
      * has not already been started or failed.
      *
-     * <p/>It is important to note that when the connection dies this method may be
called or {@link #exceptionCaught}
-     * may be called first followed by this method. This depends on whether the client was
trying to send data at the
-     * time of the failure.
-     *
      * @todo Clarify: presumably exceptionCaught is called when the client is sending during
a connection failure and
      * not otherwise? The above comment doesn't make that clear.
      */
@@ -261,7 +253,7 @@
                 {
                     _logger.debug("sessionClose() not allowed to failover");
                     _connection.exceptionReceived(new AMQDisconnectedException(
-                            "Server closed connection and reconnection " + "not permitted.",

+                            "Server closed connection and reconnection " + "not permitted.",
                             _stateManager.getLastException()));
                 }
                 else
@@ -285,7 +277,6 @@
         failoverThread.start();
     }
 
-    @Override
     public void readerIdle()
     {
         _logger.debug("Protocol Session [" + this + "] idle: reader");
@@ -294,8 +285,7 @@
         _logger.warn("Timed out while waiting for heartbeat from peer.");
         _networkDriver.close();
     }
-    
-    @Override
+
     public void writerIdle()
     {
         _logger.debug("Protocol Session [" + this + "] idle: reader");
@@ -368,7 +358,7 @@
     public void propagateExceptionToAllWaiters(Exception e)
     {
         getStateManager().error(e);
-        
+
         propagateExceptionToFrameListeners(e);
     }
 
@@ -423,7 +413,6 @@
     private static int _messageReceivedCount;
 
 
-    @Override
     public void received(ByteBuffer msg)
     {
         try
@@ -433,7 +422,6 @@
 
             Job.fireAsynchEvent(_poolReference.getPool(), _readJob, new Runnable()
             {
-                @Override
                 public void run()
                 {
                     // Decode buffer
@@ -568,7 +556,6 @@
         _writtenBytes += buf.remaining();
         Job.fireAsynchEvent(_poolReference.getPool(), _writeJob, new Runnable()
         {
-            @Override
             public void run()
             {
                 _networkDriver.send(buf);
@@ -589,7 +576,7 @@
         }
 
         _connection.bytesSent(_writtenBytes);
-        
+
         if (wait)
         {
             _networkDriver.flush();
@@ -649,7 +636,7 @@
 
                 _frameListeners.add(listener);
                 //FIXME: At this point here we should check or before add we should check
_stateManager is in an open
-                // state so as we don't check we are likely just to time out here as I believe
is being seen in QPID-1255 
+                // state so as we don't check we are likely just to time out here as I believe
is being seen in QPID-1255
             }
             writeFrame(frame);
 
@@ -835,7 +822,7 @@
     {
         _networkDriver = driver;
     }
-    
+
     /** @param delay delay in seconds (not ms) */
     void initHeartbeats(int delay)
     {

Modified: qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngine.java?rev=824494&r1=824493&r2=824494&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngine.java
(original)
+++ qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolEngine.java
Mon Oct 12 20:50:07 2009
@@ -28,38 +28,34 @@
 
 /**
  * A ProtocolEngine is a Receiver for java.nio.ByteBuffers. It takes the data passed to it
in the received
- * decodes it and then process the result. 
- */ 
-public interface ProtocolEngine extends Receiver<java.nio.ByteBuffer> 
-{ 
-   // Sets the network driver providing data for this ProtocolEngine 
+ * decodes it and then process the result.
+ */
+public interface ProtocolEngine extends Receiver<java.nio.ByteBuffer>
+{
+   // Sets the network driver providing data for this ProtocolEngine
    void setNetworkDriver (NetworkDriver driver);
- 
-   // Returns the remote address of the NetworkDriver 
+
+   // Returns the remote address of the NetworkDriver
    SocketAddress getRemoteAddress();
 
-   // Returns the local address of the NetworkDriver 
+   // Returns the local address of the NetworkDriver
    SocketAddress getLocalAddress();
- 
-   // Returns number of bytes written 
+
+   // Returns number of bytes written
    long getWrittenBytes();
- 
-   // Returns number of bytes read 
+
+   // Returns number of bytes read
    long getReadBytes();
- 
-   // Called by the NetworkDriver when the socket has been closed for reading 
+
+   // Called by the NetworkDriver when the socket has been closed for reading
    void closed();
- 
-   // Called when the NetworkEngine has not written data for the specified period of time
(will trigger a  
-   // heartbeat) 
+
+   // Called when the NetworkEngine has not written data for the specified period of time
(will trigger a
+   // heartbeat)
    void writerIdle();
-  
-   // Called when the NetworkEngine has not read data for the specified period of time (will
close the connection) 
+
+   // Called when the NetworkEngine has not read data for the specified period of time (will
close the connection)
    void readerIdle();
- 
-   /**
-    * Accepts an AMQFrame for writing to the network. The ProtocolEngine encodes the frame
into bytes and
-    * passes the data onto the NetworkDriver for sending
-    */ 
-   void writeFrame(AMQDataBlock frame);
-} 
\ No newline at end of file
+
+
+}
\ No newline at end of file

Modified: qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java?rev=824494&r1=824493&r2=824494&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
(original)
+++ qpid/branches/java-broker-0-10/qpid/java/common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
Mon Oct 12 20:50:07 2009
@@ -39,7 +39,7 @@
  * @author Rafael H. Schloming
  */
 
-public final class InputHandler implements Receiver<ByteBuffer>
+public class InputHandler implements Receiver<ByteBuffer>
 {
 
     public enum State

Modified: qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=824494&r1=824493&r2=824494&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
(original)
+++ qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
Mon Oct 12 20:50:07 2009
@@ -31,9 +31,11 @@
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.MessageMetaData;
+import org.apache.qpid.server.message.ServerMessage;
 
 import java.util.HashMap;
 import java.util.Iterator;
+import java.nio.ByteBuffer;
 
 public class SlowMessageStore implements MessageStore
 {
@@ -317,4 +319,19 @@
         return _realStore.isPersistent();
     }
 
+    public void storeMessageHeader(Long messageNumber, ServerMessage message)
+    {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void storeContent(Long messageNumber, long offset, ByteBuffer body)
+    {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public ServerMessage getMessage(Long messageNumber)
+    {
+        return null;  //To change body of implemented methods use File | Settings | File
Templates.
+    }
+
 }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message