Author: rgodfrey
Date: Tue Aug 2 21:30:37 2016
New Revision: 1755006
URL: http://svn.apache.org/viewvc?rev=1755006&view=rev
Log:
QPID-7318 : Address review comments from [~lorenz.quack]
Added:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRuleBasedAccessControlProvider.java
- copied, changed from r1754998,
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRulesBasedAccessControlProvider.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProvider.java
- copied, changed from r1754998,
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImpl.java
- copied, changed from r1754998,
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderFactoryTest.java
- copied, changed from r1754998,
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImplTest.java
- copied, changed from r1754998,
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java
Removed:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRulesBasedAccessControlProvider.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java
Modified:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedAccessControlProviderImpl.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProviderImpl.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
Copied:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRuleBasedAccessControlProvider.java
(from r1754998,
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRulesBasedAccessControlProvider.java)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRuleBasedAccessControlProvider.java?p2=qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRuleBasedAccessControlProvider.java&p1=qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRulesBasedAccessControlProvider.java&r1=1754998&r2=1755006&rev=1755006&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRulesBasedAccessControlProvider.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRuleBasedAccessControlProvider.java
Tue Aug 2 21:30:37 2016
@@ -50,7 +50,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.access.config.RuleSet;
-abstract class AbstractCommonRulesBasedAccessControlProvider<X extends
AbstractCommonRulesBasedAccessControlProvider<X,T,Y>, T extends
EventLoggerProvider & ConfiguredObject<?>, Y extends
CommonAccessControlProvider<Y>>
+abstract class AbstractCommonRuleBasedAccessControlProvider<X extends
AbstractCommonRuleBasedAccessControlProvider<X,T,Y>, T extends
EventLoggerProvider & ConfiguredObject<?>, Y extends
CommonAccessControlProvider<Y>>
extends AbstractLegacyAccessControlProvider<X, T, Y> implements
EventLoggerProvider
{
@@ -59,7 +59,7 @@ abstract class AbstractCommonRulesBasedA
@ManagedAttributeField
private List<AclRule> _rules;
- AbstractCommonRulesBasedAccessControlProvider(final Map<String, Object>
attributes, final T parent)
+ AbstractCommonRuleBasedAccessControlProvider(final Map<String, Object>
attributes, final T parent)
{
super(attributes, parent);
}
Copied:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProvider.java
(from r1754998,
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProvider.java?p2=qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProvider.java&p1=qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java&r1=1754998&r2=1755006&rev=1755006&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProvider.java
Tue Aug 2 21:30:37 2016
@@ -26,8 +26,8 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedOperation;
-@ManagedObject( category = false,
type=ACLFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE )
-public interface ACLFileAccessControlProvider<X extends
ACLFileAccessControlProvider<X>> extends AccessControlProvider<X>
+@ManagedObject( category = false,
type=AclFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE )
+public interface AclFileAccessControlProvider<X extends
AclFileAccessControlProvider<X>> extends AccessControlProvider<X>
{
String ACL_FILE_PROVIDER_TYPE = "AclFile";
String PATH = "path";
Copied:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImpl.java
(from r1754998,
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImpl.java?p2=qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImpl.java&p1=qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java&r1=1754998&r2=1755006&rev=1755006&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImpl.java
Tue Aug 2 21:30:37 2016
@@ -41,11 +41,11 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.access.config.RuleBasedAccessControl;
import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
-public class ACLFileAccessControlProviderImpl
- extends
AbstractLegacyAccessControlProvider<ACLFileAccessControlProviderImpl,
Broker<?>, AccessControlProvider<?>>
- implements
ACLFileAccessControlProvider<ACLFileAccessControlProviderImpl>
+public class AclFileAccessControlProviderImpl
+ extends
AbstractLegacyAccessControlProvider<AclFileAccessControlProviderImpl,
Broker<?>, AccessControlProvider<?>>
+ implements
AclFileAccessControlProvider<AclFileAccessControlProviderImpl>
{
- private static final Logger LOGGER =
LoggerFactory.getLogger(ACLFileAccessControlProviderImpl.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(AclFileAccessControlProviderImpl.class);
static
{
@@ -58,7 +58,7 @@ public class ACLFileAccessControlProvide
private String _path;
@ManagedObjectFactoryConstructor
- public ACLFileAccessControlProviderImpl(Map<String, Object> attributes,
Broker broker)
+ public AclFileAccessControlProviderImpl(Map<String, Object> attributes,
Broker broker)
{
super(attributes, broker);
_broker = broker;
Modified:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedAccessControlProviderImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedAccessControlProviderImpl.java?rev=1755006&r1=1755005&r2=1755006&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedAccessControlProviderImpl.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedAccessControlProviderImpl.java
Tue Aug 2 21:30:37 2016
@@ -29,7 +29,7 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
class RuleBasedAccessControlProviderImpl
- extends
AbstractCommonRulesBasedAccessControlProvider<RuleBasedAccessControlProviderImpl,
Broker<?>, AccessControlProvider<?>>
+ extends
AbstractCommonRuleBasedAccessControlProvider<RuleBasedAccessControlProviderImpl,
Broker<?>, AccessControlProvider<?>>
implements
RuleBasedAccessControlProvider<RuleBasedAccessControlProviderImpl>
{
Modified:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProviderImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProviderImpl.java?rev=1755006&r1=1755005&r2=1755006&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProviderImpl.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProviderImpl.java
Tue Aug 2 21:30:37 2016
@@ -32,7 +32,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
public class RuleBasedVirtualHostAccessControlProviderImpl
- extends
AbstractCommonRulesBasedAccessControlProvider<RuleBasedVirtualHostAccessControlProviderImpl,
VirtualHost<?>, VirtualHostAccessControlProvider<?>>
+ extends
AbstractCommonRuleBasedAccessControlProvider<RuleBasedVirtualHostAccessControlProviderImpl,
VirtualHost<?>, VirtualHostAccessControlProvider<?>>
implements
RuleBasedVirtualHostAccessControlProvider<RuleBasedVirtualHostAccessControlProviderImpl>
{
private static final EnumSet<ObjectType> ALLOWED_OBJECT_TYPES =
EnumSet.of(ObjectType.ALL,
Copied:
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderFactoryTest.java
(from r1754998,
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderFactoryTest.java?p2=qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderFactoryTest.java&p1=qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java&r1=1754998&r2=1755006&rev=1755006&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderFactoryTest.java
Tue Aug 2 21:30:37 2016
@@ -40,7 +40,7 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
-public class ACLFileAccessControlProviderFactoryTest extends QpidTestCase
+public class AclFileAccessControlProviderFactoryTest extends QpidTestCase
{
private Broker _broker;
private ConfiguredObjectFactoryImpl _objectFactory;
@@ -68,7 +68,7 @@ public class ACLFileAccessControlProvide
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(AccessControlProvider.ID, UUID.randomUUID());
attributes.put(AccessControlProvider.NAME, "acl");
- attributes.put(AccessControlProvider.TYPE,
ACLFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE);
+ attributes.put(AccessControlProvider.TYPE,
AclFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE);
try
{
@@ -88,8 +88,8 @@ public class ACLFileAccessControlProvide
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(AccessControlProvider.ID, UUID.randomUUID());
attributes.put(AccessControlProvider.NAME, "acl");
- attributes.put(AccessControlProvider.TYPE,
ACLFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE);
- attributes.put(ACLFileAccessControlProvider.PATH,
aclFile.getAbsolutePath());
+ attributes.put(AccessControlProvider.TYPE,
AclFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE);
+ attributes.put(AclFileAccessControlProvider.PATH,
aclFile.getAbsolutePath());
AccessControlProvider acl =
_objectFactory.create(AccessControlProvider.class, attributes, _broker);
assertNotNull("ACL was not created from acl file: " +
aclFile.getAbsolutePath(), acl);
@@ -102,8 +102,8 @@ public class ACLFileAccessControlProvide
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(AccessControlProvider.ID, UUID.randomUUID());
attributes.put(AccessControlProvider.NAME, "acl");
- attributes.put(AccessControlProvider.TYPE,
ACLFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE);
- attributes.put(ACLFileAccessControlProvider.PATH,
aclFile.getAbsolutePath());
+ attributes.put(AccessControlProvider.TYPE,
AclFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE);
+ attributes.put(AclFileAccessControlProvider.PATH,
aclFile.getAbsolutePath());
try
{
AccessControlProvider control =
_objectFactory.create(AccessControlProvider.class, attributes, _broker);
Copied:
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImplTest.java
(from r1754998,
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImplTest.java?p2=qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImplTest.java&p1=qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java&r1=1754998&r2=1755006&rev=1755006&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImplTest.java
Tue Aug 2 21:30:37 2016
@@ -39,7 +39,7 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.Model;
import org.apache.qpid.test.utils.QpidTestCase;
-public class ACLFileAccessControlProviderImplTest extends QpidTestCase
+public class AclFileAccessControlProviderImplTest extends QpidTestCase
{
private TaskExecutor _taskExecutor;
private Model _model;
@@ -65,10 +65,10 @@ public class ACLFileAccessControlProvide
String aclFilePath = new File(TMP_FOLDER, "test_" + getTestName() +
System.nanoTime() + ".acl").getAbsolutePath();
attributes.put("path", aclFilePath);
- attributes.put(ACLFileAccessControlProvider.NAME, getTestName());
+ attributes.put(AclFileAccessControlProvider.NAME, getTestName());
- ACLFileAccessControlProviderImpl aclProvider = new
ACLFileAccessControlProviderImpl(attributes, _broker);
+ AclFileAccessControlProviderImpl aclProvider = new
AclFileAccessControlProviderImpl(attributes, _broker);
try
{
aclProvider.create();
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1755006&r1=1755005&r2=1755006&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
(original)
+++
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
Tue Aug 2 21:30:37 2016
@@ -53,7 +53,7 @@ import org.apache.qpid.server.model.adap
import org.apache.qpid.server.model.adapter.FileBasedGroupProviderImpl;
import org.apache.qpid.server.plugin.PluggableFactoryLoader;
import org.apache.qpid.server.plugin.SystemConfigFactory;
-import
org.apache.qpid.server.security.access.plugins.ACLFileAccessControlProvider;
+import
org.apache.qpid.server.security.access.plugins.AclFileAccessControlProvider;
import org.apache.qpid.server.security.access.plugins.AclRule;
import
org.apache.qpid.server.security.access.plugins.RuleBasedAccessControlProvider;
import org.apache.qpid.server.store.AbstractMemoryStore;
@@ -334,8 +334,8 @@ public class TestBrokerConfiguration
{
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(AccessControlProvider.NAME, ENTRY_NAME_ACL_FILE);
- attributes.put(AccessControlProvider.TYPE,
ACLFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE);
- attributes.put(ACLFileAccessControlProvider.PATH, aclFilePath);
+ attributes.put(AccessControlProvider.TYPE,
AclFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE);
+ attributes.put(AclFileAccessControlProvider.PATH, aclFilePath);
return addObjectConfiguration(AccessControlProvider.class, attributes);
}
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java?rev=1755006&r1=1755005&r2=1755006&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
Tue Aug 2 21:30:37 2016
@@ -33,7 +33,7 @@ import org.apache.qpid.server.model.Acce
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.security.AllowAllAccessControlProvider;
-import
org.apache.qpid.server.security.access.plugins.ACLFileAccessControlProvider;
+import
org.apache.qpid.server.security.access.plugins.AclFileAccessControlProvider;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
import org.apache.qpid.test.utils.TestFileUtils;
@@ -194,7 +194,7 @@ public class AccessControlProviderRestTe
Map<String, Object> acl =
getRestTestHelper().getJsonAsSingletonList("accesscontrolprovider/" +
TestBrokerConfiguration.ENTRY_NAME_ACL_FILE + "?" + RestServlet.OVERSIZE_PARAM
+ "=" + (file.getAbsolutePath().length()+10));
assertEquals("Unexpected id", id.toString(),
acl.get(AccessControlProvider.ID));
- assertEquals("Unexpected path", file.getAbsolutePath() ,
acl.get(ACLFileAccessControlProvider.PATH));
+ assertEquals("Unexpected path", file.getAbsolutePath() ,
acl.get(AclFileAccessControlProvider.PATH));
assertEquals("Unexpected state", State.ERRORED.name(),
acl.get(AccessControlProvider.STATE));
int status =
getRestTestHelper().submitRequest("accesscontrolprovider/" +
TestBrokerConfiguration.ENTRY_NAME_ACL_FILE, "DELETE");
@@ -222,8 +222,8 @@ public class AccessControlProviderRestTe
File file = TestFileUtils.createTempFile(this, ".acl", content);
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(AccessControlProvider.NAME, accessControlProviderName);
- attributes.put(AccessControlProvider.TYPE,
ACLFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE);
- attributes.put(ACLFileAccessControlProvider.PATH,
file.getAbsoluteFile());
+ attributes.put(AccessControlProvider.TYPE,
AclFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE);
+ attributes.put(AclFileAccessControlProvider.PATH,
file.getAbsoluteFile());
return getRestTestHelper().submitRequest("accesscontrolprovider/" +
accessControlProviderName, "PUT", attributes);
}
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1755006&r1=1755005&r2=1755006&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
Tue Aug 2 21:30:37 2016
@@ -49,7 +49,7 @@ import org.apache.qpid.server.model.adap
import org.apache.qpid.server.security.AllowAllAccessControlProvider;
import org.apache.qpid.server.security.FileKeyStore;
import org.apache.qpid.server.security.FileTrustStore;
-import
org.apache.qpid.server.security.access.plugins.ACLFileAccessControlProvider;
+import
org.apache.qpid.server.security.access.plugins.AclFileAccessControlProvider;
import org.apache.qpid.server.security.acl.AbstractACLTestCase;
import
org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManager;
import
org.apache.qpid.server.security.auth.manager.PlainPasswordDatabaseAuthenticationManager;
@@ -1128,8 +1128,8 @@ public class BrokerACLTest extends QpidR
File file = TestFileUtils.createTempFile(this, ".acl",
_secondaryAclFileContent);
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(AccessControlProvider.NAME, accessControlProviderName);
- attributes.put(AccessControlProvider.TYPE,
ACLFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE);
- attributes.put(ACLFileAccessControlProvider.PATH,
file.getAbsoluteFile());
+ attributes.put(AccessControlProvider.TYPE,
AclFileAccessControlProvider.ACL_FILE_PROVIDER_TYPE);
+ attributes.put(AclFileAccessControlProvider.PATH,
file.getAbsoluteFile());
return getRestTestHelper().submitRequest("accesscontrolprovider/" +
accessControlProviderName, "PUT", attributes);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
