fixed compilation errors

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

19 files changed, 70 insertions, 69 deletions

diff --git a/java/client/src/main/java/org/apache/qpidity/FieldTable.java b/java/client/src/main/java/org/apache/qpidity/FieldTable.java
deleted file mode 100644
index f752bb3373..0000000000
--- a/java/client/src/main/java/org/apache/qpidity/FieldTable.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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
- * 
- *   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.qpidity;
-
-/**
- * 
- */
-public interface FieldTable
-{
-}               
diff --git a/java/client/src/main/java/org/apache/qpidity/Connection.java b/java/client/src/main/java/org/apache/qpidity/client/Connection.java
index cb56ee954c..d680cad3f0 100644
--- a/java/client/src/main/java/org/apache/qpidity/Connection.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/Connection.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity;
+package org.apache.qpidity.client;
 
 
 import java.net.URL;
diff --git a/java/client/src/main/java/org/apache/qpidity/DtxSession.java b/java/client/src/main/java/org/apache/qpidity/client/DtxSession.java
index 127fe4d1a7..a9032d5d44 100644
--- a/java/client/src/main/java/org/apache/qpidity/DtxSession.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/DtxSession.java
@@ -16,10 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity;
+package org.apache.qpidity.client;
 
 import javax.transaction.xa.Xid;
 
+import org.apache.qpidity.Option;
+import org.apache.qpidity.QpidException;
+
 /**
  * This session�s resources are control under the scope of a distributed transaction.
  */
diff --git a/java/client/src/main/java/org/apache/qpidity/ExceptionListener.java b/java/client/src/main/java/org/apache/qpidity/client/ExceptionListener.java
index e3ca8989ef..e2faede165 100644
--- a/java/client/src/main/java/org/apache/qpidity/ExceptionListener.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/ExceptionListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity;
+package org.apache.qpidity.client;
 
 import org.apache.qpidity.QpidException;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/MessageListener.java b/java/client/src/main/java/org/apache/qpidity/client/MessageListener.java
index 5a1a526f0b..eab9d70f00 100644
--- a/java/client/src/main/java/org/apache/qpidity/MessageListener.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/MessageListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity;
+package org.apache.qpidity.client;
 
 import org.apache.qpidity.api.Message;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/MessagePartListener.java b/java/client/src/main/java/org/apache/qpidity/client/MessagePartListener.java
index b370efff17..633c77ecac 100644
--- a/java/client/src/main/java/org/apache/qpidity/MessagePartListener.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/MessagePartListener.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity;
+package org.apache.qpidity.client;
 
 import org.apache.qpidity.Header;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/Session.java b/java/client/src/main/java/org/apache/qpidity/client/Session.java
index 6f283cf203..b2d7c5705e 100644
--- a/java/client/src/main/java/org/apache/qpidity/Session.java
+++ b/java/client/src/main/java/org/apache/qpidity/client/Session.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpidity;
+package org.apache.qpidity.client;
 
 import java.util.Map;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/impl/ClientSession.java b/java/client/src/main/java/org/apache/qpidity/impl/ClientSession.java
index 1baf063ef3..b197cde3bb 100644
--- a/java/client/src/main/java/org/apache/qpidity/impl/ClientSession.java
+++ b/java/client/src/main/java/org/apache/qpidity/impl/ClientSession.java
@@ -4,13 +4,13 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.qpidity.api.Message;
-import org.apache.qpidity.MessagePartListener;
+import org.apache.qpidity.client.MessagePartListener;
 import org.apache.qpidity.*;
 
 /**
  * Implements a Qpid Sesion. 
  */
-public class ClientSession implements org.apache.qpidity.Session
+public class ClientSession implements org.apache.qpidity.client.Session
 {
 
 	Map<String,MessagePartListener> messagListeners = new HashMap<String,MessagePartListener>();
diff --git a/java/client/src/main/java/org/apache/qpidity/impl/ClientSessionDelegate.java b/java/client/src/main/java/org/apache/qpidity/impl/ClientSessionDelegate.java
index 00b4a65fee..6a36d694c6 100644
--- a/java/client/src/main/java/org/apache/qpidity/impl/ClientSessionDelegate.java
+++ b/java/client/src/main/java/org/apache/qpidity/impl/ClientSessionDelegate.java
@@ -2,7 +2,7 @@ package org.apache.qpidity.impl;
 
 import org.apache.qpidity.CommonSessionDelegate;
 import org.apache.qpidity.ExchangeQueryOk;
-import org.apache.qpidity.Session;
+import org.apache.qpidity.client.Session;
 
 
 public class ClientSessionDelegate extends CommonSessionDelegate
diff --git a/java/client/src/main/java/org/apache/qpidity/impl/MessagePartListenerAdapter.java b/java/client/src/main/java/org/apache/qpidity/impl/MessagePartListenerAdapter.java
index 30d6710cfe..f05f2c0e76 100644
--- a/java/client/src/main/java/org/apache/qpidity/impl/MessagePartListenerAdapter.java
+++ b/java/client/src/main/java/org/apache/qpidity/impl/MessagePartListenerAdapter.java
@@ -1,9 +1,9 @@
 package org.apache.qpidity.impl;
 
-import org.apache.qpidity.MessagePartListener;
-import org.apache.qpidity.MessageListener;
 import org.apache.qpidity.Header;
 import org.apache.qpidity.api.Message;
+import org.apache.qpidity.client.MessageListener;
+import org.apache.qpidity.client.MessagePartListener;
 
 public class MessagePartListenerAdapter implements MessagePartListener
 {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java
index 818b146491..bcd3845230 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java
@@ -86,7 +86,7 @@ public class ConnectionImpl implements Connection, QueueConnection, TopicConnect
     /**
      * The QpidConeection instance that is mapped with thie JMS connection
      */
-    org.apache.qpidity.Connection _qpidConnection;
+    org.apache.qpidity.client.Connection _qpidConnection;
 
     /**
      * This is the exception listener for this qpid connection.
@@ -370,7 +370,15 @@ public class ConnectionImpl implements Connection, QueueConnection, TopicConnect
     public synchronized QueueSession createQueueSession(boolean transacted, int acknowledgeMode) throws JMSException
     {
         checkNotClosed();
-        QueueSessionImpl queueSession = new QueueSessionImpl(this, transacted, acknowledgeMode);
+        QueueSessionImpl queueSession = null;
+        try
+        {
+            queueSession = new QueueSessionImpl(this, transacted, acknowledgeMode);
+        }
+        catch (QpidException e)
+        {
+            throw ExceptionHelper.convertQpidExceptionToJMSException(e);
+        }
         // add this session to the list of handled sessions.
         _sessions.add(queueSession);
         return queueSession;
@@ -403,11 +411,20 @@ public class ConnectionImpl implements Connection, QueueConnection, TopicConnect
      *                        <code>Session.DUPS_OK_ACKNOWLEDGE</code>.
      * @return a newly created topic session
      * @throws JMSException If creating the session fails due to some internal error.
+     * @throws QpidException 
      */
     public synchronized TopicSession createTopicSession(boolean transacted, int acknowledgeMode) throws JMSException
     {
         checkNotClosed();
-        TopicSessionImpl session = new TopicSessionImpl(this, transacted, acknowledgeMode);
+        TopicSessionImpl session = null;
+        try
+        {
+            session = new TopicSessionImpl(this, transacted, acknowledgeMode);
+        }
+        catch (QpidException e)
+        {
+            throw ExceptionHelper.convertQpidExceptionToJMSException(e);
+        }
         // add the session with this Connection's sessions
         // important for when the Connection is closed.
         _sessions.add(session);
@@ -460,7 +477,7 @@ public class ConnectionImpl implements Connection, QueueConnection, TopicConnect
      *
      * @return This JMS connection underlying Qpid Connection.
      */
-    protected org.apache.qpidity.Connection getQpidConnection()
+    protected org.apache.qpidity.client.Connection getQpidConnection()
     {
         return _qpidConnection;
     }
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
index 3fe32d4e07..d88a177001 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
@@ -19,12 +19,12 @@ package org.apache.qpidity.jms;
 
 import org.apache.qpidity.jms.message.QpidMessage;
 import org.apache.qpidity.impl.MessagePartListenerAdapter;
-import org.apache.qpidity.MessagePartListener;
 import org.apache.qpidity.Range;
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.Option;
 import org.apache.qpidity.filter.MessageFilter;
 import org.apache.qpidity.filter.JMSSelectorFilter;
+import org.apache.qpidity.client.MessagePartListener;
 import org.apache.qpidity.exchange.ExchangeDefaults;
 
 import javax.jms.*;
@@ -131,9 +131,9 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
             // this is a queue we expect that this queue exists
             getSession().getQpidSession()
                     .messageSubscribe(destination.getName(), getMessageActorID(),
-                                      org.apache.qpidity.Session.CONFIRM_MODE_NOT_REQUIRED,
+                                      org.apache.qpidity.client.Session.CONFIRM_MODE_NOT_REQUIRED,
                                       // When the message selctor is set we do not acquire the messages
-                                      _messageSelector != null ? org.apache.qpidity.Session.ACQUIRE_MODE_NO_ACQUIRE : org.apache.qpidity.Session.ACQUIRE_MODE_PRE_ACQUIRE,
+                                      _messageSelector != null ? org.apache.qpidity.client.Session.ACQUIRE_MODE_NO_ACQUIRE : org.apache.qpidity.client.Session.ACQUIRE_MODE_PRE_ACQUIRE,
                                       messageAssembler, null, _noLocal ? Option.NO_LOCAL : Option.NO_OPTION);
             if (_messageSelector != null)
             {
@@ -167,9 +167,9 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
             // subscribe to this topic 
             getSession().getQpidSession()
                     .messageSubscribe(queueName, getMessageActorID(),
-                                      org.apache.qpidity.Session.CONFIRM_MODE_NOT_REQUIRED,
+                                      org.apache.qpidity.client.Session.CONFIRM_MODE_NOT_REQUIRED,
                                       // We always acquire the messages
-                                      org.apache.qpidity.Session.ACQUIRE_MODE_PRE_ACQUIRE, messageAssembler, null,
+                                      org.apache.qpidity.client.Session.ACQUIRE_MODE_PRE_ACQUIRE, messageAssembler, null,
                                       _noLocal ? Option.NO_LOCAL : Option.NO_OPTION,
                                       // Request exclusive subscription access, meaning only this subscription
                                       // can access the queue.
@@ -178,7 +178,7 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
         }
         // set the flow mode
         getSession().getQpidSession()
-                .messageFlowMode(getMessageActorID(), org.apache.qpidity.Session.MESSAGE_FLOW_MODE_CREDIT);
+                .messageFlowMode(getMessageActorID(), org.apache.qpidity.client.Session.MESSAGE_FLOW_MODE_CREDIT);
     }
 
     //----- Message consumer API
@@ -254,7 +254,7 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
         }
         _messageAsyncrhonouslyReceived = 0;
         getSession().getQpidSession()
-                .messageFlow(getMessageActorID(), org.apache.qpidity.Session.MESSAGE_FLOW_UNIT_MESSAGE,
+                .messageFlow(getMessageActorID(), org.apache.qpidity.client.Session.MESSAGE_FLOW_UNIT_MESSAGE,
                              MAX_MESSAGE_TRANSFERRED);
     }
 
@@ -353,8 +353,8 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
             {
                 // if this consumer is stopped then this will be call when starting
                 getSession().getQpidSession()
-                        .messageFlow(getMessageActorID(), org.apache.qpidity.Session.MESSAGE_FLOW_UNIT_MESSAGE, 1);
-                received = getSession().getQpidSession().messageFlush(getMessageActorID());
+                        .messageFlow(getMessageActorID(), org.apache.qpidity.client.Session.MESSAGE_FLOW_UNIT_MESSAGE, 1);
+                received = 0; //getSession().getQpidSession().messageFlush(getMessageActorID());
             }
             if ( received == 0 && timeout < 0)
             {
@@ -424,7 +424,7 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
                 // there is a synch call waiting for a message to be delivered
                 // so tell the broker to deliver a message
                 getSession().getQpidSession()
-                        .messageFlow(getMessageActorID(), org.apache.qpidity.Session.MESSAGE_FLOW_UNIT_MESSAGE, 1);
+                        .messageFlow(getMessageActorID(), org.apache.qpidity.client.Session.MESSAGE_FLOW_UNIT_MESSAGE, 1);
                 getSession().getQpidSession().messageFlush(getMessageActorID());
             }
         }
@@ -488,8 +488,8 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
                         {
                             getSession().getQpidSession()
                                     .messageFlow(getMessageActorID(),
-                                                 org.apache.qpidity.Session.MESSAGE_FLOW_UNIT_MESSAGE, 1);
-                            int received = getSession().getQpidSession().messageFlush(getMessageActorID());
+                                                 org.apache.qpidity.client.Session.MESSAGE_FLOW_UNIT_MESSAGE, 1);
+                            int received = 0; //getSession().getQpidSession().messageFlush(getMessageActorID());
                             if ( received == 0  && _isNoWaitIsReceiving)
                             {
                                 // Right a message nowait is waiting for a message
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java b/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java
index 112af50190..05b97a1154 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java
@@ -19,8 +19,8 @@ package org.apache.qpidity.jms;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpidity.MessageListener;
 import org.apache.qpidity.api.Message;
+import org.apache.qpidity.client.MessageListener;
 
 /**
  * This listener idspatches messaes to its browser.
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java b/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java
index 35935d894c..a914dda044 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java
@@ -17,9 +17,9 @@
  */
 package org.apache.qpidity.jms;
 
-import org.apache.qpidity.MessageListener;
 import org.apache.qpidity.jms.message.QpidMessage;
 import org.apache.qpidity.api.Message;
+import org.apache.qpidity.client.MessageListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java
index 29821e1b81..f0a5ca0ea1 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java
@@ -17,9 +17,9 @@
  */
 package org.apache.qpidity.jms;
 
+import org.apache.qpidity.client.MessagePartListener;
 import org.apache.qpidity.filter.JMSSelectorFilter;
 import org.apache.qpidity.filter.MessageFilter;
-import org.apache.qpidity.MessagePartListener;
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.impl.MessagePartListenerAdapter;
 
@@ -94,9 +94,9 @@ public class QueueBrowserImpl extends MessageActor implements QueueBrowser
         // this is a queue we expect that this queue exists
         getSession().getQpidSession()
                 .messageSubscribe(queue.getQueueName(), getMessageActorID(),
-                                  org.apache.qpidity.Session.CONFIRM_MODE_NOT_REQUIRED,
+                                  org.apache.qpidity.client.Session.CONFIRM_MODE_NOT_REQUIRED,
                                   // We do not acquire those messages
-                                  org.apache.qpidity.Session.ACQUIRE_MODE_NO_ACQUIRE, messageAssembler, null);
+                                  org.apache.qpidity.client.Session.ACQUIRE_MODE_NO_ACQUIRE, messageAssembler, null);
 
     }
 
@@ -171,9 +171,9 @@ public class QueueBrowserImpl extends MessageActor implements QueueBrowser
         try
         {
             getSession().getQpidSession()
-                    .messageFlow(getMessageActorID(), org.apache.qpidity.Session.MESSAGE_FLOW_UNIT_MESSAGE,
+                    .messageFlow(getMessageActorID(), org.apache.qpidity.client.Session.MESSAGE_FLOW_UNIT_MESSAGE,
                                  _maxbatchlength);
-            _batchLength = getSession().getQpidSession().messageFlush(getMessageActorID());
+            _batchLength = 0; //getSession().getQpidSession().messageFlush(getMessageActorID());
         }
         catch (QpidException e)
         {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java
index 8ba0f7409b..767acafe0d 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java
@@ -20,6 +20,8 @@ package org.apache.qpidity.jms;
 import javax.jms.*;
 import javax.jms.IllegalStateException;
 
+import org.apache.qpidity.QpidException;
+
 /**
  * Implementation of javax.jms.QueueSession
  */
@@ -37,9 +39,9 @@ public class QueueSessionImpl extends SessionImpl implements QueueSession
      * @throws javax.jms.JMSSecurityException If the user could not be authenticated.
      * @throws javax.jms.JMSException         In case of internal error.
      */
-    protected QueueSessionImpl(ConnectionImpl connection, boolean transacted, int acknowledgeMode) throws JMSException
+    protected QueueSessionImpl(ConnectionImpl connection, boolean transacted, int acknowledgeMode) throws QpidException, JMSException
     {
-        super(connection, transacted, acknowledgeMode);
+        super(connection, transacted, acknowledgeMode,false);
     }
 
     //-- Overwritten methods
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java
index 0a75673961..5ab8482635 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java
@@ -108,7 +108,7 @@ public class SessionImpl implements Session
     /**
      * The underlying QpidSession
      */
-    private org.apache.qpidity.Session _qpidSession;
+    private org.apache.qpidity.client.Session _qpidSession;
 
     /**
      * Indicates whether this session is recovering
@@ -132,7 +132,7 @@ public class SessionImpl implements Session
      * @throws QpidException In case of internal error.
      */
     protected SessionImpl(ConnectionImpl connection, boolean transacted, int acknowledgeMode, boolean isXA)
-            throws QpidException
+          throws QpidException
     {
         _connection = connection;
         _transacted = transacted;
@@ -142,6 +142,8 @@ public class SessionImpl implements Session
             acknowledgeMode = Session.SESSION_TRANSACTED;
         }
         _acknowledgeMode = acknowledgeMode;
+   /*
+        
         // create the qpid session with an expiry  <= 0 so that the session does not expire
         _qpidSession = _connection.getQpidConnection().createSession(0);
         // set transacted if required
@@ -149,6 +151,7 @@ public class SessionImpl implements Session
         {
             _qpidSession.txSelect();
         }
+   */     
         // init the message dispatcher.
         initMessageDispatcherThread();
     }
@@ -1036,7 +1039,7 @@ public class SessionImpl implements Session
      *
      * @return The associated Qpid Session.
      */
-    protected org.apache.qpidity.Session getQpidSession()
+    protected org.apache.qpidity.client.Session getQpidSession()
     {
         return _qpidSession;
     }
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java
index 9aff4f1416..15c9196fb6 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java
@@ -20,6 +20,8 @@ package org.apache.qpidity.jms;
 import javax.jms.*;
 import javax.jms.IllegalStateException;
 
+import org.apache.qpidity.QpidException;
+
 /**
  * Implements  TopicSession
  */
@@ -37,9 +39,9 @@ public class TopicSessionImpl extends SessionImpl implements TopicSession
      * @throws javax.jms.JMSSecurityException If the user could not be authenticated.
      * @throws javax.jms.JMSException         In case of internal error.
      */
-    protected TopicSessionImpl(ConnectionImpl connection, boolean transacted, int acknowledgeMode) throws JMSException
+    protected TopicSessionImpl(ConnectionImpl connection, boolean transacted, int acknowledgeMode) throws QpidException, JMSException
     {
-        super(connection, transacted, acknowledgeMode);
+        super(connection, transacted, acknowledgeMode,false);
     }
 
     //-- Overwritten methods
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java
index d62587267a..a1d5a345c2 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java
@@ -18,7 +18,7 @@
 package org.apache.qpidity.jms;
 
 import org.apache.qpidity.QpidException;
-import org.apache.qpidity.DtxSession;
+import org.apache.qpidity.client.DtxSession;
 
 import javax.jms.XASession;
 import javax.jms.Session;
@@ -111,7 +111,7 @@ public class XASessionImpl extends SessionImpl implements XASession
      *
      * @return The associated Qpid Session.
      */
-    protected org.apache.qpidity.DtxSession getQpidSession()
+    protected org.apache.qpidity.client.DtxSession getQpidSession()
     {
         return _qpidDtxSession;
     }