QPID-3401 Interim fixes to keep the tree compiling. Most of these

classes will be removed when the work is completed.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/address-refactor2@1338485 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 50 insertions, 29 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java
index c324e22ab1..d1092126d4 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java
@@ -22,6 +22,7 @@ package org.apache.qpid.client;
 
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.messaging.Address;
+import org.apache.qpid.messaging.AddressRaw;
 import org.apache.qpid.url.BindingURL;
 
 import javax.jms.JMSException;
@@ -55,7 +56,7 @@ public class AMQAnyDestination extends AMQDestination implements Queue, Topic
         super(str);
     }
     
-    public AMQAnyDestination(Address addr) throws Exception
+    public AMQAnyDestination(AddressRaw addr) throws Exception
     {
         super(addr);
     }
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
index 530186b1f9..71e760dc10 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
@@ -30,6 +30,7 @@ import org.apache.qpid.configuration.ClientProperties;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.messaging.Address;
+import org.apache.qpid.messaging.AddressRaw;
 import org.apache.qpid.url.AMQBindingURL;
 import org.apache.qpid.url.BindingURL;
 import org.apache.qpid.url.URLHelper;
@@ -172,7 +173,7 @@ public abstract class AMQDestination implements Destination, Referenceable
     private DestSyntax _destSyntax = DestSyntax.ADDR;
 
     private AddressHelper _addrHelper;
-    private Address _address;
+    private AddressRaw _address;
     private int _addressType = AMQDestination.UNKNOWN_TYPE;
     private String _name;
     private String _subject;
@@ -205,7 +206,7 @@ public abstract class AMQDestination implements Destination, Referenceable
     {  
     }
 
-    protected AMQDestination(Address address) throws Exception
+    protected AMQDestination(AddressRaw address) throws Exception
     {
         this._address = address;
         getInfoFromAddress();
@@ -671,7 +672,7 @@ public abstract class AMQDestination implements Destination, Referenceable
          }
          else
          {
-             Address address = createAddressFromString(str);
+             AddressRaw address = createAddressFromString(str);
              return new AMQAnyDestination(address);
          }
     }
@@ -717,11 +718,11 @@ public abstract class AMQDestination implements Destination, Referenceable
         }
     }
     
-    public Address getAddress() {
+    public AddressRaw getAddress() {
         return _address;
     }
     
-    protected void setAddress(Address addr) {
+    protected void setAddress(AddressRaw addr) {
         _address = addr;
     }
     
@@ -828,7 +829,7 @@ public abstract class AMQDestination implements Destination, Referenceable
         _addressResolved.set(addressResolved);
     }
     
-    private static Address createAddressFromString(String str)
+    private static AddressRaw createAddressFromString(String str)
     {
         return Address.parse(str);
     }
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
index f09ef5e01d..c0ca486df6 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
@@ -23,6 +23,7 @@ package org.apache.qpid.client;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.messaging.Address;
+import org.apache.qpid.messaging.AddressRaw;
 import org.apache.qpid.url.BindingURL;
 
 import javax.jms.InvalidDestinationException;
@@ -37,7 +38,7 @@ public class AMQTopic extends AMQDestination implements Topic
         super(address);
     }
 
-    public AMQTopic(Address address) throws Exception
+    public AMQTopic(AddressRaw address) throws Exception
     {
         super(address);
     }
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
index 318fe32d36..0fe8fd7235 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
@@ -29,6 +29,7 @@ import org.apache.qpid.client.messaging.address.Node.QueueNode;
 import org.apache.qpid.configuration.Accessor;
 import org.apache.qpid.configuration.Accessor.MapAccessor;
 import org.apache.qpid.messaging.Address;
+import org.apache.qpid.messaging.AddressRaw;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -68,12 +69,12 @@ public class AddressHelper
     public static final String ARGUMENTS = "arguments";
     public static final String RELIABILITY = "reliability";
 
-    private Address address;
+    private AddressRaw address;
     private Accessor addressProps;
     private Accessor nodeProps;
     private Accessor linkProps;
 
-    public AddressHelper(Address address)
+    public AddressHelper(AddressRaw address)
     {
         this.address = address;
         addressProps = new MapAccessor(address.getOptions());
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java
index c5c2cacd1a..7cb4f7cd63 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/messaging/util/JAddr.java
@@ -21,6 +21,7 @@
 package org.apache.qpid.messaging.util;
 
 import org.apache.qpid.messaging.Address;
+import org.apache.qpid.messaging.AddressRaw;
 
 import static org.apache.qpid.messaging.util.PyPrint.pprint;
 
@@ -59,7 +60,7 @@ public class JAddr
         {
             try
             {
-                Address address = Address.parse(addr.toString());
+                AddressRaw address = Address.parse(addr.toString());
                 System.out.println(pprint_address(address));
             }
             catch (ParseError e)
@@ -86,7 +87,7 @@ public class JAddr
         }
     }
 
-    private static String pprint_address(Address addr)
+    private static String pprint_address(AddressRaw addr)
     {
         return String.format("NAME: %s\nSUBJECT: %s\nOPTIONS: %s",
                              pprint(addr.getName()),
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
index e1f93b975b..afe7ee8ffa 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
@@ -20,8 +20,31 @@
  */
 package org.apache.qpid.test.client.destination;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.jms.Connection;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.QueueBrowser;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.jms.TopicSession;
+import javax.jms.TopicSubscriber;
+import javax.naming.Context;
+import javax.naming.InitialContext;
 
 import org.apache.qpid.client.AMQAnyDestination;
 import org.apache.qpid.client.AMQConnection;
@@ -33,19 +56,11 @@ import org.apache.qpid.client.messaging.address.Node.ExchangeNode;
 import org.apache.qpid.client.messaging.address.Node.QueueNode;
 import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
 import org.apache.qpid.messaging.Address;
+import org.apache.qpid.messaging.AddressRaw;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.apache.qpid.transport.ExecutionErrorCode;
-
-import javax.jms.*;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AddressBasedDestinationTest extends QpidBrokerTestCase
 {
@@ -381,7 +396,7 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase
                 (AMQSession_0_10)jmsSession).isQueueBound("amq.topic", 
                     dest.getAddressName(),"a.#", null));
         
-        Address a = Address.parse(headersBinding);
+        AddressRaw a = Address.parse(headersBinding);
         assertTrue("Queue not bound as expected",(
                 (AMQSession_0_10)jmsSession).isQueueBound("amq.match", 
                     dest.getAddressName(),null, a.getOptions()));
diff --git a/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java
index 121e94cea1..130a381813 100644
--- a/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java
@@ -37,6 +37,7 @@ import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQSession_0_10;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.messaging.Address;
+import org.apache.qpid.messaging.AddressRaw;
 
 public class PerfBase
 {
@@ -156,18 +157,18 @@ public class PerfBase
         if (params.isUseUniqueDests())
         {
             System.out.println("Prefix : " + prefix);
-            Address addr = Address.parse(params.getAddress());
+            AddressRaw addr = Address.parse(params.getAddress());
             AMQAnyDestination temp = new AMQAnyDestination(params.getAddress());
             int type = ((AMQSession_0_10)session).resolveAddressType(temp);
 
             if ( type == AMQDestination.TOPIC_TYPE)
             {
-                addr = new Address(addr.getName(),addr.getSubject() + "." + prefix,addr.getOptions());
+                addr = new AddressRaw(addr.getName(),addr.getSubject() + "." + prefix,addr.getOptions());
                 System.out.println("Setting subject : " + addr);
             }
             else
             {
-                addr = new Address(addr.getName() + "_" + prefix,addr.getSubject(),addr.getOptions());
+                addr = new AddressRaw(addr.getName() + "_" + prefix,addr.getSubject(),addr.getOptions());
                 System.out.println("Setting name : " + addr);
             }