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:12:51 UTC
svn commit: r529931 - 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/ac/ pubs/blog/config/access-control/
pubs/default/config/ac/ pubs/default/...
Author: andreas
Date: Wed Apr 18 02:12:48 2007
New Revision: 529931
URL: http://svn.apache.org/viewvc?view=rev&rev=529931
Log:
Renaming config/ac to config/access-control
Added:
lenya/trunk/src/pubs/blog/config/access-control/
- copied from r529164, lenya/trunk/src/pubs/blog/config/ac/
lenya/trunk/src/pubs/default/config/access-control/
- copied from r529194, lenya/trunk/src/pubs/default/config/ac/
Removed:
lenya/trunk/src/pubs/blog/config/ac/
lenya/trunk/src/pubs/default/config/ac/
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
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
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/PublicationAccessControllerResolver.java?view=diff&rev=529931&r1=529930&r2=529931
==============================================================================
--- 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:12:48 2007
@@ -46,7 +46,7 @@
public class PublicationAccessControllerResolver extends AbstractAccessControllerResolver implements
Initializable {
- protected static final String AC_CONFIGURATION_FILE = "config/ac/ac.xconf".replace('/',
+ protected static final String AC_CONFIGURATION_FILE = "config/access-control/ac.xconf".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=529931&r1=529930&r2=529931
==============================================================================
--- 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:12:48 2007
@@ -252,7 +252,7 @@
return authorize(request);
}
- protected static final String AC_CONFIGURATION_FILE = "config/ac/ac.xconf".replace('/',
+ protected static final String AC_CONFIGURATION_FILE = "config/access-control/ac.xconf".replace('/',
File.separatorChar);
/**
Modified: lenya/trunk/src/pubs/default/config/access-control/ac.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/access-control/ac.xconf?view=diff&rev=529931&r1=529194&r2=529931
==============================================================================
--- lenya/trunk/src/pubs/default/config/access-control/ac.xconf (original)
+++ lenya/trunk/src/pubs/default/config/access-control/ac.xconf Wed Apr 18 02:12:48 2007
@@ -21,7 +21,7 @@
<access-controller type="bypassable">
<accreditable-manager type="file">
- <parameter name="directory" value="context:///lenya/pubs/default/config/ac/passwd"/>
+ <parameter name="directory" value="context:///lenya/pubs/default/config/access-control/passwd"/>
<user-manager>
<user-type class="org.apache.lenya.ac.file.FileUser" create-use-case="userAddUser">Local User</user-type>
@@ -32,14 +32,14 @@
<policy-manager type="document">
<policy-manager type="file">
- <parameter name="directory" value="context:///lenya/pubs/default/config/ac/policies"/>
+ <parameter name="directory" value="context:///lenya/pubs/default/config/access-control/policies"/>
</policy-manager>
</policy-manager>
<authorizer type="policy"/>
<authorizer type="usecase">
- <parameter name="configuration" value="aggregate-fallback://config/ac/usecase-policies.xml"/>
+ <parameter name="configuration" value="aggregate-fallback://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
Re: svn commit: r529931 - 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/ac/
pubs/blog/config/access-control/ pubs/default/config/ac/ pubs/default/...
Posted by Andreas Hartmann <an...@apache.org>.
Joern Nettingsmeier schrieb:
>
>
> andreas@apache.org wrote:
>> - protected static final String AC_CONFIGURATION_FILE =
>> "config/ac/ac.xconf".replace('/',
>> + protected static final String AC_CONFIGURATION_FILE =
>> "config/access-control/ac.xconf".replace('/',
>> File.separatorChar);
>
> a while ago i asked about path separators, and iirc someone (you?)
> explained that those hacks could be removed when the file:// url scheme
> is used. would that work here as well (we're using java file i/o, i
> suppose), or only with cocoon source resolvers?
Yes, I think so. But we can as well switch to source resolving here.
If you have a couple of minutes ... :)
-- Andreas
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r529931 - 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/ac/
pubs/blog/config/access-control/ pubs/default/config/ac/ pubs/default/...
Posted by Joern Nettingsmeier <ne...@folkwang-hochschule.de>.
andreas@apache.org wrote:
> - protected static final String AC_CONFIGURATION_FILE = "config/ac/ac.xconf".replace('/',
> + protected static final String AC_CONFIGURATION_FILE = "config/access-control/ac.xconf".replace('/',
> File.separatorChar);
a while ago i asked about path separators, and iirc someone (you?)
explained that those hacks could be removed when the file:// url scheme
is used. would that work here as well (we're using java file i/o, i
suppose), or only with cocoon source resolvers?
--
jörn nettingsmeier
home://germany/45128 essen/lortzingstr. 11/
http://spunk.dnsalias.org
phone://+49/201/491621
Kurt is up in Heaven now.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org