You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/08/12 17:19:55 UTC
cvs commit: cocoon-lenya/src/test/org/apache/lenya/cms/ac2 AccessControlTest.java
andreas 2003/08/12 08:19:55
Modified: src/test/org/apache/lenya/cms/ac2 AccessControlTest.java
Log:
using DEFAULT_RESOLVER from AccessControllerResolver
Revision Changes Path
1.6 +12 -12 cocoon-lenya/src/test/org/apache/lenya/cms/ac2/AccessControlTest.java
Index: AccessControlTest.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/test/org/apache/lenya/cms/ac2/AccessControlTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AccessControlTest.java 15 Jul 2003 13:50:44 -0000 1.5
+++ AccessControlTest.java 12 Aug 2003 15:19:55 -0000 1.6
@@ -94,8 +94,6 @@
protected static final String URL = "/test/authoring/index.html";
- protected static final String DEFAULT_RESOLVER = "publication";
-
/** @see junit.framework.TestCase#setUp() */
protected void setUp() throws Exception {
@@ -109,23 +107,22 @@
accessControllerResolverSelector =
(ComponentSelector) manager.lookup(AccessControllerResolver.ROLE + "Selector");
assertNotNull(accessControllerResolverSelector);
-
- accessControllerResolver = (AccessControllerResolver) accessControllerResolverSelector.select(DEFAULT_RESOLVER);
+
+ accessControllerResolver =
+ (AccessControllerResolver) accessControllerResolverSelector.select(
+ AccessControllerResolver.DEFAULT_RESOLVER);
assertNotNull(accessControllerResolver);
getLogger().info(
"Using access controller resolver: [" + accessControllerResolver.getClass() + "]");
- String contextUri =
- "file://" + PublicationHelper.getPublication().getServletContext().getAbsolutePath();
accessController =
(DefaultAccessController)
(
(
PublicationAccessControllerResolver) accessControllerResolver)
.resolveAccessController(
- URL,
- contextUri);
+ URL);
assertNotNull(accessController);
getLogger().info("Resolved access controller: [" + accessController.getClass() + "]");
@@ -138,8 +135,11 @@
new File(
PublicationHelper.getPublication().getDirectory(),
"config/ac/passwd".replace('/', File.separatorChar));
- ((FileAccreditableManager) accessController.getAccreditableManager())
- .setConfigurationDirectory(accreditablesDirectory);
+ (
+ (FileAccreditableManager) accessController
+ .getAccreditableManager())
+ .setConfigurationDirectory(
+ accreditablesDirectory);
String role = AccreditableManager.ROLE + "Selector";
@@ -182,7 +182,7 @@
return identity;
}
-
+
/**
* Returns the policy manager.
* @return A policy manager.
@@ -190,7 +190,7 @@
protected FilePolicyManager getPolicyManager() {
return (FilePolicyManager) getAccessController().getPolicyManager();
}
-
+
/**
* Returns the accreditable manager.
* @return An accreditable manager.
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org