Mailing-List: contact qpid-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: qpid-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r673347 - in
 /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client:
 AMQConnection.java AMQConnectionDelegate_0_8.java
 AMQConnectionDelegate_0_9.java
Date: Wed, 02 Jul 2008 10:13:07 -0000
To: qpid-commits@incubator.apache.org
From: aidan@apache.org
Message-Id: <20080702101307.AA1FE23889FE@eris.apache.org>

Author: aidan
Date: Wed Jul  2 03:13:06 2008
New Revision: 673347

URL: http://svn.apache.org/viewvc?rev=673347&view=rev
Log:
QPID-960 make protocol negotiation work from 0-10 down to 0-9 and then 8-0
still needs love to do with railover, see QPID-959

AMQConnection.java: use 8_0 delegate for in-vm tests
AMQConnectionDelegate_0_9.java: add subclass for class.forname'ing
rename AMQConnectionDelegate_0_8.java to AMQConnectionDelegate_8_0.java to match protocol version properly

Added:
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java   (with props)
Removed:
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_8.java
Modified:
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java?rev=673347&r1=673346&r2=673347&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java Wed Jul  2 03:13:06 2008
@@ -368,7 +368,7 @@
         BrokerDetails brokerDetails = _failoverPolicy.getNextBrokerDetails();
         if (brokerDetails.getTransport().equals(BrokerDetails.VM))
         {
-            _delegate = new AMQConnectionDelegate_0_8(this);
+            _delegate = new AMQConnectionDelegate_8_0(this);
         }
         else
         {

Added: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java?rev=673347&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java (added)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java Wed Jul  2 03:13:06 2008
@@ -0,0 +1,32 @@
+/*
+ *
+ * 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.qpid.client;
+
+
+public class AMQConnectionDelegate_0_9 extends AMQConnectionDelegate_8_0
+{
+
+    public AMQConnectionDelegate_0_9(AMQConnection conn)
+    {
+        super(conn);
+    }
+    
+}

Propchange: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java
------------------------------------------------------------------------------
    svn:executable = *