diff options
| author | Aidan Skinner <aidan@apache.org> | 2009-11-11 22:59:29 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@apache.org> | 2009-11-11 22:59:29 +0000 |
| commit | 67d52c4f42fc59b5d340a63cacc735fb2f394937 (patch) | |
| tree | 1fc17001f9959352158f77dd680c6021eefd4dde /qpid/java/systests/etc | |
| parent | b6666ca13a6ebe88d232702cdac47c458d265c52 (diff) | |
| download | qpid-python-67d52c4f42fc59b5d340a63cacc735fb2f394937.tar.gz | |
QPID-2184: make sure global security plugins are reconfigured properly
ServerConfigurationTest: add test for reloading firewall config in main section,
not just as a combined file
FirewallConfigTest: add a systest for firewalls with real broker
QpidTestCase: add a reloadBroker() method
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@835115 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/etc')
| -rw-r--r-- | qpid/java/systests/etc/config-systests-firewall-settings.xml | 28 | ||||
| -rw-r--r-- | qpid/java/systests/etc/config-systests-firewall.xml | 30 |
2 files changed, 58 insertions, 0 deletions
diff --git a/qpid/java/systests/etc/config-systests-firewall-settings.xml b/qpid/java/systests/etc/config-systests-firewall-settings.xml new file mode 100644 index 0000000000..d115e74663 --- /dev/null +++ b/qpid/java/systests/etc/config-systests-firewall-settings.xml @@ -0,0 +1,28 @@ +<?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> + <security> + <firewall> + <rule access="allow" network="127.0.0.1"/> + </firewall> + </security> +</broker> diff --git a/qpid/java/systests/etc/config-systests-firewall.xml b/qpid/java/systests/etc/config-systests-firewall.xml new file mode 100644 index 0000000000..90773f5cc2 --- /dev/null +++ b/qpid/java/systests/etc/config-systests-firewall.xml @@ -0,0 +1,30 @@ +<?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}" config-optional="true"/> + <xml fileName="${QPID_FIREWALL_SETTINGS}"/> + <xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/> + <xml fileName="${QPID_HOME}/etc/config.xml"/> + </override> +</configuration> |