diff options
author | Martin Ritchie <ritchiem@apache.org> | 2008-03-21 13:17:11 +0000 |
---|---|---|
committer | Martin Ritchie <ritchiem@apache.org> | 2008-03-21 13:17:11 +0000 |
commit | 94f9ab094bb983cafb97c5ab6e970f51f8bd6a3c (patch) | |
tree | 7a530168179627c7b5525a2398c23f22a0877caa | |
parent | c5443b4489acd4782ed8049c0f2c687c9fbf9c81 (diff) | |
download | qpid-python-94f9ab094bb983cafb97c5ab6e970f51f8bd6a3c.tar.gz |
QPID-868 : Removed the acl.config.xml from systests/etc and updated the systests pom file to locate the one in broker/etc.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@639629 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | java/broker/etc/acl.config.xml | 6 | ||||
-rw-r--r-- | java/systests/etc/acl.config.xml | 225 | ||||
-rw-r--r-- | java/systests/pom.xml | 2 |
3 files changed, 2 insertions, 231 deletions
diff --git a/java/broker/etc/acl.config.xml b/java/broker/etc/acl.config.xml index 701b71dbec..d7bc9fcf25 100644 --- a/java/broker/etc/acl.config.xml +++ b/java/broker/etc/acl.config.xml @@ -42,7 +42,7 @@ <socketSendBuffer>32768</socketSendBuffer> </connector> <management> - <enabled>true</enabled> + <enabled>false</enabled> <jmxport>8999</jmxport> <security-enabled>false</security-enabled> </management> @@ -219,10 +219,6 @@ <timeoutFactor>2.0</timeoutFactor> </heartbeat> - <queue> - <auto_register>false</auto_register> - </queue> - <virtualhosts>${conf}/virtualhosts.xml</virtualhosts> </broker> diff --git a/java/systests/etc/acl.config.xml b/java/systests/etc/acl.config.xml deleted file mode 100644 index ac59fa3020..0000000000 --- a/java/systests/etc/acl.config.xml +++ /dev/null @@ -1,225 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - - - Licensed to the Apache Software Foundation (ASF) under one - - or more contributor license agreements. See the NOTICE file - - distributed with this work for additional information - - regarding copyright ownership. The ASF licenses this file - - to you under the Apache License, Version 2.0 (the - - "License"); you may not use this file except in compliance - - with the License. You may obtain a copy of the License at - - - - http://www.apache.org/licenses/LICENSE-2.0 - - - - Unless required by applicable law or agreed to in writing, - - software distributed under the License is distributed on an - - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - - KIND, either express or implied. See the License for the - - specific language governing permissions and limitations - - under the License. - - - --> -<broker> - <prefix>${QPID_HOME}</prefix> - <work>${QPID_WORK}</work> - <conf>${prefix}/etc</conf> - <connector> - <!-- Uncomment out this block and edit the keystorePath and keystorePassword - to enable SSL support - <ssl> - <enabled>true</enabled> - <sslOnly>true</sslOnly> - <keystorePath>/path/to/keystore.ks</keystorePath> - <keystorePassword>keystorepass</keystorePassword> - </ssl>--> - <qpidnio>false</qpidnio> - <!-- I've had the 0.0 and 0.1 Reader threads continually throwing IOException when client closes--> - <protectio>false</protectio> - <transport>nio</transport> - <port>5672</port> - <sslport>8672</sslport> - <socketReceiveBuffer>32768</socketReceiveBuffer> - <socketSendBuffer>32768</socketSendBuffer> - </connector> - <management> - <enabled>false</enabled> - <jmxport>8999</jmxport> - <security-enabled>false</security-enabled> - </management> - <advanced> - <filterchain enableExecutorPool="true"/> - <enablePooledAllocator>false</enablePooledAllocator> - <enableDirectBuffers>false</enableDirectBuffers> - <framesize>65535</framesize> - <compressBufferOnQueue>false</compressBufferOnQueue> - <enableJMSXUserID>true</enableJMSXUserID> - </advanced> - - <security> - <principal-databases> - <!-- Example use of Base64 encoded MD5 hashes for authentication via CRAM-MD5-Hashed --> - <principal-database> - <name>passwordfile</name> - <class>org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase</class> - <attributes> - <attribute> - <name>passwordFile</name> - <value>${conf}/passwd</value> - </attribute> - </attributes> - </principal-database> - </principal-databases> - - <access> - <class>org.apache.qpid.server.security.access.plugins.DenyAll</class> - </access> - - <jmx> - <access>${conf}/jmxremote.access</access> - <principal-database>passwordfile</principal-database> - </jmx> - </security> - - <virtualhosts> - <directory>${conf}/virtualhosts</directory> - - <virtualhost> - <name>test</name> - <test> - <store> - <class>org.apache.qpid.server.store.MemoryMessageStore</class> - </store> - - <queues> - <exchange>amq.direct</exchange> - <!-- 4Mb --> - <maximumQueueDepth>4235g264</maximumQueueDepth> - <!-- 2Mb --> - <maximumMessageSize>2117632</maximumMessageSize> - <!-- 10 mins --> - <maximumMessageAge>600000</maximumMessageAge> - </queues> - - - <security> - <access> - <class>org.apache.qpid.server.security.access.plugins.SimpleXML</class> - </access> - - <access_control_list> - <!-- This section grants pubish rights to an exchange + routing key pair --> - <publish> - <exchanges> - <exchange> - <name>amq.direct</name> - <routing_keys> - - <!-- Allow clients to publish requests --> - <routing_key> - <value>example.RequestQueue</value> - <users> - <user>client</user> - </users> - </routing_key> - - <!-- Allow the processor to respond to a client on their Temporary Topic --> - <routing_key> - <value>tmp_*</value> - <users> - <user>server</user> - </users> - </routing_key> - </routing_keys> - - </exchange> - </exchanges> - </publish> - - <!-- This section grants users the ability to consume from the broker --> - <consume> - <queues> - - <!-- Allow the clients to consume from their temporary queues--> - <queue> - <temporary/> - <users> - <user>client</user> - </users> - </queue> - - - <!-- Only allow the server to consume from the Request Queue--> - <queue> - <name>example.RequestQueue</name> - <users> - <user>server</user> - </users> - </queue> - - - </queues> - </consume> - - <!-- This section grants clients the ability to create queues and exchanges --> - <create> - <queues> - <!-- Allow clients to create temporary queues--> - <queue> - <temporary/> - <exchanges> - <exchange> - <name>amq.direct</name> - <users> - <user>client</user> - </users> - </exchange> - </exchanges> - </queue> - <!-- Allow the server to create the Request Queue--> - <queue> - <name>example.RequestQueue</name> - <users> - <user>server</user> - </users> - </queue> - - </queues> - </create> - - - </access_control_list> - - </security> - </test> - </virtualhost> - - - <virtualhost> - <name>development</name> - <development> - <store> - <class>org.apache.qpid.server.store.MemoryMessageStore</class> - </store> - </development> - </virtualhost> - - <virtualhost> - <name>localhost</name> - <localhost> - <store> - <class>org.apache.qpid.server.store.MemoryMessageStore</class> - </store> - </localhost> - </virtualhost> - - </virtualhosts> - - <heartbeat> - <delay>0</delay> - <timeoutFactor>2.0</timeoutFactor> - </heartbeat> - - <virtualhosts>${conf}/virtualhosts.xml</virtualhosts> -</broker> - - diff --git a/java/systests/pom.xml b/java/systests/pom.xml index bb671603d7..e6c1fa092e 100644 --- a/java/systests/pom.xml +++ b/java/systests/pom.xml @@ -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> |