6 files changed, 427 insertions, 427 deletions
diff --git a/java/broker/test/lib/README b/java/broker/test/lib/README
index a75673935e..aa57bb004b 100644
--- a/java/broker/test/lib/README
+++ b/java/broker/test/lib/README
@@ -1 +1 @@
-Junit copied here momentarily.
+Junit copied here momentarily.
diff --git a/java/client/src/org/apache/qpid/client/AMQQueueSessionAdaptor.java b/java/client/src/org/apache/qpid/client/AMQQueueSessionAdaptor.java
index 759b4405eb..5cbedb1dce 100644
--- a/java/client/src/org/apache/qpid/client/AMQQueueSessionAdaptor.java
+++ b/java/client/src/org/apache/qpid/client/AMQQueueSessionAdaptor.java
@@ -1,176 +1,176 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * 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
- *
- *    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;
-
-import javax.jms.*;
-import javax.jms.IllegalStateException;
-import java.io.Serializable;
-
-/**
- * Need this adaptor class to conform to JMS spec and throw IllegalStateException
- * from createDurableSubscriber, unsubscribe, createTopic & createTemporaryTopic
- */
-public class AMQQueueSessionAdaptor implements QueueSession
-{
-    //holds a session for delegation
-    protected final AMQSession _session;
-
-    /**
-     * Construct an adaptor with a session to wrap
-     * @param session
-     */
-    public AMQQueueSessionAdaptor(Session session)
-    {
-        _session = (AMQSession) session;
-    }
-
-    public TemporaryQueue createTemporaryQueue() throws JMSException {
-        return _session.createTemporaryQueue();
-    }
-
-    public Queue createQueue(String string) throws JMSException {
-        return _session.createQueue(string);
-    }
-
-    public QueueReceiver createReceiver(Queue queue) throws JMSException {
-        return _session.createReceiver(queue);
-    }
-
-    public QueueReceiver createReceiver(Queue queue, String string) throws JMSException {
-        return _session.createReceiver(queue, string);
-    }
-
-    public QueueSender createSender(Queue queue) throws JMSException {
-        return _session.createSender(queue);
-    }
-
-    public QueueBrowser createBrowser(Queue queue) throws JMSException {
-        return _session.createBrowser(queue);
-    }
-
-    public QueueBrowser createBrowser(Queue queue, String string) throws JMSException {
-        return _session.createBrowser(queue, string);
-    }
-
-    public BytesMessage createBytesMessage() throws JMSException {
-        return _session.createBytesMessage();
-    }
-
-    public MapMessage createMapMessage() throws JMSException {
-        return _session.createMapMessage();
-    }
-
-    public Message createMessage() throws JMSException {
-        return _session.createMessage();
-    }
-
-    public ObjectMessage createObjectMessage() throws JMSException {
-        return _session.createObjectMessage();
-    }
-
-    public ObjectMessage createObjectMessage(Serializable serializable) throws JMSException {
-        return _session.createObjectMessage(serializable);
-    }
-
-    public StreamMessage createStreamMessage() throws JMSException {
-        return _session.createStreamMessage();
-    }
-
-    public TextMessage createTextMessage() throws JMSException {
-        return _session.createTextMessage();
-    }
-
-    public TextMessage createTextMessage(String string) throws JMSException {
-        return _session.createTextMessage(string);
-    }
-
-    public boolean getTransacted() throws JMSException {
-        return _session.getTransacted();
-    }
-
-    public int getAcknowledgeMode() throws JMSException {
-       return _session.getAcknowledgeMode();
-    }
-
-    public void commit() throws JMSException {
-        _session.commit();
-    }
-
-    public void rollback() throws JMSException {
-        _session.rollback();
-    }
-
-    public void close() throws JMSException {
-        _session.close();
-    }
-
-    public void recover() throws JMSException {
-        _session.recover();
-    }
-
-    public MessageListener getMessageListener() throws JMSException {
-       return _session.getMessageListener();
-    }
-
-    public void setMessageListener(MessageListener messageListener) throws JMSException {
-        _session.setMessageListener(messageListener);
-    }
-
-    public void run() {
-        _session.run();
-    }
-
-    public MessageProducer createProducer(Destination destination) throws JMSException {
-        return _session.createProducer(destination);
-    }
-
-    public MessageConsumer createConsumer(Destination destination) throws JMSException {
-        return _session.createConsumer(destination);
-    }
-
-    public MessageConsumer createConsumer(Destination destination, String string) throws JMSException {
-        return _session.createConsumer(destination,string);
-    }
-
-    public MessageConsumer createConsumer(Destination destination, String string, boolean b) throws JMSException {
-        return _session.createConsumer(destination,string,b);
-    }
-
-    //The following methods cannot be called from a QueueSession as per JMS spec
-
-    public Topic createTopic(String string) throws JMSException {
-        throw new IllegalStateException("Cannot call createTopic from QueueSession");
-    }
-
-    public TopicSubscriber createDurableSubscriber(Topic topic, String string) throws JMSException {
-        throw new IllegalStateException("Cannot call createDurableSubscriber from QueueSession");
-    }
-
-    public TopicSubscriber createDurableSubscriber(Topic topic, String string, String string1, boolean b) throws JMSException {
-         throw new IllegalStateException("Cannot call createDurableSubscriber from QueueSession");
-    }
-
-    public TemporaryTopic createTemporaryTopic() throws JMSException {
-        throw new IllegalStateException("Cannot call createTemporaryTopic from QueueSession");
-    }
-
-    public void unsubscribe(String string) throws JMSException {
-        throw new IllegalStateException("Cannot call unsubscribe from QueueSession");
-    }
-
-}
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * 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
+ *
+ *    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;
+
+import javax.jms.*;
+import javax.jms.IllegalStateException;
+import java.io.Serializable;
+
+/**
+ * Need this adaptor class to conform to JMS spec and throw IllegalStateException
+ * from createDurableSubscriber, unsubscribe, createTopic & createTemporaryTopic
+ */
+public class AMQQueueSessionAdaptor implements QueueSession
+{
+    //holds a session for delegation
+    protected final AMQSession _session;
+
+    /**
+     * Construct an adaptor with a session to wrap
+     * @param session
+     */
+    public AMQQueueSessionAdaptor(Session session)
+    {
+        _session = (AMQSession) session;
+    }
+
+    public TemporaryQueue createTemporaryQueue() throws JMSException {
+        return _session.createTemporaryQueue();
+    }
+
+    public Queue createQueue(String string) throws JMSException {
+        return _session.createQueue(string);
+    }
+
+    public QueueReceiver createReceiver(Queue queue) throws JMSException {
+        return _session.createReceiver(queue);
+    }
+
+    public QueueReceiver createReceiver(Queue queue, String string) throws JMSException {
+        return _session.createReceiver(queue, string);
+    }
+
+    public QueueSender createSender(Queue queue) throws JMSException {
+        return _session.createSender(queue);
+    }
+
+    public QueueBrowser createBrowser(Queue queue) throws JMSException {
+        return _session.createBrowser(queue);
+    }
+
+    public QueueBrowser createBrowser(Queue queue, String string) throws JMSException {
+        return _session.createBrowser(queue, string);
+    }
+
+    public BytesMessage createBytesMessage() throws JMSException {
+        return _session.createBytesMessage();
+    }
+
+    public MapMessage createMapMessage() throws JMSException {
+        return _session.createMapMessage();
+    }
+
+    public Message createMessage() throws JMSException {
+        return _session.createMessage();
+    }
+
+    public ObjectMessage createObjectMessage() throws JMSException {
+        return _session.createObjectMessage();
+    }
+
+    public ObjectMessage createObjectMessage(Serializable serializable) throws JMSException {
+        return _session.createObjectMessage(serializable);
+    }
+
+    public StreamMessage createStreamMessage() throws JMSException {
+        return _session.createStreamMessage();
+    }
+
+    public TextMessage createTextMessage() throws JMSException {
+        return _session.createTextMessage();
+    }
+
+    public TextMessage createTextMessage(String string) throws JMSException {
+        return _session.createTextMessage(string);
+    }
+
+    public boolean getTransacted() throws JMSException {
+        return _session.getTransacted();
+    }
+
+    public int getAcknowledgeMode() throws JMSException {
+       return _session.getAcknowledgeMode();
+    }
+
+    public void commit() throws JMSException {
+        _session.commit();
+    }
+
+    public void rollback() throws JMSException {
+        _session.rollback();
+    }
+
+    public void close() throws JMSException {
+        _session.close();
+    }
+
+    public void recover() throws JMSException {
+        _session.recover();
+    }
+
+    public MessageListener getMessageListener() throws JMSException {
+       return _session.getMessageListener();
+    }
+
+    public void setMessageListener(MessageListener messageListener) throws JMSException {
+        _session.setMessageListener(messageListener);
+    }
+
+    public void run() {
+        _session.run();
+    }
+
+    public MessageProducer createProducer(Destination destination) throws JMSException {
+        return _session.createProducer(destination);
+    }
+
+    public MessageConsumer createConsumer(Destination destination) throws JMSException {
+        return _session.createConsumer(destination);
+    }
+
+    public MessageConsumer createConsumer(Destination destination, String string) throws JMSException {
+        return _session.createConsumer(destination,string);
+    }
+
+    public MessageConsumer createConsumer(Destination destination, String string, boolean b) throws JMSException {
+        return _session.createConsumer(destination,string,b);
+    }
+
+    //The following methods cannot be called from a QueueSession as per JMS spec
+
+    public Topic createTopic(String string) throws JMSException {
+        throw new IllegalStateException("Cannot call createTopic from QueueSession");
+    }
+
+    public TopicSubscriber createDurableSubscriber(Topic topic, String string) throws JMSException {
+        throw new IllegalStateException("Cannot call createDurableSubscriber from QueueSession");
+    }
+
+    public TopicSubscriber createDurableSubscriber(Topic topic, String string, String string1, boolean b) throws JMSException {
+         throw new IllegalStateException("Cannot call createDurableSubscriber from QueueSession");
+    }
+
+    public TemporaryTopic createTemporaryTopic() throws JMSException {
+        throw new IllegalStateException("Cannot call createTemporaryTopic from QueueSession");
+    }
+
+    public void unsubscribe(String string) throws JMSException {
+        throw new IllegalStateException("Cannot call unsubscribe from QueueSession");
+    }
+
+}
diff --git a/java/client/src/org/apache/qpid/client/AMQTopicSessionAdaptor.java b/java/client/src/org/apache/qpid/client/AMQTopicSessionAdaptor.java
index 9cbf7924b3..90e9b9a96f 100644
--- a/java/client/src/org/apache/qpid/client/AMQTopicSessionAdaptor.java
+++ b/java/client/src/org/apache/qpid/client/AMQTopicSessionAdaptor.java
@@ -1,166 +1,166 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * 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
- *
- *    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;
-
-import javax.jms.*;
-import javax.jms.IllegalStateException;
-import java.io.Serializable;
-
-public class AMQTopicSessionAdaptor implements TopicSession
-{
-    protected final AMQSession _session;
-
-    public AMQTopicSessionAdaptor(Session session)
-    {
-        _session = (AMQSession) session;
-    }
-
-    public Topic createTopic(String string) throws JMSException {
-        return _session.createTopic(string);
-    }
-
-    public TopicSubscriber createSubscriber(Topic topic) throws JMSException {
-        return _session.createSubscriber(topic);
-    }
-
-    public TopicSubscriber createSubscriber(Topic topic, String string, boolean b) throws JMSException {
-        return _session.createSubscriber(topic, string, b);
-    }
-
-    public TopicSubscriber createDurableSubscriber(Topic topic, String string) throws JMSException {
-        return _session.createDurableSubscriber(topic, string);
-    }
-
-    public TopicSubscriber createDurableSubscriber(Topic topic, String string, String string1, boolean b) throws JMSException {
-        return _session.createDurableSubscriber(topic, string, string1, b);
-    }
-
-    public TopicPublisher createPublisher(Topic topic) throws JMSException {
-        return _session.createPublisher(topic);
-    }
-
-    public TemporaryTopic createTemporaryTopic() throws JMSException {
-        return _session.createTemporaryTopic();
-    }
-
-    public void unsubscribe(String string) throws JMSException {
-        _session.unsubscribe(string);
-    }
-
-    public BytesMessage createBytesMessage() throws JMSException {
-        return _session.createBytesMessage();
-    }
-
-    public MapMessage createMapMessage() throws JMSException {
-        return _session.createMapMessage();
-    }
-
-    public Message createMessage() throws JMSException {
-        return _session.createMessage();
-    }
-
-    public ObjectMessage createObjectMessage() throws JMSException {
-        return _session.createObjectMessage();
-    }
-
-    public ObjectMessage createObjectMessage(Serializable serializable) throws JMSException {
-        return _session.createObjectMessage();
-    }
-
-    public StreamMessage createStreamMessage() throws JMSException {
-        return _session.createStreamMessage();
-    }
-
-    public TextMessage createTextMessage() throws JMSException {
-        return _session.createTextMessage();
-    }
-
-    public TextMessage createTextMessage(String string) throws JMSException {
-        return _session.createTextMessage();
-    }
-
-    public boolean getTransacted() throws JMSException {
-        return _session.getTransacted();
-    }
-
-    public int getAcknowledgeMode() throws JMSException {
-        return _session.getAcknowledgeMode();
-    }
-
-    public void commit() throws JMSException {
-        _session.commit();
-    }
-
-    public void rollback() throws JMSException {
-        _session.rollback();
-    }
-
-    public void close() throws JMSException {
-        _session.close();
-    }
-
-    public void recover() throws JMSException {
-        _session.recover();
-    }
-
-    public MessageListener getMessageListener() throws JMSException {
-        return _session.getMessageListener();
-    }
-
-    public void setMessageListener(MessageListener messageListener) throws JMSException {
-        _session.setMessageListener(messageListener);
-    }
-
-    public void run() {
-        _session.run();
-    }
-
-    public MessageProducer createProducer(Destination destination) throws JMSException {
-        return _session.createProducer(destination);
-    }
-
-    public MessageConsumer createConsumer(Destination destination) throws JMSException {
-        return _session.createConsumer(destination);
-    }
-
-    public MessageConsumer createConsumer(Destination destination, String string) throws JMSException {
-        return _session.createConsumer(destination, string);
-    }
-
-    public MessageConsumer createConsumer(Destination destination, String string, boolean b) throws JMSException {
-        return _session.createConsumer(destination, string, b);
-    }
-
-    //The following methods cannot be called from a TopicSession as per JMS spec
-    public Queue createQueue(String string) throws JMSException {
-        throw new IllegalStateException("Cannot call createQueue from TopicSession");
-    }
-
-    public QueueBrowser createBrowser(Queue queue) throws JMSException {
-        throw new IllegalStateException("Cannot call createBrowser from TopicSession");
-    }
-
-    public QueueBrowser createBrowser(Queue queue, String string) throws JMSException {
-        throw new IllegalStateException("Cannot call createBrowser from TopicSession");
-    }
-
-    public TemporaryQueue createTemporaryQueue() throws JMSException {
-        throw new IllegalStateException("Cannot call createTemporaryQueue from TopicSession");
-    }
-
-}
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * 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
+ *
+ *    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;
+
+import javax.jms.*;
+import javax.jms.IllegalStateException;
+import java.io.Serializable;
+
+public class AMQTopicSessionAdaptor implements TopicSession
+{
+    protected final AMQSession _session;
+
+    public AMQTopicSessionAdaptor(Session session)
+    {
+        _session = (AMQSession) session;
+    }
+
+    public Topic createTopic(String string) throws JMSException {
+        return _session.createTopic(string);
+    }
+
+    public TopicSubscriber createSubscriber(Topic topic) throws JMSException {
+        return _session.createSubscriber(topic);
+    }
+
+    public TopicSubscriber createSubscriber(Topic topic, String string, boolean b) throws JMSException {
+        return _session.createSubscriber(topic, string, b);
+    }
+
+    public TopicSubscriber createDurableSubscriber(Topic topic, String string) throws JMSException {
+        return _session.createDurableSubscriber(topic, string);
+    }
+
+    public TopicSubscriber createDurableSubscriber(Topic topic, String string, String string1, boolean b) throws JMSException {
+        return _session.createDurableSubscriber(topic, string, string1, b);
+    }
+
+    public TopicPublisher createPublisher(Topic topic) throws JMSException {
+        return _session.createPublisher(topic);
+    }
+
+    public TemporaryTopic createTemporaryTopic() throws JMSException {
+        return _session.createTemporaryTopic();
+    }
+
+    public void unsubscribe(String string) throws JMSException {
+        _session.unsubscribe(string);
+    }
+
+    public BytesMessage createBytesMessage() throws JMSException {
+        return _session.createBytesMessage();
+    }
+
+    public MapMessage createMapMessage() throws JMSException {
+        return _session.createMapMessage();
+    }
+
+    public Message createMessage() throws JMSException {
+        return _session.createMessage();
+    }
+
+    public ObjectMessage createObjectMessage() throws JMSException {
+        return _session.createObjectMessage();
+    }
+
+    public ObjectMessage createObjectMessage(Serializable serializable) throws JMSException {
+        return _session.createObjectMessage();
+    }
+
+    public StreamMessage createStreamMessage() throws JMSException {
+        return _session.createStreamMessage();
+    }
+
+    public TextMessage createTextMessage() throws JMSException {
+        return _session.createTextMessage();
+    }
+
+    public TextMessage createTextMessage(String string) throws JMSException {
+        return _session.createTextMessage();
+    }
+
+    public boolean getTransacted() throws JMSException {
+        return _session.getTransacted();
+    }
+
+    public int getAcknowledgeMode() throws JMSException {
+        return _session.getAcknowledgeMode();
+    }
+
+    public void commit() throws JMSException {
+        _session.commit();
+    }
+
+    public void rollback() throws JMSException {
+        _session.rollback();
+    }
+
+    public void close() throws JMSException {
+        _session.close();
+    }
+
+    public void recover() throws JMSException {
+        _session.recover();
+    }
+
+    public MessageListener getMessageListener() throws JMSException {
+        return _session.getMessageListener();
+    }
+
+    public void setMessageListener(MessageListener messageListener) throws JMSException {
+        _session.setMessageListener(messageListener);
+    }
+
+    public void run() {
+        _session.run();
+    }
+
+    public MessageProducer createProducer(Destination destination) throws JMSException {
+        return _session.createProducer(destination);
+    }
+
+    public MessageConsumer createConsumer(Destination destination) throws JMSException {
+        return _session.createConsumer(destination);
+    }
+
+    public MessageConsumer createConsumer(Destination destination, String string) throws JMSException {
+        return _session.createConsumer(destination, string);
+    }
+
+    public MessageConsumer createConsumer(Destination destination, String string, boolean b) throws JMSException {
+        return _session.createConsumer(destination, string, b);
+    }
+
+    //The following methods cannot be called from a TopicSession as per JMS spec
+    public Queue createQueue(String string) throws JMSException {
+        throw new IllegalStateException("Cannot call createQueue from TopicSession");
+    }
+
+    public QueueBrowser createBrowser(Queue queue) throws JMSException {
+        throw new IllegalStateException("Cannot call createBrowser from TopicSession");
+    }
+
+    public QueueBrowser createBrowser(Queue queue, String string) throws JMSException {
+        throw new IllegalStateException("Cannot call createBrowser from TopicSession");
+    }
+
+    public TemporaryQueue createTemporaryQueue() throws JMSException {
+        throw new IllegalStateException("Cannot call createTemporaryQueue from TopicSession");
+    }
+
+}
diff --git a/java/client/src/org/apache/qpid/client/QueueReceiverAdaptor.java b/java/client/src/org/apache/qpid/client/QueueReceiverAdaptor.java
index fc04181e19..68e37c9557 100644
--- a/java/client/src/org/apache/qpid/client/QueueReceiverAdaptor.java
+++ b/java/client/src/org/apache/qpid/client/QueueReceiverAdaptor.java
@@ -1,83 +1,83 @@
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * 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
- *
- *    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;
-
-import javax.jms.*;
-
-/**
- * Class that wraps a MessageConsumer for backwards JMS compatibility
- * Returned by methods in AMQSession etc
- */
-public class QueueReceiverAdaptor implements QueueReceiver {
-
-    protected MessageConsumer _consumer;
-    protected Queue _queue;
-
-    protected QueueReceiverAdaptor(Queue queue, MessageConsumer consumer)
-    {
-        _consumer = consumer;
-        _queue = queue;
-    }
-
-    public String getMessageSelector() throws JMSException
-    {
-        return _consumer.getMessageSelector();
-    }
-
-    public MessageListener getMessageListener() throws JMSException
-    {
-        return _consumer.getMessageListener();
-    }
-
-    public void setMessageListener(MessageListener messageListener) throws JMSException
-    {
-       _consumer.setMessageListener(messageListener);
-    }
-
-    public Message receive() throws JMSException
-    {
-        return _consumer.receive();
-    }
-
-    public Message receive(long l) throws JMSException
-    {
-        return _consumer.receive(l);
-    }
-
-    public Message receiveNoWait() throws JMSException
-    {
-        return _consumer.receiveNoWait();
-    }
-
-    public void close() throws JMSException
-    {
-        _consumer.close();
-    }
-
-    /**
-     * Return the queue associated with this receiver
-     * @return
-     * @throws JMSException
-     */
-    public Queue getQueue() throws JMSException
-    {
-       return _queue;
-    }
-
-
-}
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * 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
+ *
+ *    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;
+
+import javax.jms.*;
+
+/**
+ * Class that wraps a MessageConsumer for backwards JMS compatibility
+ * Returned by methods in AMQSession etc
+ */
+public class QueueReceiverAdaptor implements QueueReceiver {
+
+    protected MessageConsumer _consumer;
+    protected Queue _queue;
+
+    protected QueueReceiverAdaptor(Queue queue, MessageConsumer consumer)
+    {
+        _consumer = consumer;
+        _queue = queue;
+    }
+
+    public String getMessageSelector() throws JMSException
+    {
+        return _consumer.getMessageSelector();
+    }
+
+    public MessageListener getMessageListener() throws JMSException
+    {
+        return _consumer.getMessageListener();
+    }
+
+    public void setMessageListener(MessageListener messageListener) throws JMSException
+    {
+       _consumer.setMessageListener(messageListener);
+    }
+
+    public Message receive() throws JMSException
+    {
+        return _consumer.receive();
+    }
+
+    public Message receive(long l) throws JMSException
+    {
+        return _consumer.receive(l);
+    }
+
+    public Message receiveNoWait() throws JMSException
+    {
+        return _consumer.receiveNoWait();
+    }
+
+    public void close() throws JMSException
+    {
+        _consumer.close();
+    }
+
+    /**
+     * Return the queue associated with this receiver
+     * @return
+     * @throws JMSException
+     */
+    public Queue getQueue() throws JMSException
+    {
+       return _queue;
+    }
+
+
+}
diff --git a/java/client/src/org/apache/qpid/jndi/ReadOnlyContext.java b/java/client/src/org/apache/qpid/jndi/ReadOnlyContext.java
index b721aefc87..1e96e6cf35 100644
--- a/java/client/src/org/apache/qpid/jndi/ReadOnlyContext.java
+++ b/java/client/src/org/apache/qpid/jndi/ReadOnlyContext.java
@@ -46,7 +46,7 @@ import java.util.Map;
  * String envEntry2 = (String) componentContext.lookup("env/myEntry2");
  * </code>
  *
- * @version $Revision: 1.2 $ $Date: 2005/08/27 03:52:39 $
+ * @version $Revision$ $Date$
  */
 public class ReadOnlyContext implements Context, Serializable
 {
diff --git a/java/client/test/example_ build.xml b/java/client/test/example_build.xml
index 25ddfd71ec..25ddfd71ec 100644
--- a/java/client/test/example_ build.xml
+++ b/java/client/test/example_build.xml