Author: ritchiem Date: Thu Jun 3 21:29:34 2010 New Revision: 951167 URL: http://svn.apache.org/viewvc?rev=951167&view=rev Log: Cleanup code. Configuration security.access is not used anymore
Modified: qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java qpid/trunk/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml qpid/trunk/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml qpid/trunk/qpid/java/systests/etc/config-systests-aclv2-settings.xml qpid/trunk/qpid/java/systests/etc/config-systests-firewall-2.xml qpid/trunk/qpid/java/systests/etc/config-systests-firewall-3.xml Modified: qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java?rev=951167&r1=951166&r2=951167&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java (original) +++ qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java Thu Jun 3 21:29:34 2010 @@ -91,10 +91,11 @@ public class FirewallConfiguration exten _finalConfig.addConfiguration(new XMLConfiguration((String) subFile)); } - // all rules must have an access attribute - if (_finalConfig.getList("ru...@access]").size() == 0) + // all rules must have an access attribute or a default value + if (_finalConfig.getList("ru...@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."); } } Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java?rev=951167&r1=951166&r2=951167&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java (original) +++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java Thu Jun 3 21:29:34 2010 @@ -54,10 +54,10 @@ public class AllowAll extends BasicPlugi 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."); +// } } } Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java?rev=951167&r1=951166&r2=951167&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java (original) +++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java Thu Jun 3 21:29:34 2010 @@ -38,9 +38,7 @@ public class LegacyAccess extends BasicP 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"); } Modified: qpid/trunk/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml?rev=951167&r1=951166&r2=951167&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml (original) +++ qpid/trunk/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml Thu Jun 3 21:29:34 2010 @@ -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> Modified: qpid/trunk/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml?rev=951167&r1=951166&r2=951167&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml (original) +++ qpid/trunk/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml Thu Jun 3 21:29:34 2010 @@ -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> Modified: qpid/trunk/qpid/java/systests/etc/config-systests-aclv2-settings.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-aclv2-settings.xml?rev=951167&r1=951166&r2=951167&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/etc/config-systests-aclv2-settings.xml (original) +++ qpid/trunk/qpid/java/systests/etc/config-systests-aclv2-settings.xml Thu Jun 3 21:29:34 2010 @@ -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> Modified: qpid/trunk/qpid/java/systests/etc/config-systests-firewall-2.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-firewall-2.xml?rev=951167&r1=951166&r2=951167&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/etc/config-systests-firewall-2.xml (original) +++ qpid/trunk/qpid/java/systests/etc/config-systests-firewall-2.xml Thu Jun 3 21:29:34 2010 @@ -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> Modified: qpid/trunk/qpid/java/systests/etc/config-systests-firewall-3.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-firewall-3.xml?rev=951167&r1=951166&r2=951167&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/etc/config-systests-firewall-3.xml (original) +++ qpid/trunk/qpid/java/systests/etc/config-systests-firewall-3.xml Thu Jun 3 21:29:34 2010 @@ -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> --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org