From 01c4e84bd5eb1e2647e8c8a531e5180c62cc1c15 Mon Sep 17 00:00:00 2001
From: Rajith Muditha Attapattu <rajith@apache.org>
Date: Fri, 16 Apr 2010 17:01:50 +0000
Subject: QPID-2512 Changed the default destination syntax to addressing. Added
 qpid.dest_syntax=BURL to the test profiles to ensure all existing tests work.
 At some point next week the existing binding URL based entries will be
 prefixed with "BURL:" and the above system property will be removed.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@934997 13f79535-47bb-0310-9956-ffa450edef68
---
 java/client/src/main/java/org/apache/qpid/client/AMQDestination.java | 2 +-
 java/module.xml                                                      | 2 ++
 java/test-profiles/default.testprofile                               | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
index 2d7844944a..593613f962 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
@@ -146,7 +146,7 @@ public abstract class AMQDestination implements Destination, Referenceable
     {
         defaultDestSyntax = DestSyntax.getSyntaxType(
                      System.getProperty(ClientProperties.DEST_SYNTAX,
-                                        DestSyntax.BURL.toString()));
+                                        DestSyntax.ADDR.toString()));
     }
     
     protected AMQDestination(Address address) throws Exception
diff --git a/java/module.xml b/java/module.xml
index 290b88b014..27aae0fb9a 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -295,6 +295,8 @@
       </syspropertyset>
       
       <sysproperty key="max_prefetch" value ="${max_prefetch}"/>
+      <sysproperty key="qpid.dest_syntax" value ="${qpid.dest_syntax}"/>
+
       <sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/>
       <sysproperty key="QPID_EXAMPLE_HOME" value="${qpid.home}"/>
       <sysproperty key="QPID_HOME" value="${qpid.home}"/>
diff --git a/java/test-profiles/default.testprofile b/java/test-profiles/default.testprofile
index 91727304ae..dfc92f1e19 100644
--- a/java/test-profiles/default.testprofile
+++ b/java/test-profiles/default.testprofile
@@ -8,6 +8,7 @@ broker.ready=Listening on TCP port
 broker.config=${project.root}/build/etc/config-systests.xml
 
 max_prefetch=1000
+qpid.dest_syntax=BURL
 
 log=debug
 amqj.logging.level=${log}
-- 
cgit v1.2.1