svn commit: r686136 [9/17] - in /incubator/qpid/branches/qpid.0-10/java: ./ broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/ broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/example/ broker/bin/ broker/etc/ broker/...

[rh...@apache.org]

Modified: incubator/qpid/branches/qpid.0-10/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java Thu Aug 14 20:40:49 2008
@@ -22,9 +22,9 @@
 
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.tools.messagestore.MessageStoreTool;
 
 import java.util.LinkedList;

Modified: incubator/qpid/branches/qpid.0-10/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java Thu Aug 14 20:40:49 2008
@@ -26,6 +26,7 @@
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.server.queue.QueueEntryImpl;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.tools.messagestore.MessageStoreTool;
@@ -33,7 +34,6 @@
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.StringTokenizer;
 
 public class Show extends AbstractCommand
 {

Modified: incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java Thu Aug 14 20:40:49 2008
@@ -22,9 +22,7 @@
 
 import junit.framework.TestCase;
 import junit.framework.Assert;
-import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.AMQMessage;
-import org.apache.qpid.server.queue.MessageHandleFactory;
+import org.apache.qpid.server.queue.*;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.txn.NonTransactionalContext;
@@ -33,6 +31,7 @@
 import org.apache.qpid.server.store.MemoryMessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.RequiredDeliveryException;
+import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentHeaderBody;
@@ -43,57 +42,51 @@
 public class DestWildExchangeTest extends TestCase
 {
 
-    DestWildExchange _exchange;
+    TopicExchange _exchange;
 
     VirtualHost _vhost;
     MessageStore _store;
     StoreContext _context;
 
+    InternalTestProtocolSession _protocolSession;
+
 
     public void setUp() throws AMQException
     {
-        _exchange = new DestWildExchange();
+        _exchange = new TopicExchange();
         _vhost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHosts().iterator().next();
         _store = new MemoryMessageStore();
         _context = new StoreContext();
+        _protocolSession = new InternalTestProtocolSession();
     }
 
 
     public void testNoRoute() throws AMQException
     {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a*#b"), false, null, false, _vhost);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a*#b"), false, null, false, _vhost, null);
         _exchange.registerQueue(new AMQShortString("a.*.#.b"), queue, null);
 
 
         MessagePublishInfo info = new PublishInfo(new AMQShortString("a.b"));
 
-        AMQMessage message = new AMQMessage(0L, info, null);
+        IncomingMessage message = new IncomingMessage(0L, info, null, _protocolSession);
 
-        try
-        {
-            _exchange.route(message);
-            fail("Message has no route and shouldn't be routed");
-        }
-        catch (NoRouteException nre)
-        {
-            //normal   
-        }
+        _exchange.route(message);            
 
         Assert.assertEquals(0, queue.getMessageCount());
     }
 
     public void testDirectMatch() throws AMQException
     {
-        AMQQueue queue = new AMQQueue(new AMQShortString("ab"), false, null, false, _vhost);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("ab"), false, null, false, _vhost, null);
         _exchange.registerQueue(new AMQShortString("a.b"), queue, null);
 
 
-        AMQMessage message = createMessage("a.b");
+        IncomingMessage message = createMessage("a.b");
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -102,7 +95,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -112,8 +105,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
             fail("Message has no route and should fail to be routed");
         }
         catch (AMQException nre)
@@ -126,16 +118,15 @@
 
     public void testStarMatch() throws AMQException
     {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a*"), false, null, false, _vhost);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a*"), false, null, false, _vhost, null);
         _exchange.registerQueue(new AMQShortString("a.*"), queue, null);
 
 
-        AMQMessage message = createMessage("a.b");
+        IncomingMessage message = createMessage("a.b");
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -144,7 +135,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -154,8 +145,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -164,7 +154,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -174,8 +164,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
             fail("Message has no route and should fail to be routed");
         }
         catch (AMQException nre)
@@ -187,16 +176,15 @@
 
     public void testHashMatch() throws AMQException
     {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a#"), false, null, false, _vhost);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a#"), false, null, false, _vhost, null);
         _exchange.registerQueue(new AMQShortString("a.#"), queue, null);
 
 
-        AMQMessage message = createMessage("a.b.c");
+        IncomingMessage message = createMessage("a.b.c");
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -205,7 +193,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -215,8 +203,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -225,7 +212,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -235,8 +222,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -245,7 +231,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -254,8 +240,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -264,7 +249,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -274,8 +259,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
             fail("Message has no route and should fail to be routed");
         }
         catch (AMQException nre)
@@ -288,16 +272,15 @@
 
     public void testMidHash() throws AMQException
     {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a"), false, null, false, _vhost);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a"), false, null, false, _vhost, null);
         _exchange.registerQueue(new AMQShortString("a.*.#.b"), queue, null);
 
 
-        AMQMessage message = createMessage("a.c.d.b");
+        IncomingMessage message = createMessage("a.c.d.b");
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -306,7 +289,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -315,8 +298,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -325,7 +307,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -334,16 +316,15 @@
 
     public void testMatchafterHash() throws AMQException
     {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a#"), false, null, false, _vhost);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a#"), false, null, false, _vhost, null);
         _exchange.registerQueue(new AMQShortString("a.*.#.b.c"), queue, null);
 
 
-        AMQMessage message = createMessage("a.c.b.b");
+        IncomingMessage message = createMessage("a.c.b.b");
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
             fail("Message has route and should not be routed");
         }
         catch (AMQException nre)
@@ -357,8 +338,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -367,7 +347,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -376,8 +356,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
             fail("Message has  route and should not be routed");
         }
         catch (AMQException nre)
@@ -390,8 +369,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -401,7 +379,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -411,16 +389,15 @@
 
     public void testHashAfterHash() throws AMQException
     {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a#"), false, null, false, _vhost);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a#"), false, null, false, _vhost, null);
         _exchange.registerQueue(new AMQShortString("a.*.#.b.c.#.d"), queue, null);
 
 
-        AMQMessage message = createMessage("a.c.b.b.c");
+        IncomingMessage message = createMessage("a.c.b.b.c");
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
             fail("Message has route and should not be routed");
         }
         catch (AMQException nre)
@@ -434,8 +411,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -444,7 +420,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -453,16 +429,15 @@
 
     public void testHashHash() throws AMQException
     {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a#"), false, null, false, _vhost);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a#"), false, null, false, _vhost, null);
         _exchange.registerQueue(new AMQShortString("a.#.*.#.d"), queue, null);
 
 
-        AMQMessage message = createMessage("a.c.b.b.c");
+        IncomingMessage message = createMessage("a.c.b.b.c");
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
             fail("Message has route and should not be routed");
         }
         catch (AMQException nre)
@@ -475,8 +450,7 @@
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
         }
         catch (AMQException nre)
         {
@@ -485,7 +459,7 @@
 
         Assert.assertEquals(1, queue.getMessageCount());
 
-        Assert.assertEquals("Wrong message recevied", message, queue.getMessagesOnTheQueue().get(0).getMessage());
+        Assert.assertEquals("Wrong message recevied", (Object) message.getMessageId(), queue.getMessagesOnTheQueue().get(0).getMessage().getMessageId());
 
         queue.deleteMessageFromTop(_context);
         Assert.assertEquals(0, queue.getMessageCount());
@@ -494,16 +468,15 @@
 
     public void testSubMatchFails() throws AMQException
     {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a"), false, null, false, _vhost);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a"), false, null, false, _vhost, null);
         _exchange.registerQueue(new AMQShortString("a.b.c.d"), queue, null);
 
 
-        AMQMessage message = createMessage("a.b.c");
+        IncomingMessage message = createMessage("a.b.c");
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
             fail("Message has route and should not be routed");
         }
         catch (AMQException nre)
@@ -514,18 +487,25 @@
 
     }
 
+    private void routeMessage(final IncomingMessage message)
+            throws AMQException
+    {
+        _exchange.route(message);
+        message.routingComplete(_store, new MessageHandleFactory());
+        message.deliverToQueues();
+    }
+
     public void testMoreRouting() throws AMQException
     {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a"), false, null, false, _vhost);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a"), false, null, false, _vhost, null);
         _exchange.registerQueue(new AMQShortString("a.b"), queue, null);
 
 
-        AMQMessage message = createMessage("a.b.c");
+        IncomingMessage message = createMessage("a.b.c");
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
             fail("Message has route and should not be routed");
         }
         catch (AMQException nre)
@@ -538,16 +518,15 @@
 
     public void testMoreQueue() throws AMQException
     {
-        AMQQueue queue = new AMQQueue(new AMQShortString("a"), false, null, false, _vhost);
+        AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("a"), false, null, false, _vhost, null);
         _exchange.registerQueue(new AMQShortString("a.b"), queue, null);
 
 
-        AMQMessage message = createMessage("a");
+        IncomingMessage message = createMessage("a");
 
         try
         {
-            _exchange.route(message);
-            message.routingComplete(_store, _context, new MessageHandleFactory());
+            routeMessage(message);
             fail("Message has route and should not be routed");
         }
         catch (AMQException nre)
@@ -558,7 +537,7 @@
 
     }
 
-    private AMQMessage createMessage(String s) throws AMQException
+    private IncomingMessage createMessage(String s) throws AMQException
     {
         MessagePublishInfo info = new PublishInfo(new AMQShortString(s));
 
@@ -566,8 +545,9 @@
                                                                        new LinkedList<RequiredDeliveryException>()
         );
 
-        AMQMessage message = new AMQMessage(0L, info, trancontext);
-        message.setContentHeaderBody(new ContentHeaderBody());
+        IncomingMessage message = new IncomingMessage(0L, info, trancontext,_protocolSession);
+        message.setContentHeaderBody( new ContentHeaderBody());
+
 
         return message;
     }

Modified: incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java Thu Aug 14 20:40:49 2008
@@ -21,8 +21,9 @@
 package org.apache.qpid.server.exchange;
 
 import junit.framework.TestCase;
-import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.QueueRegistry;
+import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.management.ManagedObject;
@@ -30,7 +31,6 @@
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
 
-import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.TabularData;
 import java.util.ArrayList;
 
@@ -50,7 +50,7 @@
 
     public void testDirectExchangeMBean() throws Exception
     {
-        DestNameExchange exchange = new DestNameExchange();
+        DirectExchange exchange = new DirectExchange();
         exchange.initialise(_virtualHost, ExchangeDefaults.DIRECT_EXCHANGE_NAME, false, 0, true);
         ManagedObject managedObj = exchange.getManagedObject();
         ManagedExchange mbean = (ManagedExchange)managedObj;
@@ -77,7 +77,7 @@
 
     public void testTopicExchangeMBean() throws Exception
     {
-        DestWildExchange exchange = new DestWildExchange();
+        TopicExchange exchange = new TopicExchange();
         exchange.initialise(_virtualHost,ExchangeDefaults.TOPIC_EXCHANGE_NAME, false, 0, true);
         ManagedObject managedObj = exchange.getManagedObject();
         ManagedExchange mbean = (ManagedExchange)managedObj;
@@ -132,7 +132,8 @@
         IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
         _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
         _queueRegistry = _virtualHost.getQueueRegistry();
-        _queue = new AMQQueue(new AMQShortString("testQueue"), false, new AMQShortString("ExchangeMBeanTest"), false, _virtualHost);
+        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue"), false, new AMQShortString("ExchangeMBeanTest"), false, _virtualHost,
+                                                    null);
         _queueRegistry.registerQueue(_queue);
     }
 }

Modified: incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java Thu Aug 14 20:40:49 2008
@@ -32,18 +32,25 @@
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.server.RequiredDeliveryException;
 import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.protocol.TestMinaProtocolSession;
+import org.apache.qpid.server.subscription.Subscription;
+import org.apache.qpid.server.subscription.SubscriptionFactoryImpl;
 import org.apache.qpid.server.protocol.AMQMinaProtocolSession;
+import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.abstraction.ContentChunk;
+import org.apache.mina.common.ByteBuffer;
 
 import javax.management.Notification;
+
+import java.util.ArrayList;
 import java.util.LinkedList;
+import java.util.Collections;
 
 /** This class tests all the alerts an AMQQueue can throw based on threshold values of different parameters */
 public class AMQQueueAlertTest extends TestCase
-{
+{                                                         
     private final static long MAX_MESSAGE_COUNT = 50;
     private final static long MAX_MESSAGE_AGE = 250;   // 0.25 sec
     private final static long MAX_MESSAGE_SIZE = 2000;  // 2 KB
@@ -51,13 +58,14 @@
     private AMQQueue _queue;
     private AMQQueueMBean _queueMBean;
     private VirtualHost _virtualHost;
-    private AMQMinaProtocolSession protocolSession = null;
+    private AMQMinaProtocolSession _protocolSession;
     private MessageStore _messageStore = new MemoryMessageStore();
     private StoreContext _storeContext = new StoreContext();
     private TransactionalContext _transactionalContext = new NonTransactionalContext(_messageStore, _storeContext,
                                                                                      null,
                                                                                      new LinkedList<RequiredDeliveryException>()
     );
+    private static final SubscriptionFactoryImpl SUBSCRIPTION_FACTORY = SubscriptionFactoryImpl.INSTANCE;
 
     /**
      * Tests if the alert gets thrown when message count increases the threshold limit
@@ -66,8 +74,9 @@
      */
     public void testMessageCountAlert() throws Exception
     {
-        _queue = new AMQQueue(new AMQShortString("testQueue1"), false, new AMQShortString("AMQueueAlertTest"),
-                              false, _virtualHost);
+        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue1"), false, new AMQShortString("AMQueueAlertTest"),
+                              false, _virtualHost,
+                              null);
         _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
 
         _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
@@ -89,8 +98,9 @@
      */
     public void testMessageSizeAlert() throws Exception
     {
-        _queue = new AMQQueue(new AMQShortString("testQueue2"), false, new AMQShortString("AMQueueAlertTest"),
-                              false, _virtualHost);
+        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue2"), false, new AMQShortString("AMQueueAlertTest"),
+                              false, _virtualHost,
+                              null);
         _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
         _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
         _queueMBean.setMaximumMessageSize(MAX_MESSAGE_SIZE);
@@ -114,8 +124,9 @@
      */
     public void testQueueDepthAlertNoSubscriber() throws Exception
     {
-        _queue = new AMQQueue(new AMQShortString("testQueue3"), false, new AMQShortString("AMQueueAlertTest"),
-                              false, _virtualHost);
+        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue3"), false, new AMQShortString("AMQueueAlertTest"),
+                              false, _virtualHost,
+                              null);
         _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
         _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
         _queueMBean.setMaximumQueueDepth(MAX_QUEUE_DEPTH);
@@ -142,8 +153,9 @@
      */
     public void testMessageAgeAlert() throws Exception
     {
-        _queue = new AMQQueue(new AMQShortString("testQueue4"), false, new AMQShortString("AMQueueAlertTest"),
-                              false, _virtualHost);
+        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue4"), false, new AMQShortString("AMQueueAlertTest"),
+                              false, _virtualHost,
+                              null);
         _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
         _queueMBean.setMaximumMessageCount(MAX_MESSAGE_COUNT);
         _queueMBean.setMaximumMessageAge(MAX_MESSAGE_AGE);
@@ -167,18 +179,23 @@
      This test sends some messages to the queue with subscribers needing message to be acknowledged.
      The messages will not be acknowledged and will be required twice. Why we are checking this is because
      the bug reported said that the queueDepth keeps increasing when messages are requeued.
+     // TODO - queue depth now includes unacknowledged messages so does not go down when messages are delivered
+
      The QueueDepth should decrease when messages are delivered from the queue (QPID-408)
     */
     public void testQueueDepthAlertWithSubscribers() throws Exception
     {
-        protocolSession = new TestMinaProtocolSession();
-        AMQChannel channel = new AMQChannel(protocolSession, 2, _messageStore);
-        protocolSession.addChannel(channel);
+        _protocolSession = new InternalTestProtocolSession();
+        AMQChannel channel = new AMQChannel(_protocolSession, 2, _messageStore);
+        _protocolSession.addChannel(channel);
 
         // Create queue
         _queue = getNewQueue();
-        _queue.registerProtocolSession(protocolSession, channel.getChannelId(),
-                                       new AMQShortString("consumer_tag"), true, null, false, false);
+        Subscription subscription =
+                SUBSCRIPTION_FACTORY.createSubscription(channel.getChannelId(), _protocolSession, new AMQShortString("consumer_tag"), true, null, false, channel.getCreditManager());
+
+        _queue.registerSubscription(
+                subscription, false);
 
         _queueMBean = (AMQQueueMBean) _queue.getManagedObject();
         _queueMBean.setMaximumMessageCount(9999l);   // Set a high value, because this is not being tested
@@ -191,13 +208,13 @@
 
         // Check queueDepth. There should be no messages on the queue and as the subscriber is listening
         // so there should be no Queue_Deoth alert raised
-        assertEquals(new Long(0), new Long(_queueMBean.getQueueDepth()));
+        assertEquals(new Long(totalSize), new Long(_queueMBean.getQueueDepth()));
         Notification lastNotification = _queueMBean.getLastNotification();
-        assertNull(lastNotification);
+//        assertNull(lastNotification);
 
         // Kill the subscriber and check for the queue depth values.
         // Messages are unacknowledged, so those should get requeued. All messages should be on the Queue
-        _queue.unregisterProtocolSession(protocolSession, channel.getChannelId(), new AMQShortString("consumer_tag"));
+        _queue.unregisterSubscription(subscription);
         channel.requeue();
 
         assertEquals(new Long(totalSize), new Long(_queueMBean.getQueueDepth()));
@@ -209,29 +226,32 @@
 
         // Connect a consumer again and check QueueDepth values. The queue should get emptied.
         // Messages will get delivered but still are unacknowledged.
-        _queue.registerProtocolSession(protocolSession, channel.getChannelId(),
-                                       new AMQShortString("consumer_tag"), true, null, false, false);
-        _queue.deliverAsync();
-        while (_queue.getMessageCount() != 0)
+        Subscription subscription2 =
+                SUBSCRIPTION_FACTORY.createSubscription(channel.getChannelId(), _protocolSession, new AMQShortString("consumer_tag"), true, null, false, channel.getCreditManager());
+
+        _queue.registerSubscription(
+                subscription2, false);
+        
+        while (_queue.getUndeliveredMessageCount()!= 0)
         {
             Thread.sleep(100);
         }
-        assertEquals(new Long(0), new Long(_queueMBean.getQueueDepth()));
+//        assertEquals(new Long(0), new Long(_queueMBean.getQueueDepth()));
 
         // Kill the subscriber again. Now those messages should get requeued again. Check if the queue depth
         // value is correct.
-        _queue.unregisterProtocolSession(protocolSession, channel.getChannelId(), new AMQShortString("consumer_tag"));
+        _queue.unregisterSubscription(subscription2);
         channel.requeue();
 
         assertEquals(new Long(totalSize), new Long(_queueMBean.getQueueDepth()));
-        protocolSession.closeSession();
+        _protocolSession.closeSession();
 
         // Check the clear queue
         _queueMBean.clearQueue();
         assertEquals(new Long(0), new Long(_queueMBean.getQueueDepth()));
     }
 
-    protected AMQMessage message(final boolean immediate, long size) throws AMQException
+    protected IncomingMessage message(final boolean immediate, long size) throws AMQException
     {
         MessagePublishInfo publish = new MessagePublishInfo()
         {
@@ -264,9 +284,9 @@
 
         ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
         contentHeaderBody.bodySize = size;   // in bytes
-        AMQMessage message = new AMQMessage(_messageStore.getNewMessageId(), publish, _transactionalContext);
+        IncomingMessage message = new IncomingMessage(_messageStore.getNewMessageId(), publish, _transactionalContext, _protocolSession);
         message.setContentHeaderBody(contentHeaderBody);
-        message.setPublisher(protocolSession);
+
         return message;
     }
 
@@ -276,30 +296,54 @@
         super.setUp();
         IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
         _virtualHost = applicationRegistry.getVirtualHostRegistry().getVirtualHost("test");
+        _protocolSession = new InternalTestProtocolSession();
+
     }
 
-    private void sendMessages(long messageCount, long size) throws AMQException
+    private void sendMessages(long messageCount, final long size) throws AMQException
     {
-        AMQMessage[] messages = new AMQMessage[(int) messageCount];
+        IncomingMessage[] messages = new IncomingMessage[(int) messageCount];
         for (int i = 0; i < messages.length; i++)
         {
             messages[i] = message(false, size);
-            messages[i].enqueue(_queue);
-            messages[i].routingComplete(_messageStore, _storeContext, new MessageHandleFactory());
+            ArrayList<AMQQueue> qs = new ArrayList<AMQQueue>();
+            qs.add(_queue);
+            messages[i].enqueue(qs);
+            messages[i].routingComplete(_messageStore, new MessageHandleFactory());
+
         }
 
         for (int i = 0; i < messageCount; i++)
         {
-            _queue.process(_storeContext, new QueueEntry(_queue,messages[i]), false);
+            messages[i].addContentBodyFrame(new ContentChunk(){
+
+                ByteBuffer _data = ByteBuffer.allocate((int)size);
+
+                public int getSize()
+                {
+                    return (int) size;
+                }
+
+                public ByteBuffer getData()
+                {
+                    return _data;
+                }
+
+                public void reduceToFit()
+                {
+                    
+                }
+            });
+            messages[i].deliverToQueues();
         }
     }
 
     private AMQQueue getNewQueue() throws AMQException
     {
-        return new AMQQueue(new AMQShortString("testQueue" + Math.random()),
+        return AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue" + Math.random()),
                             false,
                             new AMQShortString("AMQueueAlertTest"),
                             false,
-                            _virtualHost);
+                            _virtualHost, null);
     }
 }

Modified: incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java Thu Aug 14 20:40:49 2008
@@ -27,10 +27,14 @@
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentBody;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.abstraction.ContentChunk;
 import org.apache.qpid.server.AMQChannel;
 import org.apache.qpid.server.RequiredDeliveryException;
-import org.apache.qpid.server.protocol.TestMinaProtocolSession;
+import org.apache.qpid.server.subscription.Subscription;
+import org.apache.qpid.server.subscription.SubscriptionFactory;
+import org.apache.qpid.server.subscription.SubscriptionFactoryImpl;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
+import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
@@ -43,7 +47,10 @@
 import org.apache.mina.common.ByteBuffer;
 
 import javax.management.JMException;
+
+import java.util.ArrayList;
 import java.util.LinkedList;
+import java.util.Collections;
 
 /**
  * Test class to test AMQQueueMBean attribtues and operations
@@ -58,6 +65,7 @@
     private TransactionalContext _transactionalContext;
     private VirtualHost _virtualHost;
     private AMQProtocolSession _protocolSession;
+    private static final SubscriptionFactoryImpl SUBSCRIPTION_FACTORY = SubscriptionFactoryImpl.INSTANCE;
 
     public void testMessageCountTransient() throws Exception
     {
@@ -73,7 +81,7 @@
         assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
 
         _queueMBean.clearQueue();
-        assertTrue(_queueMBean.getMessageCount() == 0);
+        assertEquals(0,(int)_queueMBean.getMessageCount());
         assertTrue(_queueMBean.getReceivedMessageCount() == messageCount);
 
         //Ensure that the data has been removed from the Store
@@ -116,27 +124,30 @@
 
     public void testConsumerCount() throws AMQException
     {
-        SubscriptionManager mgr = _queue.getSubscribers();
-        assertFalse(mgr.hasActiveSubscribers());
+        
+        assertTrue(_queue.getActiveConsumerCount() == 0);
         assertTrue(_queueMBean.getActiveConsumerCount() == 0);
 
 
-        TestMinaProtocolSession protocolSession = new TestMinaProtocolSession();
+        InternalTestProtocolSession protocolSession = new InternalTestProtocolSession();
         AMQChannel channel = new AMQChannel(protocolSession, 1, _messageStore);
         protocolSession.addChannel(channel);
 
-        _queue.registerProtocolSession(protocolSession, 1, new AMQShortString("test"), false, null, false, false);
-        assertTrue(_queueMBean.getActiveConsumerCount() == 1);
+        Subscription subscription =
+                SUBSCRIPTION_FACTORY.createSubscription(channel.getChannelId(), protocolSession, new AMQShortString("test"), false, null, false, channel.getCreditManager());
+        
+        _queue.registerSubscription(subscription, false);
+        assertEquals(1,(int)_queueMBean.getActiveConsumerCount());
 
-        SubscriptionSet _subscribers = (SubscriptionSet) mgr;
-        SubscriptionFactory subscriptionFactory = new SubscriptionImpl.Factory();
+
+        SubscriptionFactory subscriptionFactory = SUBSCRIPTION_FACTORY;
         Subscription s1 = subscriptionFactory.createSubscription(channel.getChannelId(),
                                                                  protocolSession,
                                                                  new AMQShortString("S1"),
                                                                  false,
                                                                  null,
                                                                  true,
-                                                                 _queue);
+                channel.getCreditManager());
 
         Subscription s2 = subscriptionFactory.createSubscription(channel.getChannelId(),
                                                                  protocolSession,
@@ -144,14 +155,14 @@
                                                                  false,
                                                                  null,
                                                                  true,
-                                                                 _queue);
-        _subscribers.addSubscriber(s1);
-        _subscribers.addSubscriber(s2);
+                channel.getCreditManager());
+        _queue.registerSubscription(s1,false);
+        _queue.registerSubscription(s2,false);
         assertTrue(_queueMBean.getActiveConsumerCount() == 3);
         assertTrue(_queueMBean.getConsumerCount() == 3);
 
         s1.close();
-        assertTrue(_queueMBean.getActiveConsumerCount() == 2);
+        assertEquals(2, (int) _queueMBean.getActiveConsumerCount());
         assertTrue(_queueMBean.getConsumerCount() == 3);
     }
 
@@ -204,13 +215,35 @@
 
         }
 
-        AMQMessage msg = message(false, false);
+        IncomingMessage msg = message(false, false);
         long id = msg.getMessageId();
         _queue.clearQueue(_storeContext);
+        ArrayList<AMQQueue> qs = new ArrayList<AMQQueue>();
+        qs.add(_queue);
+        msg.enqueue(qs);
+        msg.routingComplete(_messageStore, new MessageHandleFactory());
+
+        msg.addContentBodyFrame(new ContentChunk()
+        {
+            ByteBuffer _data = ByteBuffer.allocate((int)MESSAGE_SIZE);
+
+            public int getSize()
+            {
+                return (int) MESSAGE_SIZE;
+            }
 
-        msg.enqueue(_queue);
-        msg.routingComplete(_messageStore, _storeContext, new MessageHandleFactory());
-        _queue.process(_storeContext, new QueueEntry(_queue, msg), false);
+            public ByteBuffer getData()
+            {
+                return _data;
+            }
+
+            public void reduceToFit()
+            {
+
+            }
+        });
+        msg.deliverToQueues();
+//        _queue.process(_storeContext, new QueueEntry(_queue, msg), false);
         _queueMBean.viewMessageContent(id);
         try
         {
@@ -223,7 +256,7 @@
         }
     }
 
-    private AMQMessage message(final boolean immediate, boolean persistent) throws AMQException
+    private IncomingMessage message(final boolean immediate, boolean persistent) throws AMQException
     {
         MessagePublishInfo publish = new MessagePublishInfo()
         {
@@ -258,7 +291,10 @@
         contentHeaderBody.bodySize = MESSAGE_SIZE;   // in bytes
         contentHeaderBody.properties = new BasicContentHeaderProperties();
         ((BasicContentHeaderProperties) contentHeaderBody.properties).setDeliveryMode((byte) (persistent ? 2 : 1));
-        return new AMQMessage(_messageStore.getNewMessageId(), publish, _transactionalContext, contentHeaderBody);
+        IncomingMessage msg = new IncomingMessage(_messageStore.getNewMessageId(), publish, _transactionalContext,  _protocolSession);
+        msg.setContentHeaderBody(contentHeaderBody);
+        return msg;
+
     }
 
     @Override
@@ -274,29 +310,33 @@
                                                             new LinkedList<RequiredDeliveryException>()
         );
 
-        _queue = new AMQQueue(new AMQShortString("testQueue"), false, new AMQShortString("AMQueueMBeanTest"), false, _virtualHost);
+        _queue = AMQQueueFactory.createAMQQueueImpl(new AMQShortString("testQueue"), false, new AMQShortString("AMQueueMBeanTest"), false, _virtualHost,
+                                                    null);
         _queueMBean = new AMQQueueMBean(_queue);
 
-        _protocolSession = new TestMinaProtocolSession();
+        _protocolSession = new InternalTestProtocolSession();
     }
 
     private void sendMessages(int messageCount, boolean persistent) throws AMQException
     {
         for (int i = 0; i < messageCount; i++)
         {
-            AMQMessage currentMessage = message(false, persistent);
-            currentMessage.enqueue(_queue);
+            IncomingMessage currentMessage = message(false, persistent);
+            ArrayList<AMQQueue> qs = new ArrayList<AMQQueue>();
+            qs.add(_queue);
+            currentMessage.enqueue(qs);
 
             // route header
-            currentMessage.routingComplete(_messageStore, _storeContext, new MessageHandleFactory());
+            currentMessage.routingComplete(_messageStore, new MessageHandleFactory());
 
             // Add the body so we have somthing to test later
-            currentMessage.addContentBodyFrame(_storeContext,
-                                               _protocolSession.getMethodRegistry()
+            currentMessage.addContentBodyFrame(
+                    _protocolSession.getMethodRegistry()
                                                        .getProtocolVersionMethodConverter()
                                                        .convertToContentChunk(
                                                        new ContentBody(ByteBuffer.allocate((int) MESSAGE_SIZE),
                                                                        MESSAGE_SIZE)));
+            currentMessage.deliverToQueues();
 
 
         }

Modified: incubator/qpid/branches/qpid.0-10/java/build.deps
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/build.deps?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/build.deps (original)
+++ incubator/qpid/branches/qpid.0-10/java/build.deps Thu Aug 14 20:40:49 2008
@@ -30,18 +30,20 @@
     ${mina-filter-ssl} ${commons-codec} ${commons-lang} ${commons-collections} \
     ${commons-configuration}
 client.libs=${common.libs}  ${geronimo-jms} ${junit}
+tools.libs=${client.libs}
 broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \
     ${slf4j-log4j} ${xalan} ${felix.libs}
 
 broker-plugins.libs=${common.libs} ${felix.libs}
 
-junit-toolkit.libs=${log4j} ${junit}
+junit-toolkit.libs=${log4j} ${junit} ${slf4j-api}
 test.libs=${slf4j-log4j} ${junit-toolkit.libs}
 systests.libs=${client.libs} ${test.libs} ${broker.libs}
 perftests.libs=${systests.libs}
 integrationtests.libs=${systests.libs}
 
 client-example.libs=${client.libs}
+testkit.libs=${client.libs}
 
 ibm-icu=lib/com.ibm.icu-3.4.4.jar
 ecl-core-jface=lib/org.eclipse.jface-3.2.0.jar
@@ -73,4 +75,5 @@
 common.test.libs=${test.libs}
 broker.test.libs=${test.libs}
 client.test.libs=${broker.libs} ${test.libs}
+tools.test.libs=${client.test.libs}
 management-eclipse-plugin.test.libs=${systests.libs}

Modified: incubator/qpid/branches/qpid.0-10/java/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/build.xml?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/build.xml (original)
+++ incubator/qpid/branches/qpid.0-10/java/build.xml Thu Aug 14 20:40:49 2008
@@ -22,9 +22,9 @@
 
   <import file="common.xml"/>
 
-  <property name="modules.core"       value="junit-toolkit common broker client"/>
+  <property name="modules.core"       value="junit-toolkit common broker client tools"/>
   <property name="modules.examples"   value="client/example"/>
-  <property name="modules.tests"      value="systests perftests integrationtests"/>
+  <property name="modules.tests"      value="systests perftests integrationtests testkit"/>
   <property name="modules.management" value="management/eclipse-plugin"/>
   <property name="modules.plugin"     value="broker-plugins"/>
 
@@ -109,7 +109,7 @@
     </path>
     <pathconvert property="qpid.jar.classpath" pathsep=" " dirsep="/">
       <path refid="class.path"/>
-      <globmapper from="${build.lib}/*" to="*"/>
+      <globmapper from="${build.lib}${file.separator}*" to="*"/>
     </pathconvert>
 
     <jar destfile="${qpid.jar}">
@@ -132,13 +132,25 @@
 
   <target name="zip" depends="build,prepare" description="build release archive">
     <zip destfile="${release.zip}">
-      <zipfileset dir="${build}" prefix="${project.namever}" excludes="${release.excludes}"/>
+      <zipfileset dir="${build}" prefix="${project.namever}" filemode="755">
+        <include name="bin/*"/>
+	<exclude name="bin/*.txt"/>
+      </zipfileset>
+
+      <zipfileset dir="${build}" prefix="${project.namever}" filemode="644">
+        <include name="bin/*.txt"/>
+      </zipfileset>
+
+      <zipfileset dir="${build}" prefix="${project.namever}" excludes="${release.excludes}" filemode="644" dirmode="755">
+        <exclude name="bin/**"/>
+	<exclude name="**/*.class"/>
+      </zipfileset>
     </zip>
   </target>
 
-  <target name="tar" depends="build,prepare" description="build release archive">
-    <tar destfile="${release.tar}">
-      <tarfileset dir="${build}" prefix="${project.namever}" excludes="${release.excludes}"/>
+  <target name="tar" depends="zip" description="build release archive">
+    <tar destfile="${release.tar}" longfile="gnu" >
+      <zipfileset src="${release.zip}"/>
     </tar>
   </target>
 
@@ -158,6 +170,7 @@
     <iterate target="clean"/>
     <delete dir="${build}"/>
     <delete dir="${release}"/>
+    <delete dir="${tasks.classes}"/>
   </target>
 
 </project>

Modified: incubator/qpid/branches/qpid.0-10/java/client/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/build.xml?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/build.xml (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/build.xml Thu Aug 14 20:40:49 2008
@@ -21,11 +21,10 @@
 <project name="AMQ Client" default="build">
 
   <property name="module.depends" value="common"/>
-  <property name="module.test.depends" value="broker junit-toolkit"/>
 
   <import file="../module.xml"/>
 
-  <property name="output.dir" value="${module.precompiled}/org/apache/qpidity/filter/selector"/>
+  <property name="output.dir" value="${module.precompiled}/org/apache/qpid/filter/selector"/>
 
   <target name="precompile">
     <mkdir dir="${output.dir}"/>

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DeclareQueue.java Thu Aug 14 20:40:49 2008
@@ -1,8 +1,8 @@
 package org.apache.qpid.example.amqpexample.direct;
 
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
 
 /**
  *  This creates a queue a queue and binds it to the

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/DirectProducer.java Thu Aug 14 20:40:49 2008
@@ -2,14 +2,15 @@
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
 
 public class DirectProducer implements MessageListener
 {
@@ -67,16 +68,14 @@
 
         for (int i=0; i<10; i++)
         {
-            session.messageTransfer("amq.direct", MessageAcceptMode.EXPLICIT,MessageAcquireMode.PRE_ACQUIRED);
-            session.header(deliveryProps);
-            session.data("Message " + i);
-            session.endData();
+            session.messageTransfer("amq.direct", MessageAcceptMode.EXPLICIT,MessageAcquireMode.PRE_ACQUIRED,
+                                    new Header(deliveryProps),
+                                    "Message " + i);
         }
 
-        session.messageTransfer("amq.direct", MessageAcceptMode.EXPLICIT, MessageAcquireMode.PRE_ACQUIRED);
-        session.header(deliveryProps);
-        session.data("That's all, folks!");
-        session.endData();
+        session.messageTransfer("amq.direct", MessageAcceptMode.EXPLICIT, MessageAcquireMode.PRE_ACQUIRED,
+                                new Header(deliveryProps),
+                                "That's all, folks!");
 
         // confirm completion
         session.sync();

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/direct/Listener.java Thu Aug 14 20:40:49 2008
@@ -2,14 +2,14 @@
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
 
-import org.apache.qpidity.transport.MessageCreditUnit;
+import org.apache.qpid.transport.MessageCreditUnit;
 
 /**
  * This listens to messages on a queue and terminates

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/DeclareQueue.java Thu Aug 14 20:40:49 2008
@@ -1,8 +1,8 @@
 package org.apache.qpid.example.amqpexample.fanout;
 
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
 
 /**
  *  This creates a queue a queue and binds it to the

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/FannoutProducer.java Thu Aug 14 20:40:49 2008
@@ -1,11 +1,12 @@
 package org.apache.qpid.example.amqpexample.fanout;
 
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
 
 public class FannoutProducer
 {
@@ -34,16 +35,13 @@
 
         for (int i=0; i<10; i++)
         {
-            session.messageTransfer("amq.fanout", MessageAcceptMode.EXPLICIT, MessageAcquireMode.PRE_ACQUIRED);
-            session.header(deliveryProps);
-            session.data("Message " + i);
-            session.endData();
+            session.messageTransfer("amq.fanout", MessageAcceptMode.EXPLICIT, MessageAcquireMode.PRE_ACQUIRED,
+                                    new Header(deliveryProps), "Message " + i);
         }
 
-        session.messageTransfer("amq.fanout", MessageAcceptMode.EXPLICIT, MessageAcquireMode.PRE_ACQUIRED);
-        session.header(deliveryProps);
-        session.data("That's all, folks!");
-        session.endData();
+        session.messageTransfer("amq.fanout", MessageAcceptMode.EXPLICIT, MessageAcquireMode.PRE_ACQUIRED,
+                                new Header(deliveryProps),
+                                "That's all, folks!");
 
         // confirm completion
         session.sync();

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/fanout/Listener.java Thu Aug 14 20:40:49 2008
@@ -2,16 +2,16 @@
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
-import org.apache.qpidity.transport.MessageCreditUnit;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
+import org.apache.qpid.transport.MessageCreditUnit;
 
 /**
  * This listens to messages on a queue and terminates

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicListener.java Thu Aug 14 20:40:49 2008
@@ -2,14 +2,14 @@
 
 import java.nio.ByteBuffer;
 
-import org.apache.qpidity.api.Message;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.nclient.util.MessageListener;
-import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
-import org.apache.qpidity.transport.MessageCreditUnit;
-import org.apache.qpidity.transport.Option;
+import org.apache.qpid.api.Message;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.nclient.util.MessageListener;
+import org.apache.qpid.nclient.util.MessagePartListenerAdapter;
+import org.apache.qpid.transport.MessageCreditUnit;
+import org.apache.qpid.transport.Option;
 
 
 public class TopicListener implements MessageListener
@@ -55,7 +55,7 @@
                                  Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
                                  Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE,
                                  new MessagePartListenerAdapter(this),
-                                 null, Option.NO_OPTION);
+                                 null, Option.NONE);
         // issue credits
         // XXX: need to be able to set to null
         session.messageFlow(queueName, MessageCreditUnit.BYTE, Session.MESSAGE_FLOW_MAX_BYTES);

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/amqpexample/pubsub/TopicPublisher.java Thu Aug 14 20:40:49 2008
@@ -1,11 +1,12 @@
 package org.apache.qpid.example.amqpexample.pubsub;
 
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.qpidity.nclient.Session;
-import org.apache.qpidity.transport.DeliveryProperties;
-import org.apache.qpidity.transport.MessageAcceptMode;
-import org.apache.qpidity.transport.MessageAcquireMode;
+import org.apache.qpid.nclient.Client;
+import org.apache.qpid.nclient.Connection;
+import org.apache.qpid.nclient.Session;
+import org.apache.qpid.transport.DeliveryProperties;
+import org.apache.qpid.transport.Header;
+import org.apache.qpid.transport.MessageAcceptMode;
+import org.apache.qpid.transport.MessageAcquireMode;
 
 public class TopicPublisher
 {
@@ -18,20 +19,17 @@
       deliveryProps.setRoutingKey(routing_key);
 
       for (int i=0; i<5; i++) {
-        session.messageTransfer("amq.topic", MessageAcceptMode.EXPLICIT, MessageAcquireMode.PRE_ACQUIRED);
-        session.header(deliveryProps);
-        session.data("Message " + i);
-        session.endData();
+          session.messageTransfer("amq.topic", MessageAcceptMode.EXPLICIT, MessageAcquireMode.PRE_ACQUIRED,
+                                  new Header(deliveryProps), "Message " + i);
       }
 
     }
 
     public void noMoreMessages(Session session)
     {
-        session.messageTransfer("amq.topic", MessageAcceptMode.EXPLICIT, MessageAcquireMode.PRE_ACQUIRED);
-        session.header(new DeliveryProperties().setRoutingKey("control"));
-        session.data("That's all, folks!");
-        session.endData();
+        session.messageTransfer("amq.topic", MessageAcceptMode.EXPLICIT, MessageAcquireMode.PRE_ACQUIRED,
+                                new Header(new DeliveryProperties().setRoutingKey("control")),
+                                "That's all, folks!");
     }
 
     public static void main(String[] args)

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify Thu Aug 14 20:40:49 2008
@@ -2,12 +2,13 @@
 # The JMS producer doesn't create qeueues so utilising the c++ declare_queues
 cpp=$CPP/direct
 
-direct_consumer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
+direct_consumer_java()
+{
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
 }
 
 direct_producer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
 }
 
 clients $cpp/declare_queues direct_producer_java direct_consumer_java

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_cpp_java Thu Aug 14 20:40:49 2008
@@ -2,7 +2,7 @@
 cpp=$CPP/direct
 
 direct_consumer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
 }
 
 clients $cpp/declare_queues $cpp/direct_producer direct_consumer_java

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_cpp Thu Aug 14 20:40:49 2008
@@ -2,7 +2,7 @@
 cpp=$CPP/direct
 
 direct_producer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
 }
 
 clients $cpp/declare_queues direct_producer_java $cpp/listener

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_java_python Thu Aug 14 20:40:49 2008
@@ -1,8 +1,8 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
-py=$PYTHON/direct
+py=$PYTHON_EXAMPLES/direct
 
 direct_producer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Producer
 }
 
 clients $py/declare_queues.py direct_producer_java $py/direct_consumer.py

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/verify_python_java Thu Aug 14 20:40:49 2008
@@ -1,8 +1,8 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
-py=$PYTHON/direct
+py=$PYTHON_EXAMPLES/direct
 
 direct_consumer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.direct.Consumer
 }
 
 clients $py/declare_queues.py  $py/direct_producer.py direct_consumer_java

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify Thu Aug 14 20:40:49 2008
@@ -3,11 +3,11 @@
 cpp=$CPP/fanout
 
 fanout_listener_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Listener $1
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Listener $1
 }
 
 fanout_producer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Producer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Producer
 }
 
 background "can receive messages" fanout_listener_java fanoutQueue1

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_cpp_java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_cpp_java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_cpp_java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_cpp_java Thu Aug 14 20:40:49 2008
@@ -3,7 +3,7 @@
 cpp=$CPP/fanout
 
 fanout_listener_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Listener $1
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Listener $1
 }
 
 background "can receive messages" fanout_listener_java fanoutQueue1

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_cpp?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_cpp (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_cpp Thu Aug 14 20:40:49 2008
@@ -3,7 +3,7 @@
 cpp=$CPP/fanout
 
 fanout_producer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Producer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Producer
 }
 
 background "Listening" $cpp/listener

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_java_python Thu Aug 14 20:40:49 2008
@@ -1,9 +1,9 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
 # The JMS producer doesn't create qeueues so utilising the c++ declare_queues
-py=$PYTHON/fanout
+py=$PYTHON_EXAMPLES/fanout
 
 fanout_producer_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Producer
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Producer
 }
 
 background "Subscribed" $py/fanout_consumer.py

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_python_java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_python_java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_python_java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/fanout/verify_python_java Thu Aug 14 20:40:49 2008
@@ -1,9 +1,9 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
 # The JMS producer doesn't create qeueues so utilising the c++ declare_queues
-py=$PYTHON/fanout
+py=$PYTHON_EXAMPLES/fanout
 
 fanout_listener_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Listener $1
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.fanout.Listener $1
 }
 
 background "can receive messages" fanout_listener_java fanoutQueue1

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify Thu Aug 14 20:40:49 2008
@@ -2,11 +2,11 @@
 cpp=$CPP/pub-sub
 
 topic_listener_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Listener
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Listener
 }
 
 topic_publisher_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Publisher
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Publisher
 }
 
 background "can receive messages" topic_listener_java

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_cpp_java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_cpp_java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_cpp_java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_cpp_java Thu Aug 14 20:40:49 2008
@@ -2,7 +2,7 @@
 cpp=$CPP/pub-sub
 
 topic_listener_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Listener
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Listener
 }
 
 background "can receive messages" topic_listener_java

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_cpp?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_cpp (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_cpp Thu Aug 14 20:40:49 2008
@@ -2,7 +2,7 @@
 cpp=$CPP/pub-sub
 
 topic_publisher_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Publisher
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Publisher
 }
 
 background "Listening" $cpp/topic_listener

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_java_python Thu Aug 14 20:40:49 2008
@@ -1,8 +1,8 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
-py=$PYTHON/pubsub
+py=$PYTHON_EXAMPLES/pubsub
 
 topic_publisher_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Publisher
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Publisher
 }
 
 background "Queues created" $py/topic_subscriber.py

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/pubsub/verify_python_java Thu Aug 14 20:40:49 2008
@@ -1,8 +1,8 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
-py=$PYTHON/pubsub
+py=$PYTHON_EXAMPLES/pubsub
 
 topic_listener_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Listener
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.pubsub.Listener
 }
 
 background "can receive messages" topic_listener_java

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify Thu Aug 14 20:40:49 2008
@@ -2,11 +2,11 @@
 cpp=$CPP/pub-sub
 
 client_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Client
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Client
 }
 
 server_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Server
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Server
 }
 
 background "can receive messages" server_java

Modified: incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_cpp_java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_cpp_java?rev=686136&r1=686135&r2=686136&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_cpp_java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/requestResponse/verify_cpp_java Thu Aug 14 20:40:49 2008
@@ -1,8 +1,9 @@
 # See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
 cpp=$CPP/request-response
 
-client_java(){
-java -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Client
+client_java()
+{
+java -Dlog4j.configuration=file://"$JAVA"/log4j.xml -cp "$CLASSPATH" org.apache.qpid.example.jmsexample.requestResponse.Client
 }
 
 background "Waiting" $cpp/server