svn commit: r657434 - /lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java

Author: andreas
Date: Sat May 17 12:34:46 2008
New Revision: 657434

URL: http://svn.apache.org/viewvc?rev=657434&view=rev
Log:
AccessControlSitetreeTransformer: Use pub ID and area to resolve access controller -> be independent of web application URL.

Modified:
    lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java

Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java?rev=657434&r1=657433&r2=657434&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/transformation/AccessControlSitetreeTransformer.java Sat May 17 12:34:46 2008
@@ -29,8 +29,6 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.transformation.AbstractSAXTransformer;
 import org.apache.lenya.ac.AccessControlException;
@@ -42,7 +40,6 @@
 import org.apache.lenya.ac.Role;
 import org.apache.lenya.cms.site.tree.DefaultSiteTree;
 import org.apache.lenya.cms.site.tree.SiteTreeNodeImpl;
-import org.apache.lenya.util.ServletHelper;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
@@ -101,8 +98,6 @@
 
             this.urlPrefix = "/" + publicationId + "/" + area;
 
-            Request _request = ObjectModelHelper.getRequest(_objectModel);
-
             this.serviceSelector = (ServiceSelector) this.manager.lookup(AccessControllerResolver.ROLE
                     + "Selector");
 
@@ -112,8 +107,7 @@
                 getLogger().debug("    Resolved AC resolver [" + this.acResolver + "]");
             }
 
-            String webappUrl = ServletHelper.getWebappURI(_request);
-            AccessController accessController = this.acResolver.resolveAccessController(webappUrl);
+            AccessController accessController = this.acResolver.resolveAccessController(this.urlPrefix);
             this.accreditableManager = accessController.getAccreditableManager();
             this.policyManager = accessController.getPolicyManager();