Rolled back revision 561365 and commented out some broken code in ClientSession.java. The trunk should now build.

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

9 files changed, 93 insertions, 167 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
index ddce0db7ff..d59412fdba 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
@@ -46,6 +46,7 @@ import org.apache.qpid.jms.ConnectionURL;
 import org.apache.qpid.jms.FailoverPolicy;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.url.URLSyntaxException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,6 +68,7 @@ import javax.naming.NamingException;
 import javax.naming.Reference;
 import javax.naming.Referenceable;
 import javax.naming.StringRefAddr;
+
 import java.io.IOException;
 import java.net.ConnectException;
 import java.nio.channels.UnresolvedAddressException;
@@ -1146,7 +1148,7 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
         }
         else
         {
-            _logger.info("Not a hard-error connection not closing: " + cause.getMessage());
+            _logger.info("Not a hard-error connection not closing.");
         }
     }
 
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
index 24f5ead2d0..b3fbd1f510 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
@@ -20,14 +20,6 @@
  */
 package org.apache.qpid.client;
 
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.jms.BrokerDetails;
-import org.apache.qpid.jms.ConnectionURL;
-import org.apache.qpid.url.URLHelper;
-import org.apache.qpid.url.URLSyntaxException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashMap;
@@ -35,10 +27,14 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.StringTokenizer;
 
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.jms.BrokerDetails;
+import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.url.URLHelper;
+import org.apache.qpid.url.URLSyntaxException;
+
 public class AMQConnectionURL implements ConnectionURL
 {
-    private static final Logger _logger = LoggerFactory.getLogger(AMQConnectionURL.class);
-
     private String _url;
     private String _failoverMethod;
     private HashMap<String, String> _failoverOptions;
@@ -166,7 +162,7 @@ public class AMQConnectionURL implements ConnectionURL
                 if ((slash != 0) && (fullURL.charAt(slash - 1) == ':'))
                 {
                     throw URLHelper.parseError(slash - 2, fullURL.indexOf('?') - slash + 2,
-                                               "Virtual host looks like a windows path, forward slash not allowed in URL", fullURL);
+                        "Virtual host looks like a windows path, forward slash not allowed in URL", fullURL);
                 }
                 else
                 {
@@ -186,7 +182,7 @@ public class AMQConnectionURL implements ConnectionURL
         if (colonIndex == -1)
         {
             throw URLHelper.parseError(AMQ_PROTOCOL.length() + 3, userinfo.length(),
-                                       "Null password in user information not allowed.", _url);
+                "Null password in user information not allowed.", _url);
         }
         else
         {
@@ -391,14 +387,7 @@ public class AMQConnectionURL implements ConnectionURL
             if (_password != null)
             {
                 sb.append(':');
-                if (_logger.isDebugEnabled())
-                {
-                    sb.append(_password);
-                }
-                else
-                {
-                    sb.append("********");
-                }
+                sb.append(_password);
             }
 
             sb.append('@');
@@ -443,7 +432,7 @@ public class AMQConnectionURL implements ConnectionURL
     public static void main(String[] args) throws URLSyntaxException
     {
         String url2 =
-                "amqp://ritchiem:bob@temp?brokerlist='tcp://localhost:5672;jcp://fancyserver:3000/',failover='roundrobin'";
+            "amqp://ritchiem:bob@temp?brokerlist='tcp://localhost:5672;jcp://fancyserver:3000/',failover='roundrobin'";
         // "amqp://user:pass@clientid/virtualhost?brokerlist='tcp://host:1?option1=\'value\',option2=\'value\';vm://:3?option1=\'value\'',failover='method?option1=\'value\',option2='value''";
 
         ConnectionURL connectionurl2 = new AMQConnectionURL(url2);
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 8f0ad3947a..879578bd6c 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -2319,16 +2319,6 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
         }
     }
 
-    public void declareAndBind(AMQDestination amqd)
-            throws
-            AMQException
-    {
-        AMQProtocolHandler protocolHandler = getProtocolHandler();
-        declareExchange(amqd, protocolHandler, false);
-        AMQShortString queueName = declareQueue(amqd, protocolHandler);
-        bindQueue(queueName, amqd.getRoutingKey(), new FieldTable(), amqd.getExchangeName());
-    }
-
     /**
      * Callers must hold the failover mutex before calling this method.
      *
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
index 862a9be8d4..8f9a84a3a6 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
@@ -1,21 +1,18 @@
 /*
  *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Copyright (c) 2006 The Apache Software Foundation
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 package org.apache.qpid.client.handler;
diff --git a/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java b/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
index 65060d44d2..81228b4cdc 100644
--- a/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
@@ -1,21 +1,18 @@
 /*
  *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Copyright (c) 2006 The Apache Software Foundation
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 package org.apache.qpid.client.handler;
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
index 1da8e7673c..efa9f03527 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
@@ -2,7 +2,6 @@ package org.apache.qpid.nclient.impl;
 
 import org.apache.qpid.nclient.api.Message;
 import org.apache.qpid.nclient.api.MessageReceiver;
-import org.apache.qpid.nclient.api.MessageSender;
 import org.apache.qpidity.Header;
 import org.apache.qpidity.Option;
 import org.apache.qpidity.QpidException;
@@ -15,10 +14,10 @@ public class ClientSession extends Session implements org.apache.qpid.nclient.ap
 	 * Message methods
 	 * ---------------------------------------------------
 	 */
-	public MessageSender createSender(String queueName) throws QpidException
+	/*public MessageSender createSender(String queueName) throws QpidException
 	{
 		return null;
-	}
+	}*/
 
 	public MessageReceiver createReceiver(String queueName, Option... options) throws QpidException
 	{
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
index 9600d1e9d3..d19a6095d5 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
@@ -1,21 +1,18 @@
 /*
  *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Copyright (c) 2006 The Apache Software Foundation
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 package org.apache.qpid.test.unit.client.channelclose;
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
index 9cde24dd92..9c354ee260 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
@@ -21,7 +21,9 @@
 package org.apache.qpid.test.unit.client.forwardall;
 
 import junit.framework.TestCase;
+
 import org.apache.qpid.testutil.VMBrokerSetup;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,7 +34,6 @@ import org.slf4j.LoggerFactory;
 public class CombinedTest extends TestCase
 {
     private static final Logger _logger = LoggerFactory.getLogger(CombinedTest.class);
-    private int run = 0;
 
     protected void setUp() throws Exception
     {
@@ -47,18 +48,14 @@ public class CombinedTest extends TestCase
 
     public void testForwardAll() throws Exception
     {
-        while (run < 10)
-        {
-            int services = 2;
-            ServiceCreator.start("vm://:1", services);
-
-            _logger.info("Starting " + ++run + " client...");
+        int services = 2;
+        ServiceCreator.start("vm://:1", services);
 
-            new Client("vm://:1", services).shutdownWhenComplete();
+        _logger.info("Starting client...");
 
+        new Client("vm://:1", services).shutdownWhenComplete();
 
-            _logger.info("Completed " + run + " successfully!");
-        }
+        _logger.info("Completed successfully!");
     }
 
     public static junit.framework.Test suite()
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
index 1a45773907..df2a38d0fc 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
@@ -21,10 +21,12 @@
 package org.apache.qpid.test.unit.transacted;
 
 import junit.framework.TestCase;
+
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.url.URLSyntaxException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,9 +57,6 @@ public class CommitRollbackTest extends TestCase
 
     private static final Logger _logger = LoggerFactory.getLogger(CommitRollbackTest.class);
     private static final String BROKER = "vm://:1";
-    private boolean _gotone = false;
-    private boolean _gottwo = false;
-    private boolean _gottwoRedelivered = false;
 
     protected void setUp() throws Exception
     {
@@ -341,98 +340,57 @@ public class CommitRollbackTest extends TestCase
      *
      * @throws Exception On error
      */
-    public void testSend2ThenRollback() throws Exception
+    /*public void testSend2ThenRollback() throws Exception
     {
-        int run = 0;
-        while (run < 10)
-        {
-            run++;
-            _logger.info("Run:" + run);
-            assertTrue("session is not transacted", _session.getTransacted());
-            assertTrue("session is not transacted", _pubSession.getTransacted());
-
-            _logger.info("sending two test messages");
-            _publisher.send(_pubSession.createTextMessage("1"));
-            _publisher.send(_pubSession.createTextMessage("2"));
-            _pubSession.commit();
-
-            _logger.info("getting test message");
-            assertEquals("1", ((TextMessage) _consumer.receive(1000)).getText());
-
-            _logger.info("rolling back");
-            _session.rollback();
-
-            _logger.info("receiving result");
-            Message result = _consumer.receive(1000);
-
-            assertNotNull("test message was consumed and rolled back, but is gone", result);
-
-            // Message Order is:
+        assertTrue("session is not transacted", _session.getTransacted());
+        assertTrue("session is not transacted", _pubSession.getTransacted());
 
-            // Send 1 , 2
-            // Retrieve 1 and then rollback
-            // Receieve 1 (redelivered) , 2 (may or may not be redelivered??)
+        _logger.info("sending two test messages");
+        _publisher.send(_pubSession.createTextMessage("1"));
+        _publisher.send(_pubSession.createTextMessage("2"));
+        _pubSession.commit();
 
-            verifyMessages(result);
+        _logger.info("getting test message");
+        assertEquals("1", ((TextMessage) _consumer.receive(1000)).getText());
 
-            // Occassionally get message 2 first!
-//            assertEquals("Should get message one first", "1", ((TextMessage) result).getText());
-//            assertTrue("Message is not marked as redelivered", result.getJMSRedelivered());
-//
-//            result = _consumer.receive(1000);
-//            assertEquals("Second message should be message 2", "2", ((TextMessage) result).getText());
-//            assertTrue("Message is not marked as redelivered", result.getJMSRedelivered());
-//
-//            result = _consumer.receive(1000);
-//            assertNull("There should be no more messages", result);
+        _logger.info("rolling back");
+        _session.rollback();
 
-            _session.commit();
-        }
-    }
+        _logger.info("receiving result");
+        Message result = _consumer.receive(1000);
 
-    private void verifyMessages(Message result) throws JMSException
-    {
+        assertNotNull("test message was consumed and rolled back, but is gone", result);
 
-        if (result == null)
-        {
-            assertTrue("Didn't receive redelivered message one", _gotone);
-            assertTrue("Didn't receive message two at all", _gottwo | _gottwoRedelivered);
-            _gotone = false;
-            _gottwo = false;
-            _gottwoRedelivered = false;
-            return;
-        }
 
-        if (((TextMessage) result).getText().equals("1"))
+        if (((TextMessage) result).getText().equals("2"))
         {
-            _logger.info("Got 1 redelivered");
-            assertTrue("Message is not marked as redelivered", result.getJMSRedelivered());
-            assertFalse("Already received message one", _gotone);
-            _gotone = true;
+            assertTrue("Messasge is marked as redelivered", !result.getJMSRedelivered());
 
+            result = _consumer.receive(1000);
+            assertEquals("1", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered", result.getJMSRedelivered());
         }
         else
         {
+            assertEquals("1", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered", result.getJMSRedelivered());
+            result = _consumer.receive(1000);
+            assertNotNull("test message was consumed and rolled back, but is gone", result);
             assertEquals("2", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered", result.getJMSRedelivered());
+        }
 
-            if (result.getJMSRedelivered())
-            {
-                _logger.info("Got 2 redelivered, message was prefetched");
-                assertFalse("Already received message redelivered two", _gottwoRedelivered);
-
-                _gottwoRedelivered = true;
-            }
-            else
-            {
-                _logger.warn("Got 2, message prefetched wasn't cleared or messages was in transit when rollback occured");                
-                assertFalse("Already received message two", _gottwo);
+        result = _consumer.receive(1000);
 
-                _gottwo = true;
-            }
+        if (result != null)
+        {
+            assertEquals("2", ((TextMessage) result).getText());
+            assertTrue("Messasge is not marked as redelivered", result.getJMSRedelivered());
+            result = _consumer.receive(1000);
         }
 
-        verifyMessages(_consumer.receive(1000));
-    }
+        assertNull("test message should be null", result);
+    }*/
 
     public void testSend2ThenCloseAfter1andTryAgain() throws Exception
     {
@@ -459,12 +417,12 @@ public class CommitRollbackTest extends TestCase
 
         _logger.info("receiving result");
 
-// NOTE: Both msg 1 & 2 will be marked as redelivered as they have both will have been rejected.
-// Only the occasion where it is not rejected will it mean it hasn't arrived at the client yet.
+        // NOTE: Both msg 1 & 2 will be marked as redelivered as they have both will have been rejected.
+        // Only the occasion where it is not rejected will it mean it hasn't arrived at the client yet.
         result = _consumer.receive(1000);
         assertNotNull("test message was consumed and rolled back, but is gone", result);
 
-// The first message back will be either 1 or 2 being redelivered
+        // The first message back will be either 1 or 2 being redelivered
         if (result.getJMSRedelivered())
         {
             assertTrue("Messasge is not marked as redelivered" + result, result.getJMSRedelivered());