From 495ff6e34a947dc85a2d4d4fa23a92e52c20cae9 Mon Sep 17 00:00:00 2001
From: "Rafael H. Schloming" <rhs@apache.org>
Date: Tue, 9 Jun 2009 18:30:12 +0000
Subject: moved the initial context factory define into the profile definition

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@783090 13f79535-47bb-0310-9956-ffa450edef68
---
 java/default.testprofile | 6 ++++--
 java/module.xml          | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/default.testprofile b/java/default.testprofile
index 982a331842..7fdc825a1e 100644
--- a/java/default.testprofile
+++ b/java/default.testprofile
@@ -1,9 +1,11 @@
+java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory
+java.naming.provider.url=${project.root}/test-provider.properties
+
 broker.version=0-8
 broker=vm
-broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB 
+broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB
 broker.ready=Listening on TCP port
 
-java.naming.provider.url=${project.root}/test-provider.properties
 max_prefetch=1000
 
 log=debug
diff --git a/java/module.xml b/java/module.xml
index 4a613b32f8..33238c295e 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -198,8 +198,6 @@
     </copy>
   </target>
 
-  <property name="java.naming.factory.initial" value="org.apache.qpid.jndi.PropertiesFileInitialContextFactory"/>
-
   <condition property="config" value="${profile}.testprofile" else="default.testprofile">
     <and>
       <isset property="profile"/>
-- 
cgit v1.2.1