Author: ritchiem
Date: Fri Mar 21 06:17:11 2008
New Revision: 639629
URL: http://svn.apache.org/viewvc?rev=639629&view=rev
Log:
QPID-868 : Removed the acl.config.xml from systests/etc and updated the
systests pom file to locate the one in broker/etc.
Removed:
incubator/qpid/branches/M2.1/java/systests/etc/acl.config.xml
Modified:
incubator/qpid/branches/M2.1/java/broker/etc/acl.config.xml
incubator/qpid/branches/M2.1/java/systests/pom.xml
Modified: incubator/qpid/branches/M2.1/java/broker/etc/acl.config.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/etc/acl.config.xml?rev=639629&r1=639628&r2=639629&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/etc/acl.config.xml (original)
+++ incubator/qpid/branches/M2.1/java/broker/etc/acl.config.xml Fri Mar 21
06:17:11 2008
@@ -42,7 +42,7 @@
<socketSendBuffer>32768</socketSendBuffer>
</connector>
<management>
- <enabled>true</enabled>
+ <enabled>false</enabled>
<jmxport>8999</jmxport>
<security-enabled>false</security-enabled>
</management>
@@ -218,10 +218,6 @@
<delay>0</delay>
<timeoutFactor>2.0</timeoutFactor>
</heartbeat>
-
- <queue>
- <auto_register>false</auto_register>
- </queue>
<virtualhosts>${conf}/virtualhosts.xml</virtualhosts>
</broker>
Modified: incubator/qpid/branches/M2.1/java/systests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/pom.xml?rev=639629&r1=639628&r2=639629&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/systests/pom.xml (original)
+++ incubator/qpid/branches/M2.1/java/systests/pom.xml Fri Mar 21 06:17:11 2008
@@ -90,7 +90,7 @@
</property>
<property>
<name>QPID_EXAMPLE_HOME</name>
- <value>${basedir}</value>
+
<value>${basedir}/${topDirectoryLocation}/broker</value>
</property>
<property>
<name>QPID_HOME</name>
