made modifications to correct compilation errors due to API changes, Arnaud u need to look at them and make proper corrections

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

5 files changed, 18 insertions, 19 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageActor.java b/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageActor.java
index 876a661171..e9bdef540c 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageActor.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageActor.java
@@ -19,7 +19,6 @@ package org.apache.qpid.nclient.jms;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpid.nclient.api.Resource;
 import org.apache.qpidity.QpidException;
 
 import javax.jms.IllegalStateException;
@@ -46,11 +45,6 @@ public abstract class MessageActor
     SessionImpl _session;
 
     /**
-     * The underlying Qpid Resource
-     */
-    Resource _qpidResource;
-
-    /**
      * The JMS destination this actor is set for.
      */
     DestinationImpl _destination;
@@ -120,14 +114,20 @@ public abstract class MessageActor
         if (!_isClosed)
         {
             // close the underlying qpid resource
-            try
+           /* try
             {
-                _qpidResource.close();
+            	// Arnaud I can't see where this var is initialized
+            	// I assume it's the session
+                //_qpidResource.close();
+            	
+            	
             }
             catch (QpidException e)
             {
                 throw ExceptionHelper.convertQpidExceptionToJMSException(e);
-            }
+            }*/
+        	
+        	_session.close(); //is this correct ?
             _isClosed = true;
         }
     }
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java b/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java
index 3c60aaab72..a9d4161edb 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java
@@ -76,7 +76,7 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
         _messageSelector = messageSelector;
         _noLocal = noLocal;
         _subscriptionName = subscriptionName;
-        try
+        /*try
         {
             // TODO define the relevant options 
             _qpidReceiver = _session.getQpidSession().createReceiver(destination.getName(), null);
@@ -84,7 +84,7 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
         catch (QpidException e)
         {
             throw ExceptionHelper.convertQpidExceptionToJMSException(e);
-        }
+        }*/
     }
     //----- Message consumer API
 
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageListenerWrapper.java b/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageListenerWrapper.java
index 3e58247597..358f50506a 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageListenerWrapper.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageListenerWrapper.java
@@ -18,9 +18,9 @@
 package org.apache.qpid.nclient.jms;
 
 import org.apache.qpid.nclient.api.MessageListener;
-import org.apache.qpid.nclient.api.Message;
 import org.apache.qpid.nclient.jms.message.AbstractJMSMessage;
 import org.apache.qpid.nclient.jms.message.QpidMessage;
+import org.apache.qpidity.api.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -78,12 +78,12 @@ public class MessageListenerWrapper implements MessageListener
                 _consumer.getSession().acknowledgeMessage(jmsMessage);
             }
             // The JMS specs says:
-            /* The result of a listener throwing a RuntimeException depends on the session’s
+            /* The result of a listener throwing a RuntimeException depends on the session�s
             * acknowledgment mode.
-            • --- AUTO_ACKNOWLEDGE or DUPS_OK_ACKNOWLEDGE - the message
+            � --- AUTO_ACKNOWLEDGE or DUPS_OK_ACKNOWLEDGE - the message
             * will be immediately redelivered. The number of times a JMS provider will
             * redeliver the same message before giving up is provider-dependent.
-            • --- CLIENT_ACKNOWLEDGE - the next message for the listener is delivered.
+            � --- CLIENT_ACKNOWLEDGE - the next message for the listener is delivered.
             * --- Transacted Session - the next message for the listener is delivered.
             *
             * The number of time we try redelivering the message is 0
@@ -99,7 +99,7 @@ public class MessageListenerWrapper implements MessageListener
             // If the session has been recovered we then need to redelivered this message
             if (_consumer.getSession().isInRecovery())
             {
-                message.release();
+                //message.release();
             }
             // Tell the jms Session to ack this message if required
             else if (!_consumer.getSession().getTransacted())
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/jms/QpidExceptionListenerImpl.java b/java/client/src/main/java/org/apache/qpid/nclient/jms/QpidExceptionListenerImpl.java
index 6a849a5b9f..c0a3ba808c 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/jms/QpidExceptionListenerImpl.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/jms/QpidExceptionListenerImpl.java
@@ -17,7 +17,6 @@
  */
 package org.apache.qpid.nclient.jms;
 
-import org.apache.qpid.nclient.api.ExceptionListener;
 import org.apache.qpidity.QpidException;
 
 import javax.jms.JMSException;
@@ -25,7 +24,7 @@ import javax.jms.JMSException;
 /**
  * An exception listner 
  */
-public class QpidExceptionListenerImpl implements ExceptionListener
+public class QpidExceptionListenerImpl //implements ExceptionListener
 {
     private javax.jms.ExceptionListener _jmsExceptionListener;
 
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/jms/SessionImpl.java b/java/client/src/main/java/org/apache/qpid/nclient/jms/SessionImpl.java
index e2412191ac..84ee7723fd 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/jms/SessionImpl.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/jms/SessionImpl.java
@@ -112,7 +112,7 @@ public class SessionImpl implements Session
             // set transacted if required
             if (_transacted)
             {
-                _qpidSession.setTransacted();
+                //_qpidSession.setTransacted();
             }
         }
         catch (QpidException e)