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 2007/04/18 11:53:44 UTC
svn commit: r529939 - in /lenya/trunk/src:
modules-core/ac/java/src/org/apache/lenya/cms/ac/
modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/
pubs/blog/config/access-control/ pubs/default/config/access-control/
Author: andreas
Date: Wed Apr 18 02:53:43 2007
New Revision: 529939
URL: http://svn.apache.org/viewvc?view=rev&rev=529939
Log:
Renamed ac.xconf to access-control.xml
Added:
lenya/trunk/src/pubs/blog/config/access-control/access-control.xml
- copied, changed from r529931, lenya/trunk/src/pubs/blog/config/access-control/ac.xconf
lenya/trunk/src/pubs/default/config/access-control/access-control.xml
- copied unchanged from r529931, lenya/trunk/src/pubs/default/config/access-control/ac.xconf
Removed:
lenya/trunk/src/pubs/blog/config/access-control/ac.xconf
lenya/trunk/src/pubs/default/config/access-control/ac.xconf
Modified:
lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java
lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java
Modified: lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java?view=diff&rev=529939&r1=529938&r2=529939
==============================================================================
--- lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java (original)
+++ lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java Wed Apr 18 02:53:43 2007
@@ -46,8 +46,8 @@
public class PublicationAccessControllerResolver extends AbstractAccessControllerResolver implements
Initializable {
- protected static final String AC_CONFIGURATION_FILE = "config/access-control/ac.xconf".replace('/',
- File.separatorChar);
+ protected static final String AC_CONFIGURATION_FILE
+ = "config/access-control/access-control.xml".replace('/', File.separatorChar);
protected static final String TYPE_ATTRIBUTE = "type";
/**
Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java?view=diff&rev=529939&r1=529938&r2=529939
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java Wed Apr 18 02:53:43 2007
@@ -252,8 +252,8 @@
return authorize(request);
}
- protected static final String AC_CONFIGURATION_FILE = "config/access-control/ac.xconf".replace('/',
- File.separatorChar);
+ protected static final String AC_CONFIGURATION_FILE
+ = "config/access-control/access-control.xml".replace('/', File.separatorChar);
/**
* Retrieves access control configuration of a specific publication.
Copied: lenya/trunk/src/pubs/blog/config/access-control/access-control.xml (from r529931, lenya/trunk/src/pubs/blog/config/access-control/ac.xconf)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/blog/config/access-control/access-control.xml?view=diff&rev=529939&p1=lenya/trunk/src/pubs/blog/config/access-control/ac.xconf&r1=529931&p2=lenya/trunk/src/pubs/blog/config/access-control/access-control.xml&r2=529939
==============================================================================
--- lenya/trunk/src/pubs/blog/config/access-control/ac.xconf (original)
+++ lenya/trunk/src/pubs/blog/config/access-control/access-control.xml Wed Apr 18 02:53:43 2007
@@ -20,18 +20,18 @@
<access-controller type="bypassable">
<accreditable-manager type="file">
- <parameter name="directory" value="context:///lenya/pubs/blog/config/ac/passwd"/>
+ <parameter name="directory" value="context:///lenya/pubs/blog/config/access-control/passwd"/>
</accreditable-manager>
<policy-manager type="document">
<policy-manager type="file">
- <parameter name="directory" value="context:///lenya/pubs/blog/config/ac/policies"/>
+ <parameter name="directory" value="context:///lenya/pubs/blog/config/access-control/policies"/>
</policy-manager>
</policy-manager>
<authorizer type="policy"/>
<authorizer type="usecase">
- <parameter name="configuration" value="context:///lenya/pubs/blog/config/ac/usecase-policies.xml"/>
+ <parameter name="configuration" value="context:///lenya/pubs/blog/config/access-control/usecase-policies.xml"/>
</authorizer>
</access-controller>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org