Qpid 742

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

3 files changed, 9 insertions, 4 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java b/qpid/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
index 507490d6fb..dd8ca8e197 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
@@ -21,18 +21,18 @@
 package org.apache.qpid.client;
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.jms.TopicSubscriber;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageListener;
 import javax.jms.Topic;
-import javax.jms.TopicSubscriber;
 
 /**
  * Wraps a MessageConsumer to fulfill the extended TopicSubscriber contract
  *
  */
-class TopicSubscriberAdaptor implements TopicSubscriber, AMQTopicSubscriber
+class TopicSubscriberAdaptor implements  org.apache.qpid.jms.TopicSubscriber
 {
     private final Topic _topic;
     private final BasicMessageConsumer _consumer;
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSubscriber.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/TopicSubscriber.java
index 97e2898de4..80cfa18ec1 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopicSubscriber.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/TopicSubscriber.java
@@ -1,10 +1,10 @@
-package org.apache.qpid.client;
+package org.apache.qpid.jms;
 
 import org.apache.qpid.AMQException;
 
 import javax.jms.Topic;
 
-public interface AMQTopicSubscriber
+public interface TopicSubscriber extends javax.jms.TopicSubscriber
 {
 
     void addBindingKey(Topic topic, String bindingKey) throws AMQException;
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java b/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
index 094790fb7e..8ab381db32 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
@@ -253,4 +253,9 @@ public class QpidTestCase extends TestCase
         }
         return con;
     }
+
+    public void testfoo()
+    {
+        //do nothing, just to avoid maven to report an error  
+    }
 }