diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-06-26 13:53:49 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-06-26 13:53:49 +0000 |
| commit | 4edfb54cabefeba396f8e326fd22ce55854ac406 (patch) | |
| tree | 81ae399400fa05f9aa6f0abe338f3be627c7595b /qpid/java/systests/etc | |
| parent | a2f311080878ce6a9bd24dc456225baa9a3ffcef (diff) | |
| download | qpid-python-4edfb54cabefeba396f8e326fd22ce55854ac406.tar.gz | |
QPID-3301: remove support for ACL V1 (aka SimpleXML) from Java Broker.
Applied patch from Keith Wall <keith.wall@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1139792 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/etc')
4 files changed, 0 insertions, 265 deletions
diff --git a/qpid/java/systests/etc/config-systests-acl-settings.xml b/qpid/java/systests/etc/config-systests-acl-settings.xml deleted file mode 100644 index eebc75f05f..0000000000 --- a/qpid/java/systests/etc/config-systests-acl-settings.xml +++ /dev/null @@ -1,26 +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> - <virtualhosts>${QPID_HOME}/etc/virtualhosts-systests-acl.xml</virtualhosts> -</broker> - - diff --git a/qpid/java/systests/etc/config-systests-acl.xml b/qpid/java/systests/etc/config-systests-acl.xml deleted file mode 100644 index 535108235e..0000000000 --- a/qpid/java/systests/etc/config-systests-acl.xml +++ /dev/null @@ -1,30 +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. - - - --> -<configuration> - <system/> - <override> - <xml fileName="${test.config}" optional="true"/> - <xml fileName="${QPID_HOME}/etc/config-systests-acl-settings.xml"/> - <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/> - <xml fileName="${QPID_HOME}/etc/config.xml"/> - </override> -</configuration> diff --git a/qpid/java/systests/etc/virtualhosts-systests-acl-settings.xml b/qpid/java/systests/etc/virtualhosts-systests-acl-settings.xml deleted file mode 100644 index ffbace569f..0000000000 --- a/qpid/java/systests/etc/virtualhosts-systests-acl-settings.xml +++ /dev/null @@ -1,180 +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. - - - --> -<virtualhosts> - <virtualhost> - <name>test</name> - <test> - <queues> - <exchange>amq.direct</exchange> - <!-- 4Mb --> - <maximumQueueDepth>4235264</maximumQueueDepth> - <!-- 2Mb --> - <maximumMessageSize>2117632</maximumMessageSize> - <!-- 10 mins --> - <maximumMessageAge>600000</maximumMessageAge> - </queues> - - - <security> - <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_key> - <value>TempQueue*</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> - <temporary> - <users> - <user>client</user> - </users> - </temporary> - - <!-- Only allow the server to consume from the Request Queue--> - <queue> - <name>example.RequestQueue</name> - <users> - <user>server</user> - </users> - </queue> - - <!-- Allow client and server to consume from the kipper Queue--> - <queue> - <name>clientid:kipper</name> - <users> - <user>client</user> - <user>server</user> - </users> - </queue> - </queues> - </consume> - - <!-- This section grants users the ability to create queues and exchanges --> - <create> - <queues> - <temporary> - <users> - <user>client</user> - </users> - </temporary> - - <!-- Allow clients to create queue on this exchange--> - <queue> - <exchanges> - <exchange> - <name>amq.direct</name> - <users> - <user>client</user> - <user>server</user> - </users> - </exchange> - <exchange> - <name>amq.topic</name> - <users> - <user>client</user> - <user>server</user> - </users> - </exchange> - </exchanges> - </queue> - - <!-- everyone can create the kipper queue --> - <queue> - <name>clientid:kipper</name> - <users> - <user>client</user> - <user>server</user> - </users> - </queue> - - <!-- Allow the server to create the Request Queue--> - <queue> - <name>example.RequestQueue</name> - <users> - <user>server</user> - </users> - </queue> - </queues> - </create> - - <delete> - <queues> - <!-- only client can delete the kipper queue --> - <queue> - <name>clientid:kipper</name> - <users> - <user>client</user> - </users> - </queue> - </queues> - </delete> - </access_control_list> - </security> - </test> - </virtualhost> - - <virtualhost> - <name>test2</name> - <test2> - <security> - <access_control_list> - <!-- This section grants specific users full permissions to all artifacts in this virtualhost --> - <access> - <users> - <user>guest</user> - </users> - </access> - </access_control_list> - </security> - </test2> - </virtualhost> -</virtualhosts> - - diff --git a/qpid/java/systests/etc/virtualhosts-systests-acl.xml b/qpid/java/systests/etc/virtualhosts-systests-acl.xml deleted file mode 100644 index 4a56c39de0..0000000000 --- a/qpid/java/systests/etc/virtualhosts-systests-acl.xml +++ /dev/null @@ -1,29 +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. - - - --> -<configuration> - <system/> - <override> - <xml fileName="${test.virtualhosts}" optional="true"/> - <xml fileName="${QPID_HOME}/etc/virtualhosts-systests-acl-settings.xml"/> - <xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/> - </override> -</configuration> |