svn commit: r562973 - in /lenya/trunk/src: modules-core/ac/config/ modules-core/ac/java/src/org/apache/lenya/ac/impl/ modules-core/ac/java/src/org/apache/lenya/cms/ac/usecase/ modules-core/acusecases/ modules-core/acusecases/config/cocoon-xconf/ module...

[email protected]
Newsgroups gmane.comp.cms.lenya.cvs
Message-ID <[email protected]> 
Author: nettings
Date: Sun Aug  5 14:44:42 2007
New Revision: 562973

URL: http://svn.apache.org/viewvc?view=rev&rev=562973
Log:
svn merge -r 562961:562875 https://svn.apache.org/repos/asf/lenya/trunk
undo accidental commit - apologies for the noise.

Added:
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/
      - copied from r562875, lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/
      - copied from r562875, lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizer.java
      - copied unchanged from r562875, lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/UsecaseAuthorizer.java
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/
      - copied from r562875, lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java
      - copied unchanged from r562875, lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseAuthorizerImpl.java
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRoles.java
      - copied unchanged from r562875, lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRoles.java
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRolesBuilder.java
      - copied unchanged from r562875, lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/ac/usecase/impl/UsecaseRolesBuilder.java
Removed:
    lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/cms/ac/usecase/
    lenya/trunk/src/modules-core/acusecases/config/cocoon-xconf/usecase-ac-visit.xconf
    lenya/trunk/src/modules-core/acusecases/sitemap.xmap
Modified:
    lenya/trunk/src/modules-core/ac/config/module.xml
    lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/PolicyAuthorizer.java
    lenya/trunk/src/modules-core/usecase/config/module.xml
    lenya/trunk/src/pubs/default/config/access-control/policies/authoring/subtree-policy.acml
    lenya/trunk/src/pubs/default/config/access-control/policies/index.html/url-policy.acml
    lenya/trunk/src/pubs/default/config/access-control/usecase-policies.xml

Modified: lenya/trunk/src/modules-core/ac/config/module.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/config/module.xml?view=diff&rev=562973&r1=562972&r2=562973
==============================================================================
--- lenya/trunk/src/modules-core/ac/config/module.xml (original)
+++ lenya/trunk/src/modules-core/ac/config/module.xml Sun Aug  5 14:44:42 2007
@@ -20,7 +20,6 @@
 
 <module xmlns="http://apache.org/lenya/module/1.0">
   <id>org.apache.lenya.modules.ac</id>
-  <export package="org.apache.lenya.cms.ac.usecase"/>
   <export package="org.apache.lenya.ac.file"/>
   <depends module="org.apache.lenya.modules.cache"/>
   <package>org.apache.lenya.modules</package>

Modified: lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/PolicyAuthorizer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/PolicyAuthorizer.java?view=diff&rev=562973&r1=562972&r2=562973
==============================================================================
--- lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/PolicyAuthorizer.java (original)
+++ lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/PolicyAuthorizer.java Sun Aug  5 14:44:42 2007
@@ -21,10 +21,6 @@
 import java.util.Arrays;
 
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.Session;
 import org.apache.lenya.ac.AccessControlException;
@@ -33,17 +29,13 @@
 import org.apache.lenya.ac.Identity;
 import org.apache.lenya.ac.PolicyManager;
 import org.apache.lenya.ac.Role;
-import org.apache.lenya.cms.ac.usecase.UsecaseAuthorizer;
-import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.cms.publication.PublicationException;
-import org.apache.lenya.cms.publication.PublicationUtil;
 import org.apache.lenya.util.ServletHelper;
 
 /**
  * Policy-based authorizer.
  * @version $Id$
  */
-public class PolicyAuthorizer extends AbstractLogEnabled implements Authorizer, Serviceable {
+public class PolicyAuthorizer extends AbstractLogEnabled implements Authorizer {
 
     /**
      * The name of the pseudo-usecase that governs access to pages.
@@ -55,8 +47,6 @@
 
     private PolicyManager policyManager;
     private AccreditableManager accreditableManager;
-    private ServiceManager manager;
-    private ServiceSelector authSelector;
 
     /**
      * Creates a new policy authorizer.
@@ -76,22 +66,9 @@
 
         if (identity.belongsTo(getAccreditableManager())) {
             Role[] roles = getPolicyManager().getGrantedRoles(getAccreditableManager(), identity, webappUrl);
-            UsecaseAuthorizer auth = null;
-            Publication pub;
-            try {
-                saveRoles(request, roles);
-                authSelector = (ServiceSelector) this.manager.lookup(Authorizer.ROLE + "Selector");
-                auth = (UsecaseAuthorizer) authSelector.select(org.apache.lenya.cms.ac.usecase.impl.UsecaseAuthorizerImpl.TYPE);
-                pub = PublicationUtil.getPublication(this.manager, request);
-                authorized = auth.authorizeUsecase(VISIT_USECASE, roles, pub);
-                getLogger().debug("Authorized identity [" + identity + "]: " + authorized);
-            } catch (ServiceException e) {
-                throw new AccessControlException("Can't get UsecaseAuthorizer component: " + e);
-            } catch (PublicationException e) {
-                throw new AccessControlException("Can't get Publication: " + e);
-            } finally {
-                this.manager.release(auth);
-            }
+            saveRoles(request, roles);
+            authorized = (roles.length > 0);
+            getLogger().debug("Authorized identity [" + identity + "]: " + authorized);
         } else {
             getLogger().debug(
                 "Identity ["
@@ -133,10 +110,6 @@
      */
     public AccreditableManager getAccreditableManager() {
         return this.accreditableManager;
-    }
-
-    public void service(ServiceManager manager) throws ServiceException {
-        this.manager = manager;
     }
 
     /**

Modified: lenya/trunk/src/modules-core/usecase/config/module.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/config/module.xml?view=diff&rev=562973&r1=562972&r2=562973
==============================================================================
--- lenya/trunk/src/modules-core/usecase/config/module.xml (original)
+++ lenya/trunk/src/modules-core/usecase/config/module.xml Sun Aug  5 14:44:42 2007
@@ -20,6 +20,7 @@
 
 <module xmlns="http://apache.org/lenya/module/1.0">
   <id>org.apache.lenya.modules.usecase</id>
+  <export package="org.apache.lenya.cms.ac.usecase"/>
   <export package="org.apache.lenya.cms.usecase"/>
   <export package="org.apache.lenya.cms.usecase.scheduling"/>
   <export package="org.apache.lenya.cms.usecase.xml"/>

Modified: lenya/trunk/src/pubs/default/config/access-control/policies/authoring/subtree-policy.acml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/access-control/policies/authoring/subtree-policy.acml?view=diff&rev=562973&r1=562972&r2=562973
==============================================================================
--- lenya/trunk/src/pubs/default/config/access-control/policies/authoring/subtree-policy.acml (original)
+++ lenya/trunk/src/pubs/default/config/access-control/policies/authoring/subtree-policy.acml Sun Aug  5 14:44:42 2007
@@ -22,22 +22,19 @@
 
   <group id="editor">
     <role id="edit"  method="grant"/>
-    <role id="visit" method="grant"/>
   </group>
 
   <group id="reviewer">
     <role id="review"  method="grant"/>
-    <role id="visit" method="grant"/>
   </group>
 
   <group id="admin">
     <role id="admin"  method="grant"/>
-    <role id="visit" method="grant"/>
   </group>
  
   <!-- the "session" role grants access to login, logout and aboutLenya -->
   <world>
     <role id="session" method="grant"/>
   </world>
-  
+
 </policy> 

Modified: lenya/trunk/src/pubs/default/config/access-control/policies/index.html/url-policy.acml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/access-control/policies/index.html/url-policy.acml?view=diff&rev=562973&r1=562972&r2=562973
==============================================================================
--- lenya/trunk/src/pubs/default/config/access-control/policies/index.html/url-policy.acml (original)
+++ lenya/trunk/src/pubs/default/config/access-control/policies/index.html/url-policy.acml Sun Aug  5 14:44:42 2007
@@ -21,7 +21,7 @@
 <policy xmlns="http://apache.org/cocoon/lenya/ac/1.0">
 
   <world>
-    <role id="visit" method="deny"/>
+    <role id="visit" method="grant"/>
   </world>
 
 </policy> 

Modified: lenya/trunk/src/pubs/default/config/access-control/usecase-policies.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/access-control/usecase-policies.xml?view=diff&rev=562973&r1=562972&r2=562973
==============================================================================
--- lenya/trunk/src/pubs/default/config/access-control/usecase-policies.xml (original)
+++ lenya/trunk/src/pubs/default/config/access-control/usecase-policies.xml Sun Aug  5 14:44:42 2007
@@ -21,13 +21,6 @@
 <!--+++NOTE+++ The usecase list was initialized using modules/usecase-impl/xslt/initUsecasePolicies.xsl.-->
 <usecases xmlns="http://apache.org/cocoon/lenya/ac/1.0">
 
-  <usecase id="ac.visit">
-    <role id="visit" method="grant"/>
-    <role id="admin" method="grant"/>
-    <role id="edit" method="grant"/>
-    <role id="review" method="grant"/>
-  </usecase>
-        
   <usecase id="ac.logout">
     <role id="session" method="grant"/>
   </usecase>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.