Cleanup code. Configuration security.access is not used anymore

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@951167 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 8 insertions, 26 deletions

diff --git a/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java
index 1a2bf62d73..b10656d622 100644
--- a/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java
+++ b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java
@@ -91,10 +91,11 @@ public class FirewallConfiguration extends ConfigurationPlugin
             _finalConfig.addConfiguration(new XMLConfiguration((String) subFile));
         }
 
-        // all rules must have an access attribute
-        if (_finalConfig.getList("rule[@access]").size() == 0)
+        // all rules must have an access attribute or a default value
+        if (_finalConfig.getList("rule[@access]").size() == 0 &&
+            _configuration.getString("[@default-action]") == null)
         {
-            throw new ConfigurationException("No rules found in firewall configuration.");
+            throw new ConfigurationException("No rules or default-action found in firewall configuration.");
         }
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
index 24ff44b1ae..d4777b8cb3 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
@@ -54,10 +54,10 @@ public class AllowAll extends BasicPlugin
 
         public void validateConfiguration() throws ConfigurationException
         {
-            if (!_configuration.isEmpty())
-            {
-                throw new ConfigurationException("allow-all section takes no elements.");
-            }
+//            if (!_configuration.isEmpty())
+//            {
+//                throw new ConfigurationException("allow-all section takes no elements.");
+//            }
         }
 
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
index 8cebedbc26..1250cdcb1b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
@@ -38,9 +38,7 @@ public class LegacyAccess extends BasicPlugin
             public List<String> getParentPaths()
             {
                 return Arrays.asList("security.jmx", "virtualhosts.virtualhost.security.jmx",
-                                     "security.false", "virtualhosts.virtualhost.security.false",
                                      "security.msg-auth", "virtualhosts.virtualhost.security.msg-auth",
-                                     "security.access", "virtualhosts.virtualhost.security.access",
                                      "security.principal-databases", "virtualhosts.virtualhost.security.principal-databases");
             }
 
diff --git a/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
index 7deb80bcd9..1ce9e7d8fa 100644
--- a/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
+++ b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
@@ -56,9 +56,6 @@
             </principal-database>
         </principal-databases>
 
-        <access>
-            <class>org.apache.qpid.server.security.access.plugins.AllowAll</class>
-        </access>
         <jmx>
             <access>${passwordDir}/jmxremote.access</access>
             <principal-database>passwordfile</principal-database>
diff --git a/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
index 4e32d21849..8a685c1b0d 100644
--- a/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
+++ b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
@@ -54,9 +54,6 @@
 </attributes>
 </principal-database>
 </principal-databases>
-<access>
-<class>org.apache.qpid.server.security.access.plugins.AllowAll</class>
-</access>
 <jmx>
 <access>${passwordDir}/jmxremote.access</access>
 <principal-database>passwordfile</principal-database>
diff --git a/qpid/java/systests/etc/config-systests-aclv2-settings.xml b/qpid/java/systests/etc/config-systests-aclv2-settings.xml
index a7248766db..fbf218fdfa 100644
--- a/qpid/java/systests/etc/config-systests-aclv2-settings.xml
+++ b/qpid/java/systests/etc/config-systests-aclv2-settings.xml
@@ -21,9 +21,6 @@
  -->
 <broker>
 	<security>
-		<access>
-			<class>org.apache.qpid.server.security.access.plugins.AccessControl</class>
-		</access>
 		<aclv2>${QPID_HOME}/etc/global-default.txt</aclv2>
 	</security>
 
diff --git a/qpid/java/systests/etc/config-systests-firewall-2.xml b/qpid/java/systests/etc/config-systests-firewall-2.xml
index 8380fab3d9..276f7eac71 100644
--- a/qpid/java/systests/etc/config-systests-firewall-2.xml
+++ b/qpid/java/systests/etc/config-systests-firewall-2.xml
@@ -80,10 +80,6 @@
             </principal-database>
         </principal-databases>
 
-        <access>
-            <class>org.apache.qpid.server.security.access.plugins.AllowAll</class>
-        </access>
-        
         <msg-auth>false</msg-auth>
         
         <jmx>
diff --git a/qpid/java/systests/etc/config-systests-firewall-3.xml b/qpid/java/systests/etc/config-systests-firewall-3.xml
index 2068581ca1..28584de02f 100644
--- a/qpid/java/systests/etc/config-systests-firewall-3.xml
+++ b/qpid/java/systests/etc/config-systests-firewall-3.xml
@@ -80,10 +80,6 @@
             </principal-database>
         </principal-databases>
 
-        <access>
-            <class>org.apache.qpid.server.security.access.plugins.AllowAll</class>
-        </access>
-        
         <msg-auth>false</msg-auth>
         
         <jmx>