Renamed POMs to M2.1.1 Removed erroneous equals() in SpecificMethodFrameListenerTest

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598619 13f79535-47bb-0310-9956-ffa450edef68

20 files changed, 37 insertions, 136 deletions

diff --git a/java/broker/distribution/pom.xml b/java/broker/distribution/pom.xml
index 9875e9bf2b..ada989853a 100644
--- a/java/broker/distribution/pom.xml
+++ b/java/broker/distribution/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker-distribution</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     <name>Qpid Broker Distributions</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2-SNAPSHOT</version>
+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/java/broker/pom.xml b/java/broker/pom.xml
index dbc3b2aea9..feb503e39f 100644
--- a/java/broker/pom.xml
+++ b/java/broker/pom.xml
@@ -22,14 +22,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-broker</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     <name>Qpid Broker</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-SNAPSHOT</version>
+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -209,7 +209,7 @@
                                     </condition>
 
                                     <property name="command"
-                                              value="python run-tests -v -I java_failing.txt -b localhost:2100"/>
+                                              value="python run-tests -v -I java_failing.txt -b localhost:2110"/>
                                     <!--value="bash -c 'python run-tests -v -I java_failing.txt'"/>-->
 
                                     <ant antfile="python-test.xml" inheritRefs="true">
diff --git a/java/broker/python-test.xml b/java/broker/python-test.xml
index e58ae399b9..5c263e3169 100755
--- a/java/broker/python-test.xml
+++ b/java/broker/python-test.xml
@@ -43,9 +43,9 @@ under the License.
 			>
 		<arg value="${command}"/>
         <arg value="-p"/>
-        <arg value="2100"/>
+        <arg value="2110"/>
         <arg value="-m"/>
-        <arg value="2101"/>
+        <arg value="2111"/>
 
         <classpath refid="maven.test.classpath"/>
 		<sysproperty key="QPID_HOME" value="${broker.dir}"/>
diff --git a/java/client-java14/pom.xml b/java/client-java14/pom.xml
index 1dd02d142b..fb299bc2b6 100644
--- a/java/client-java14/pom.xml
+++ b/java/client-java14/pom.xml
@@ -24,14 +24,14 @@
     <groupId>org.apache.qpid</groupId>

     <artifactId>qpid-client-java14</artifactId>

     <packaging>jar</packaging>

-    <version>1.0-incubating-M2.1-SNAPSHOT</version>

+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>

     <name>Qpid Client for Java 1.4</name>

     <url>http://cwiki.apache.org/confluence/display/qpid</url>

 

     <parent>

         <groupId>org.apache.qpid</groupId>

         <artifactId>qpid</artifactId>

-        <version>1.0-incubating-M2.1-SNAPSHOT</version>

+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

 

diff --git a/java/client/distribution/pom.xml b/java/client/distribution/pom.xml
index 4ad14d40d2..cf2de78917 100644
--- a/java/client/distribution/pom.xml
+++ b/java/client/distribution/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-client-distribution</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     <name>Qpid Client Distributions</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2-SNAPSHOT</version>
+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/java/client/example/pom.xml b/java/client/example/pom.xml
index 0106e788ff..e5639ab2f5 100644
--- a/java/client/example/pom.xml
+++ b/java/client/example/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-example</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     <name>Qpid Example</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-SNAPSHOT</version>
+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/client/pom.xml b/java/client/pom.xml
index b4e912d31e..d50972d816 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-client</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     <name>Qpid Client</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-SNAPSHOT</version>
+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java b/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
index 1badbb601c..2b63475d71 100644
--- a/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
+++ b/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
@@ -294,18 +294,4 @@ public abstract class BlockingMethodFrameListener implements AMQMethodListener
         }
     }
 
-    public boolean equals(Object o)
-    {
-
-        if (o instanceof BlockingMethodFrameListener)
-        {
-            BlockingMethodFrameListener other = (BlockingMethodFrameListener) o;
-
-            return _channelId == other._channelId;
-        }
-
-        return false;
-    }
-
-
 }
diff --git a/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java b/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
index 4a4f4a0a38..c66603b7a0 100644
--- a/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
+++ b/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
@@ -41,17 +41,4 @@ public class SpecificMethodFrameListener extends BlockingMethodFrameListener
         return _expectedClass.isInstance(frame);
     }
 
-    public boolean equals(Object o)
-    {
-        if (o instanceof SpecificMethodFrameListener)
-        {
-            SpecificMethodFrameListener other = (SpecificMethodFrameListener) o;
-
-            // here we need to check if the two classes are the same.
-            return (_channelId == other._channelId) && (_expectedClass.equals(other._expectedClass));
-        }
-
-        return false;
-    }
-
 }
diff --git a/java/client/src/test/java/org/apache/qpid/client/SpecificMethodFrameListenerTest.java b/java/client/src/test/java/org/apache/qpid/client/SpecificMethodFrameListenerTest.java
deleted file mode 100644
index 4cffcecf8a..0000000000
--- a/java/client/src/test/java/org/apache/qpid/client/SpecificMethodFrameListenerTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.apache.qpid.framing;
-
-import junit.framework.TestCase;
-import org.apache.qpid.client.state.listener.SpecificMethodFrameListener;
-import org.apache.mina.common.ByteBuffer;
-
-/*
-*
-* 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.
-*
-*/
-
-public class SpecificMethodFrameListenerTest extends TestCase
-{
-
-    SpecificMethodFrameListener close1a = new SpecificMethodFrameListener(1, ChannelCloseOkBody.class);
-    SpecificMethodFrameListener close1b = new SpecificMethodFrameListener(1, ChannelCloseOkBody.class);
-    SpecificMethodFrameListener close2 = new SpecificMethodFrameListener(2, ChannelCloseOkBody.class);
-    SpecificMethodFrameListener open1a = new SpecificMethodFrameListener(1, ChannelOpenOkBody.class);
-    SpecificMethodFrameListener open1b = new SpecificMethodFrameListener(1, ChannelOpenOkBody.class);
-
-    public void testEquals()
-    {
-        //Check that the the same objects are equal
-        assertEquals("ChannelCloseOKBody a should equal a", close1a, close1a);
-        assertEquals("ChannelOpenOkBody a should equal a", open1a, open1a);
-
-        //check that the same values in differnt objects are equal
-        assertEquals("ChannelCloseOKBody b should equal a", close1b, close1a);
-        assertEquals("ChannelCloseOKBody a should equal b", close1a, close1b);
-        assertEquals("ChannelOpenOkBody a should equal b", open1a, open1b);
-        assertEquals("ChannelOpenOkBody a should equal b", open1a, open1b);
-
-        //Chec that different values fail
-        //Different channels
-        assertFalse("ChannelCloseOKBody channel 1 should NOT equal channel 2", close1a.equals(close2));
-        assertFalse("ChannelCloseOKBody channel 1 should NOT equal channel 2", close2.equals(close1a));
-
-        //Different Bodies
-        assertFalse("ChannelCloseOKBody should not equal ChannelOpenOkBody", close1a.equals(open1a));
-        assertFalse("ChannelOpenOkBody should not equal ChannelCloseOKBody", open1a.equals(close1a));
-    }
-
-    public void testProcessMethod() throws AMQFrameDecodingException
-    {
-        ChannelCloseOkBody ccob = (ChannelCloseOkBody) ChannelCloseOkBody.getFactory().newInstance((byte) 8, (byte) 0, ByteBuffer.allocate(0), 0);
-        ChannelOpenOkBody coob = (ChannelOpenOkBody) ChannelOpenOkBody.getFactory().newInstance((byte) 8, (byte) 0, ByteBuffer.allocate(0), 0);
-
-        assertTrue("This SpecificMethodFrameListener should process a ChannelCloseOkBody", close1a.processMethod(1, ccob));
-        assertFalse("This SpecificMethodFrameListener should NOT process a ChannelOpenOkBody", close1a.processMethod(1, coob));
-
-
-
-
-    }
-}
diff --git a/java/cluster/pom.xml b/java/cluster/pom.xml
index 73c62520e6..2ab6a6347a 100644
--- a/java/cluster/pom.xml
+++ b/java/cluster/pom.xml
@@ -22,14 +22,14 @@
   <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-cluster</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-incubating-M2.1-SNAPSHOT</version>
+  <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
   <name>Qpid Cluster</name>
   <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
   <parent>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid</artifactId>
-    <version>1.0-incubating-M2.1-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 4c94e3d1b5..eea4580c8d 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-common</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     <name>Qpid Common Utilities</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-SNAPSHOT</version>
+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/distribution/pom.xml b/java/distribution/pom.xml
index 0f82512551..6e733c8e75 100644
--- a/java/distribution/pom.xml
+++ b/java/distribution/pom.xml
@@ -25,12 +25,12 @@
     <artifactId>qpid-distribution</artifactId>
     <packaging>jar</packaging>
     <name>Qpid Distribution</name>
-    <version>1.0-incubating-M2.1-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-SNAPSHOT</version>
+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/integrationtests/pom.xml b/java/integrationtests/pom.xml
index 69cf8fef00..37cc77e4a5 100644
--- a/java/integrationtests/pom.xml
+++ b/java/integrationtests/pom.xml
@@ -24,13 +24,13 @@
     <groupId>org.apache.qpid</groupId>

     <artifactId>qpid-integrationtests</artifactId>

     <packaging>jar</packaging>

-    <version>1.0-incubating-M2.1-SNAPSHOT</version>

+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>

     <name>Qpid Integration Tests</name>

 

     <parent>

         <groupId>org.apache.qpid</groupId>

         <artifactId>qpid</artifactId>

-        <version>1.0-incubating-M2.1-SNAPSHOT</version>

+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>

         <relativePath>../pom.xml</relativePath>

     </parent>

 

diff --git a/java/management/eclipse-plugin/pom.xml b/java/management/eclipse-plugin/pom.xml
index b95d134d0c..2c9eac1ba1 100644
--- a/java/management/eclipse-plugin/pom.xml
+++ b/java/management/eclipse-plugin/pom.xml
@@ -23,13 +23,13 @@
     <groupId>org.apache.qpid.management</groupId>
     <artifactId>org.apache.qpid.management.ui</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     <name>Qpid Management</name>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-SNAPSHOT</version>
+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/perftests/distribution/pom.xml b/java/perftests/distribution/pom.xml
index 52b275dc02..fa6cfefb34 100644
--- a/java/perftests/distribution/pom.xml
+++ b/java/perftests/distribution/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-perftests-distribution</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     <name>Qpid Performance Tests Distribution</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2-SNAPSHOT</version>
+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/java/perftests/pom.xml b/java/perftests/pom.xml
index 077669b6e6..69045ca416 100644
--- a/java/perftests/pom.xml
+++ b/java/perftests/pom.xml
@@ -24,14 +24,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-perftests</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     <name>Qpid Performance Tests</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-SNAPSHOT</version>
+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/java/pom.xml b/java/pom.xml
index 42c539e320..b8bc0e3578 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -24,16 +24,16 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid</artifactId>
-    <version>1.0-incubating-M2.1-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     <name>Qpid</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <packaging>pom</packaging>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1/java</connection>
-        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1/java</developerConnection>
-        <url>http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1/java</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1/java</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java</url>
     </scm>
 
     <prerequisites>
@@ -150,7 +150,6 @@ under the License.
         <module>common</module>
         <module>broker</module>
         <module>client</module>
-        <module>cluster</module>
         <module>systests</module>
         <module>perftests</module>
         <module>integrationtests</module>
diff --git a/java/systests/distribution/pom.xml b/java/systests/distribution/pom.xml
index 70a6a18cce..5e25a41087 100644
--- a/java/systests/distribution/pom.xml
+++ b/java/systests/distribution/pom.xml
@@ -23,14 +23,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-systests-distribution</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     <name>Qpid System Tests Distribution</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2-SNAPSHOT</version>
+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/java/systests/pom.xml b/java/systests/pom.xml
index 83e494251d..d9d3e684ca 100644
--- a/java/systests/pom.xml
+++ b/java/systests/pom.xml
@@ -22,14 +22,14 @@
     <groupId>org.apache.qpid</groupId>
     <artifactId>qpid-systests</artifactId>
     <packaging>jar</packaging>
-    <version>1.0-incubating-M2.1-SNAPSHOT</version>
+    <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
     <name>Qpid System Tests</name>
     <url>http://cwiki.apache.org/confluence/display/qpid</url>
 
     <parent>
         <groupId>org.apache.qpid</groupId>
         <artifactId>qpid</artifactId>
-        <version>1.0-incubating-M2.1-SNAPSHOT</version>
+        <version>1.0-incubating-M2.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>