From 172b0f7a7fd463ca81425c8e7b2ea9a9b964409d Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Thu, 2 Feb 2012 13:57:39 +0000
Subject: QPID-3784: move the system property key into ClientProperties

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239622 13f79535-47bb-0310-9956-ffa450edef68
---
 .../client/src/main/java/org/apache/qpid/client/AMQSession.java   | 8 ++------
 .../test/java/org/apache/qpid/client/DispatcherDaemonTest.java    | 3 ++-
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'qpid/java/client')

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index f56f0c2747..55707be14d 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -47,6 +47,7 @@ import org.apache.qpid.client.message.UnprocessedMessage;
 import org.apache.qpid.client.protocol.AMQProtocolHandler;
 import org.apache.qpid.client.util.FlowControllingBlockingQueue;
 import org.apache.qpid.common.AMQPFilterTypes;
+import org.apache.qpid.configuration.ClientProperties;
 import org.apache.qpid.filter.MessageFilter;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
@@ -387,15 +388,10 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
     /** Immediate message prefetch default. */
     public static final String IMMEDIATE_PREFETCH_DEFAULT = "false";
 
-    /**
-     * System property to enable allow dispatcher thread to be run as a daemon thread
-     */
-    public static final String DAEMON_DISPATCHER = "qpid.jms.daemon.dispatcher";
-
     /**
      * Flag indicating to start dispatcher as a daemon thread
      */
-    protected final boolean DEAMON_DISPATCHER_THREAD = Boolean.getBoolean(DAEMON_DISPATCHER);
+    protected final boolean DEAMON_DISPATCHER_THREAD = Boolean.getBoolean(ClientProperties.DAEMON_DISPATCHER);
 
     /** The connection to which this session belongs. */
     private AMQConnection _connection;
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/DispatcherDaemonTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/DispatcherDaemonTest.java
index 175faeb54c..b9c4bfc676 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/client/DispatcherDaemonTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/DispatcherDaemonTest.java
@@ -21,6 +21,7 @@ package org.apache.qpid.client;
 import javax.jms.Session;
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.configuration.ClientProperties;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.url.URLSyntaxException;
 
@@ -47,7 +48,7 @@ public class DispatcherDaemonTest extends QpidTestCase
 
     public void testDispatcherIsRunInDaemonThreadWithConsumerMessageListenerAndDaemonFlagOn() throws Exception
     {
-        setTestSystemProperty(AMQSession.DAEMON_DISPATCHER, "true");
+        setTestSystemProperty(ClientProperties.DAEMON_DISPATCHER, "true");
         _session = createSession();
         _session.startDispatcherIfNecessary();
         assertTrue("Dispatcher thread should be daemon as qpid.jms.daemon.dispatcher is set to true",
-- 
cgit v1.2.1