You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/03/08 17:48:21 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/ac/cache SourceCacheImpl.java
gregor 2004/03/08 08:48:21
Modified: src/java/org/apache/lenya/cms/ac
PublicationAccessControllerResolver.java
SitemapPolicyManager.java
DocumentPolicyManagerWrapper.java
src/java/org/apache/lenya/ac/impl
ConfigurableAccessControllerResolver.java
AbstractAccreditableManager.java DefaultPolicy.java
URLPolicy.java DefaultAccessController.java
PolicyBuilder.java UserAuthenticator.java
ComposableAccessControllerResolver.java
AbstractAccessControllerResolver.java
BypassableAccessController.java
PolicyAuthorizer.java
RemovedAccreditablePolicyBuilder.java
src/java/org/apache/lenya/cms/ac/workflow
WorkflowAuthorizer.java
src/java/org/apache/lenya/ac World.java Machine.java
src/java/org/apache/lenya/ac/file
FileAccreditableManager.java FilePolicyManager.java
src/java/org/apache/lenya lenya.roles
src/java/org/apache/lenya/cms/ac/usecase
UsecaseRolesBuilder.java UsecaseAuthorizer.java
src/java/org/apache/lenya/ac/cache SourceCacheImpl.java
Log:
ac2 -> ac package rename
Revision Changes Path
1.5 +3 -3 cocoon-lenya/src/java/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java
Index: PublicationAccessControllerResolver.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PublicationAccessControllerResolver.java 3 Mar 2004 12:56:33 -0000 1.4
+++ PublicationAccessControllerResolver.java 8 Mar 2004 16:48:20 -0000 1.5
@@ -50,7 +50,7 @@
/**
* This implementation uses the publication ID in combination with the context path
* as cache key.
- * @see org.apache.lenya.cms.ac2.AbstractAccessControllerResolver#generateCacheKey(java.lang.String, org.apache.excalibur.source.SourceResolver)
+ * @see org.apache.lenya.ac.impl.AbstractAccessControllerResolver#generateCacheKey(java.lang.String, org.apache.excalibur.source.SourceResolver)
*/
protected Object generateCacheKey(String webappUrl, SourceResolver resolver)
throws AccessControlException {
@@ -67,7 +67,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.AbstractAccessControllerResolver#doResolveAccessController(java.lang.String)
+ * @see org.apache.lenya.ac.impl.AbstractAccessControllerResolver#doResolveAccessController(java.lang.String)
*/
public AccessController doResolveAccessController(String webappUrl)
throws AccessControlException {
1.3 +3 -3 cocoon-lenya/src/java/org/apache/lenya/cms/ac/SitemapPolicyManager.java
Index: SitemapPolicyManager.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/SitemapPolicyManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SitemapPolicyManager.java 3 Mar 2004 12:56:33 -0000 1.2
+++ SitemapPolicyManager.java 8 Mar 2004 16:48:20 -0000 1.3
@@ -39,7 +39,7 @@
implements PolicyManager, Serviceable {
/**
- * @see org.apache.lenya.cms.ac2.PolicyManager#getPolicy(org.apache.lenya.cms.ac2.AccreditableManager, java.lang.String)
+ * @see org.apache.lenya.ac.PolicyManager#getPolicy(org.apache.lenya.ac.AccreditableManager, java.lang.String)
*/
public Policy getPolicy(AccreditableManager accreditableManager, String url)
throws AccessControlException {
@@ -97,7 +97,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.PolicyManager#accreditableRemoved(org.apache.lenya.cms.ac2.AccreditableManager, org.apache.lenya.cms.ac2.Accreditable)
+ * @see org.apache.lenya.ac.PolicyManager#accreditableRemoved(org.apache.lenya.ac.AccreditableManager, org.apache.lenya.ac.Accreditable)
*/
public void accreditableRemoved(AccreditableManager manager, Accreditable accreditable) throws AccessControlException {
// TODO Auto-generated method stub
1.4 +11 -11 cocoon-lenya/src/java/org/apache/lenya/cms/ac/DocumentPolicyManagerWrapper.java
Index: DocumentPolicyManagerWrapper.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/DocumentPolicyManagerWrapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DocumentPolicyManagerWrapper.java 3 Mar 2004 12:56:33 -0000 1.3
+++ DocumentPolicyManagerWrapper.java 8 Mar 2004 16:48:20 -0000 1.4
@@ -174,7 +174,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.InheritingPolicyManager#buildURLPolicy(org.apache.lenya.cms.ac2.AccreditableManager,
+ * @see org.apache.lenya.ac.impl.InheritingPolicyManager#buildURLPolicy(org.apache.lenya.ac.AccreditableManager,
* java.lang.String)
*/
public DefaultPolicy buildURLPolicy(AccreditableManager controller, String url)
@@ -183,7 +183,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.InheritingPolicyManager#buildSubtreePolicy(org.apache.lenya.cms.ac2.AccreditableManager,
+ * @see org.apache.lenya.ac.impl.InheritingPolicyManager#buildSubtreePolicy(org.apache.lenya.ac.AccreditableManager,
* java.lang.String)
*/
public DefaultPolicy buildSubtreePolicy(AccreditableManager controller, String url)
@@ -192,7 +192,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.InheritingPolicyManager#getPolicies(org.apache.lenya.cms.ac2.AccreditableManager,
+ * @see org.apache.lenya.ac.impl.InheritingPolicyManager#getPolicies(org.apache.lenya.ac.AccreditableManager,
* java.lang.String)
*/
public DefaultPolicy[] getPolicies(AccreditableManager controller, String url)
@@ -201,8 +201,8 @@
}
/**
- * @see org.apache.lenya.cms.ac2.InheritingPolicyManager#saveURLPolicy(java.lang.String,
- * org.apache.lenya.cms.ac2.DefaultPolicy)
+ * @see org.apache.lenya.ac.impl.InheritingPolicyManager#saveURLPolicy(java.lang.String,
+ * org.apache.lenya.ac.impl.DefaultPolicy)
*/
public void saveURLPolicy(String url, DefaultPolicy policy) throws AccessControlException {
getPolicyManager().saveURLPolicy(getPolicyURL(url), policy);
@@ -210,15 +210,15 @@
}
/**
- * @see org.apache.lenya.cms.ac2.InheritingPolicyManager#saveSubtreePolicy(java.lang.String,
- * org.apache.lenya.cms.ac2.DefaultPolicy)
+ * @see org.apache.lenya.ac.impl.InheritingPolicyManager#saveSubtreePolicy(java.lang.String,
+ * org.apache.lenya.ac.impl.DefaultPolicy)
*/
public void saveSubtreePolicy(String url, DefaultPolicy policy) throws AccessControlException {
getPolicyManager().saveSubtreePolicy(getPolicyURL(url), policy);
}
/**
- * @see org.apache.lenya.cms.ac2.PolicyManager#getPolicy(org.apache.lenya.cms.ac2.AccreditableManager,
+ * @see org.apache.lenya.ac.PolicyManager#getPolicy(org.apache.lenya.ac.AccreditableManager,
* java.lang.String)
*/
public Policy getPolicy(AccreditableManager controller, String url)
@@ -227,8 +227,8 @@
}
/**
- * @see org.apache.lenya.cms.ac2.PolicyManager#accreditableRemoved(org.apache.lenya.cms.ac2.AccreditableManager,
- * org.apache.lenya.cms.ac2.Accreditable)
+ * @see org.apache.lenya.ac.PolicyManager#accreditableRemoved(org.apache.lenya.ac.AccreditableManager,
+ * org.apache.lenya.ac.Accreditable)
*/
public void accreditableRemoved(AccreditableManager manager, Accreditable accreditable)
throws AccessControlException {
1.3 +2 -2 cocoon-lenya/src/java/org/apache/lenya/ac/impl/ConfigurableAccessControllerResolver.java
Index: ConfigurableAccessControllerResolver.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/impl/ConfigurableAccessControllerResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfigurableAccessControllerResolver.java 3 Mar 2004 12:56:33 -0000 1.2
+++ ConfigurableAccessControllerResolver.java 8 Mar 2004 16:48:20 -0000 1.3
@@ -30,7 +30,7 @@
implements Configurable {
/**
- * @see org.apache.lenya.cms.ac2.AbstractAccessControllerResolver#doResolveAccessController(java.lang.String)
+ * @see org.apache.lenya.ac.impl.AbstractAccessControllerResolver#doResolveAccessController(java.lang.String)
*/
public AccessController doResolveAccessController(String webappUrl)
throws AccessControlException {
1.4 +5 -5 cocoon-lenya/src/java/org/apache/lenya/ac/impl/AbstractAccreditableManager.java
Index: AbstractAccreditableManager.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/impl/AbstractAccreditableManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractAccreditableManager.java 3 Mar 2004 12:56:33 -0000 1.3
+++ AbstractAccreditableManager.java 8 Mar 2004 16:48:20 -0000 1.4
@@ -149,7 +149,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.AccreditableManager#getUserManager()
+ * @see org.apache.lenya.ac.AccreditableManager#getUserManager()
*/
public UserManager getUserManager() throws AccessControlException {
if (userManager == null) {
@@ -160,7 +160,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.AccreditableManager#getGroupManager()
+ * @see org.apache.lenya.ac.AccreditableManager#getGroupManager()
*/
public GroupManager getGroupManager() throws AccessControlException {
if (groupManager == null) {
@@ -171,7 +171,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.AccreditableManager#getRoleManager()
+ * @see org.apache.lenya.ac.AccreditableManager#getRoleManager()
*/
public RoleManager getRoleManager() throws AccessControlException {
if (roleManager == null) {
@@ -182,7 +182,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.AccreditableManager#getIPRangeManager()
+ * @see org.apache.lenya.ac.AccreditableManager#getIPRangeManager()
*/
public IPRangeManager getIPRangeManager() throws AccessControlException {
if (ipRangeManager == null) {
1.4 +4 -4 cocoon-lenya/src/java/org/apache/lenya/ac/impl/DefaultPolicy.java
Index: DefaultPolicy.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/impl/DefaultPolicy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultPolicy.java 3 Mar 2004 12:56:33 -0000 1.3
+++ DefaultPolicy.java 8 Mar 2004 16:48:20 -0000 1.4
@@ -117,7 +117,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.Policy#getRoles(org.apache.lenya.cms.ac2.Identity)
+ * @see org.apache.lenya.ac.Policy#getRoles(org.apache.lenya.ac.Identity)
*/
public Role[] getRoles(Identity identity) {
Accreditable[] accreditables = identity.getAccreditables();
@@ -152,7 +152,7 @@
private boolean isSSL;
/**
- * @see org.apache.lenya.cms.ac2.Policy#isSSLProtected()
+ * @see org.apache.lenya.ac.Policy#isSSLProtected()
*/
public boolean isSSLProtected() throws AccessControlException {
return isSSL;
@@ -168,7 +168,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.Policy#isEmpty()
+ * @see org.apache.lenya.ac.Policy#isEmpty()
*/
public boolean isEmpty() throws AccessControlException {
return getCredentials().length == 0;
1.5 +2 -2 cocoon-lenya/src/java/org/apache/lenya/ac/impl/URLPolicy.java
Index: URLPolicy.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/impl/URLPolicy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- URLPolicy.java 8 Mar 2004 16:03:40 -0000 1.4
+++ URLPolicy.java 8 Mar 2004 16:48:20 -0000 1.5
@@ -72,7 +72,7 @@
}
/**
- * @see org.apache.lenya.ac.Policy#getRoles(org.apache.lenya.cms.ac2.Identity)
+ * @see org.apache.lenya.ac.Policy#getRoles(org.apache.lenya.ac.Identity)
*/
public Role[] getRoles(Identity identity) throws AccessControlException {
obtainPolicies();
1.4 +4 -4 cocoon-lenya/src/java/org/apache/lenya/ac/impl/DefaultAccessController.java
Index: DefaultAccessController.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/impl/DefaultAccessController.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultAccessController.java 3 Mar 2004 12:56:33 -0000 1.3
+++ DefaultAccessController.java 8 Mar 2004 16:48:20 -0000 1.4
@@ -74,7 +74,7 @@
private Authenticator authenticator;
/**
- * @see org.apache.lenya.cms.ac2.AccessController#authenticate(org.apache.cocoon.environment.Request)
+ * @see org.apache.lenya.ac.AccessController#authenticate(org.apache.cocoon.environment.Request)
*/
public boolean authenticate(Request request) throws AccessControlException {
@@ -85,7 +85,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.AccessController#authorize(org.apache.cocoon.environment.Request)
+ * @see org.apache.lenya.ac.AccessController#authorize(org.apache.cocoon.environment.Request)
*/
public boolean authorize(Request request) throws AccessControlException {
@@ -383,7 +383,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.AccessController#setupIdentity(org.apache.cocoon.environment.Request)
+ * @see org.apache.lenya.ac.AccessController#setupIdentity(org.apache.cocoon.environment.Request)
*/
public void setupIdentity(Request request) throws AccessControlException {
Session session = request.getSession(true);
1.3 +2 -2 cocoon-lenya/src/java/org/apache/lenya/ac/impl/PolicyBuilder.java
Index: PolicyBuilder.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/impl/PolicyBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PolicyBuilder.java 3 Mar 2004 12:56:33 -0000 1.2
+++ PolicyBuilder.java 8 Mar 2004 16:48:20 -0000 1.3
@@ -248,7 +248,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.cache.InputStreamBuilder#build(org.apache.excalibur.source.Source)
+ * @see org.apache.lenya.ac.cache.InputStreamBuilder#build(org.apache.excalibur.source.Source)
*/
public Object build(InputStream stream) throws BuildException {
Object value = null;
1.5 +2 -2 cocoon-lenya/src/java/org/apache/lenya/ac/impl/UserAuthenticator.java
Index: UserAuthenticator.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/impl/UserAuthenticator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UserAuthenticator.java 3 Mar 2004 12:56:33 -0000 1.4
+++ UserAuthenticator.java 8 Mar 2004 16:48:20 -0000 1.5
@@ -30,7 +30,7 @@
public class UserAuthenticator extends AbstractLogEnabled implements Authenticator {
/**
- * @see org.apache.lenya.cms.ac2.Authenticator#authenticate(org.apache.cocoon.environment.Request)
+ * @see org.apache.lenya.ac.Authenticator#authenticate(org.apache.cocoon.environment.Request)
*/
public boolean authenticate(AccreditableManager accreditableManager, Request request)
throws AccessControlException {
1.3 +3 -3 cocoon-lenya/src/java/org/apache/lenya/ac/impl/ComposableAccessControllerResolver.java
Index: ComposableAccessControllerResolver.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/impl/ComposableAccessControllerResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComposableAccessControllerResolver.java 3 Mar 2004 12:56:33 -0000 1.2
+++ ComposableAccessControllerResolver.java 8 Mar 2004 16:48:20 -0000 1.3
@@ -37,7 +37,7 @@
implements Configurable, Disposable {
/**
- * @see org.apache.lenya.cms.ac2.AbstractAccessControllerResolver#doResolveAccessController(java.lang.String)
+ * @see org.apache.lenya.ac.impl.AbstractAccessControllerResolver#doResolveAccessController(java.lang.String)
*/
public AccessController doResolveAccessController(String url) throws AccessControlException {
@@ -73,7 +73,7 @@
private Map controllerToResolver = new HashMap();
/**
- * @see org.apache.lenya.cms.ac2.AccessControllerResolver#release(org.apache.lenya.cms.ac2.AccessController)
+ * @see org.apache.lenya.ac.AccessControllerResolver#release(org.apache.lenya.ac.AccessController)
*/
public void release(AccessController controller) {
assert controller != null;
1.3 +3 -3 cocoon-lenya/src/java/org/apache/lenya/ac/impl/AbstractAccessControllerResolver.java
Index: AbstractAccessControllerResolver.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/impl/AbstractAccessControllerResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractAccessControllerResolver.java 3 Mar 2004 12:56:33 -0000 1.2
+++ AbstractAccessControllerResolver.java 8 Mar 2004 16:48:20 -0000 1.3
@@ -39,7 +39,7 @@
private CacheMap cache = new CacheMap(CAPACITY);
/**
- * @see org.apache.lenya.cms.ac2.AccessControllerResolver#resolveAccessController(java.lang.String)
+ * @see org.apache.lenya.ac.AccessControllerResolver#resolveAccessController(java.lang.String)
*/
public AccessController resolveAccessController(String webappUrl)
throws AccessControlException {
@@ -103,7 +103,7 @@
throws AccessControlException;
/**
- * @see org.apache.lenya.cms.ac2.AccessControllerResolver#release(org.apache.lenya.cms.ac2.AccessController)
+ * @see org.apache.lenya.ac.AccessControllerResolver#release(org.apache.lenya.ac.AccessController)
*/
public void release(AccessController controller) {
/*
1.3 +2 -2 cocoon-lenya/src/java/org/apache/lenya/ac/impl/BypassableAccessController.java
Index: BypassableAccessController.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/impl/BypassableAccessController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BypassableAccessController.java 3 Mar 2004 12:56:33 -0000 1.2
+++ BypassableAccessController.java 8 Mar 2004 16:48:20 -0000 1.3
@@ -121,7 +121,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.AccessController#authorize(org.apache.lenya.cms.publication.Publication, org.apache.cocoon.environment.Request)
+ * @see org.apache.lenya.ac.AccessController#authorize(org.apache.lenya.cms.publication.Publication, org.apache.cocoon.environment.Request)
*/
public boolean authorize(Request request)
throws AccessControlException {
1.3 +2 -2 cocoon-lenya/src/java/org/apache/lenya/ac/impl/PolicyAuthorizer.java
Index: PolicyAuthorizer.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/impl/PolicyAuthorizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PolicyAuthorizer.java 3 Mar 2004 12:56:33 -0000 1.2
+++ PolicyAuthorizer.java 8 Mar 2004 16:48:20 -0000 1.3
@@ -81,7 +81,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.Authorizer#authorize(org.apache.lenya.cms.ac2.Identity, java.lang.String, java.util.Map)
+ * @see org.apache.lenya.ac.Authorizer#authorize(org.apache.lenya.ac.Identity, java.lang.String, java.util.Map)
*/
public boolean authorize(Request request)
throws AccessControlException {
1.4 +2 -2 cocoon-lenya/src/java/org/apache/lenya/ac/impl/RemovedAccreditablePolicyBuilder.java
Index: RemovedAccreditablePolicyBuilder.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/impl/RemovedAccreditablePolicyBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemovedAccreditablePolicyBuilder.java 3 Mar 2004 12:56:33 -0000 1.3
+++ RemovedAccreditablePolicyBuilder.java 8 Mar 2004 16:48:20 -0000 1.4
@@ -51,7 +51,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.PolicyBuilder#getAccreditable(java.lang.String, java.lang.String)
+ * @see org.apache.lenya.ac.impl.PolicyBuilder#getAccreditable(java.lang.String, java.lang.String)
*/
protected Accreditable getAccreditable(String elementName, String id)
throws AccessControlException {
1.4 +2 -2 cocoon-lenya/src/java/org/apache/lenya/cms/ac/workflow/WorkflowAuthorizer.java
Index: WorkflowAuthorizer.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/workflow/WorkflowAuthorizer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WorkflowAuthorizer.java 3 Mar 2004 12:56:33 -0000 1.3
+++ WorkflowAuthorizer.java 8 Mar 2004 16:48:21 -0000 1.4
@@ -46,7 +46,7 @@
protected static final String EVENT_PARAMETER = "lenya.event";
/**
- * @see org.apache.lenya.cms.ac2.Authorizer#authorize(org.apache.lenya.cms.ac2.Identity,
+ * @see org.apache.lenya.ac.Authorizer#authorize(org.apache.lenya.ac.Identity,
* org.apache.cocoon.environment.Request)
*/
public boolean authorize(Request request) throws AccessControlException {
1.3 +2 -2 cocoon-lenya/src/java/org/apache/lenya/ac/World.java
Index: World.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/World.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- World.java 3 Mar 2004 12:56:31 -0000 1.2
+++ World.java 8 Mar 2004 16:48:21 -0000 1.3
@@ -43,7 +43,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.Accreditable#getAccreditables()
+ * @see org.apache.lenya.ac.Accreditable#getAccreditables()
*/
public Accreditable[] getAccreditables() {
return (Accreditable[]) Collections.singleton(this).toArray(new Accreditable[1]);
1.3 +2 -2 cocoon-lenya/src/java/org/apache/lenya/ac/Machine.java
Index: Machine.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/Machine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Machine.java 3 Mar 2004 12:56:31 -0000 1.2
+++ Machine.java 8 Mar 2004 16:48:21 -0000 1.3
@@ -58,7 +58,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.Accreditable#getAccreditables()
+ * @see org.apache.lenya.ac.Accreditable#getAccreditables()
*/
public Accreditable[] getAccreditables() {
Accreditable[] ranges = getIPRanges();
1.4 +5 -5 cocoon-lenya/src/java/org/apache/lenya/ac/file/FileAccreditableManager.java
Index: FileAccreditableManager.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/file/FileAccreditableManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileAccreditableManager.java 3 Mar 2004 12:56:32 -0000 1.3
+++ FileAccreditableManager.java 8 Mar 2004 16:48:21 -0000 1.4
@@ -161,28 +161,28 @@
}
/**
- * @see org.apache.lenya.cms.ac2.AbstractAccreditableManager#initializeGroupManager()
+ * @see org.apache.lenya.ac.impl.AbstractAccreditableManager#initializeGroupManager()
*/
protected GroupManager initializeGroupManager() throws AccessControlException {
return FileGroupManager.instance(getConfigurationDirectory());
}
/**
- * @see org.apache.lenya.cms.ac2.AbstractAccreditableManager#initializeIPRangeManager()
+ * @see org.apache.lenya.ac.impl.AbstractAccreditableManager#initializeIPRangeManager()
*/
protected IPRangeManager initializeIPRangeManager() throws AccessControlException {
return FileIPRangeManager.instance(getConfigurationDirectory());
}
/**
- * @see org.apache.lenya.cms.ac2.AbstractAccreditableManager#initializeRoleManager()
+ * @see org.apache.lenya.ac.impl.AbstractAccreditableManager#initializeRoleManager()
*/
protected RoleManager initializeRoleManager() throws AccessControlException {
return FileRoleManager.instance(getConfigurationDirectory());
}
/**
- * @see org.apache.lenya.cms.ac2.AbstractAccreditableManager#initializeUserManager()
+ * @see org.apache.lenya.ac.impl.AbstractAccreditableManager#initializeUserManager()
*/
protected UserManager initializeUserManager() throws AccessControlException {
return FileUserManager.instance(getConfigurationDirectory());
1.5 +5 -5 cocoon-lenya/src/java/org/apache/lenya/ac/file/FilePolicyManager.java
Index: FilePolicyManager.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/file/FilePolicyManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FilePolicyManager.java 3 Mar 2004 12:56:32 -0000 1.4
+++ FilePolicyManager.java 8 Mar 2004 16:48:21 -0000 1.5
@@ -248,7 +248,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.PolicyManager#getPolicy(AccreditableManager, Publication,
+ * @see org.apache.lenya.ac.PolicyManager#getPolicy(AccreditableManager, Publication,
* java.lang.String)
*/
public Policy getPolicy(AccreditableManager controller, String url)
@@ -337,7 +337,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.InheritingPolicyManager#getPolicies(org.apache.lenya.cms.ac2.AccreditableManager,
+ * @see org.apache.lenya.ac.impl.InheritingPolicyManager#getPolicies(org.apache.lenya.ac.AccreditableManager,
* java.lang.String)
*/
public DefaultPolicy[] getPolicies(AccreditableManager controller, String url)
@@ -429,8 +429,8 @@
}
/**
- * @see org.apache.lenya.cms.ac2.PolicyManager#accreditableRemoved(org.apache.lenya.cms.ac2.AccreditableManager,
- * org.apache.lenya.cms.ac2.Accreditable)
+ * @see org.apache.lenya.ac.PolicyManager#accreditableRemoved(org.apache.lenya.ac.AccreditableManager,
+ * org.apache.lenya.ac.Accreditable)
*/
public void accreditableRemoved(AccreditableManager manager, Accreditable accreditable)
throws AccessControlException {
1.14 +1 -1 cocoon-lenya/src/java/org/apache/lenya/lenya.roles
Index: lenya.roles
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/lenya.roles,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lenya.roles 13 Nov 2003 16:12:15 -0000 1.13
+++ lenya.roles 8 Mar 2004 16:48:21 -0000 1.14
@@ -37,7 +37,7 @@
<role name="org.apache.lenya.ac.AccessController"
shorthand="access-controller"
- default-class="org.apache.lenya.cms.ac2.BypassableAccessController"/>
+ default-class="org.apache.lenya.ac.impl.BypassableAccessController"/>
<role name="org.apache.lenya.ac.AccessControllerResolverSelector"
shorthand="access-controller-resolvers"
1.3 +2 -2 cocoon-lenya/src/java/org/apache/lenya/cms/ac/usecase/UsecaseRolesBuilder.java
Index: UsecaseRolesBuilder.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/usecase/UsecaseRolesBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UsecaseRolesBuilder.java 3 Mar 2004 12:56:33 -0000 1.2
+++ UsecaseRolesBuilder.java 8 Mar 2004 16:48:21 -0000 1.3
@@ -39,7 +39,7 @@
protected static final String ID_ATTRIBUTE = "id";
/**
- * @see org.apache.lenya.cms.ac2.cache.InputStreamBuilder#build(java.io.InputStream)
+ * @see org.apache.lenya.ac.cache.InputStreamBuilder#build(java.io.InputStream)
*/
public Object build(InputStream stream) throws BuildException {
1.3 +3 -3 cocoon-lenya/src/java/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizer.java
Index: UsecaseAuthorizer.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UsecaseAuthorizer.java 3 Mar 2004 12:56:33 -0000 1.2
+++ UsecaseAuthorizer.java 8 Mar 2004 16:48:21 -0000 1.3
@@ -75,8 +75,8 @@
}
/**
- * @see org.apache.lenya.cms.ac2.Authorizer#authorize(org.apache.lenya.cms.ac2.AccreditableManager,
- * org.apache.lenya.cms.ac2.PolicyManager, org.apache.lenya.cms.ac2.Identity,
+ * @see org.apache.lenya.ac.Authorizer#authorize(org.apache.lenya.ac.AccreditableManager,
+ * org.apache.lenya.ac.PolicyManager, org.apache.lenya.ac.Identity,
* org.apache.cocoon.environment.Request)
*/
public boolean authorize(Request request) throws AccessControlException {
1.3 +2 -2 cocoon-lenya/src/java/org/apache/lenya/ac/cache/SourceCacheImpl.java
Index: SourceCacheImpl.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/ac/cache/SourceCacheImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SourceCacheImpl.java 3 Mar 2004 12:56:32 -0000 1.2
+++ SourceCacheImpl.java 8 Mar 2004 16:48:21 -0000 1.3
@@ -73,7 +73,7 @@
}
/**
- * @see org.apache.lenya.cms.ac2.cache.SourceCache#get(java.lang.String, org.apache.lenya.cms.ac2.cache.InputStreamBuilder)
+ * @see org.apache.lenya.ac.cache.SourceCache#get(java.lang.String, org.apache.lenya.ac.cache.InputStreamBuilder)
*/
public Object get(String sourceUri, InputStreamBuilder builder) throws CachingException {
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org