diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2009-06-09 18:30:12 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2009-06-09 18:30:12 +0000 |
| commit | c0ba90556821265cc6e5404d817ecfea3f3e21cd (patch) | |
| tree | 7550479487225804e4a6200860a4254498515e38 /qpid/java | |
| parent | 15dcdf0d01748f4a98fc4d7793135552ad7de18b (diff) | |
| download | qpid-python-c0ba90556821265cc6e5404d817ecfea3f3e21cd.tar.gz | |
moved the initial context factory define into the profile definition
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@783090 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/default.testprofile | 6 | ||||
| -rw-r--r-- | qpid/java/module.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qpid/java/default.testprofile b/qpid/java/default.testprofile index 982a331842..7fdc825a1e 100644 --- a/qpid/java/default.testprofile +++ b/qpid/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/qpid/java/module.xml b/qpid/java/module.xml index 4a613b32f8..33238c295e 100644 --- a/qpid/java/module.xml +++ b/qpid/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"/> |
