summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2009-06-09 18:30:12 +0000
committerRafael H. Schloming <rhs@apache.org>2009-06-09 18:30:12 +0000
commit495ff6e34a947dc85a2d4d4fa23a92e52c20cae9 (patch)
tree2e89b0fe9fb8612765cc4dec5da2dd63b65161ec
parent31839a4a1c002d4c222fabf19114f67ca9c4c310 (diff)
downloadqpid-python-495ff6e34a947dc85a2d4d4fa23a92e52c20cae9.tar.gz
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
-rw-r--r--java/default.testprofile6
-rw-r--r--java/module.xml2
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"/>