Return-Path: 
 <lenya-cvs-return-1239-apmail-cocoon-lenya-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-lenya-cvs-archive@cocoon.apache.org
Received: (qmail 47386 invoked by uid 500); 13 Aug 2003 13:11:42 -0000
Mailing-List: contact lenya-cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Post: <mailto:lenya-cvs@cocoon.apache.org>
List-Help: <mailto:lenya-cvs-help@cocoon.apache.org>
List-Unsubscribe: <mailto:lenya-cvs-unsubscribe@cocoon.apache.org>
List-Subscribe: <mailto:lenya-cvs-subscribe@cocoon.apache.org>
Reply-To: "Lenya CVS Mailing List" <lenya-cvs@cocoon.apache.org>
Delivered-To: mailing list lenya-cvs@cocoon.apache.org
Received: (qmail 47374 invoked from network); 13 Aug 2003 13:11:42 -0000
Date: 13 Aug 2003 13:11:45 -0000
Message-ID: <20030813131145.66502.qmail@minotaur.apache.org>
From: andreas@apache.org
To: cocoon-lenya-cvs@apache.org
Subject: cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/ac2/sitemap
 SitemapPolicyManager.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

andreas     2003/08/13 06:11:45

  Modified:    src/java/org/apache/lenya/cms/ac2 PolicyBuilder.java
               src/java/org/apache/lenya/cms/ac2/sitemap
                        SitemapPolicyManager.java
  Log:
  making PolicyBuilder dynamic (needed for SourceCache)
  
  Revision  Changes    Path
  1.7       +39 -26    cocoon-lenya/src/java/org/apache/lenya/cms/ac2/PolicyBuilder.java
  
  Index: PolicyBuilder.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac2/PolicyBuilder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PolicyBuilder.java	12 Aug 2003 15:17:11 -0000	1.6
  +++ PolicyBuilder.java	13 Aug 2003 13:11:45 -0000	1.7
  @@ -65,6 +65,8 @@
   import org.apache.lenya.cms.ac.IPRange;
   import org.apache.lenya.cms.ac.Role;
   import org.apache.lenya.cms.ac.User;
  +import org.apache.lenya.cms.ac2.cache.BuildException;
  +import org.apache.lenya.cms.ac2.cache.InputStreamBuilder;
   import org.apache.lenya.xml.DocumentHelper;
   import org.apache.lenya.xml.NamespaceHelper;
   import org.w3c.dom.Document;
  @@ -73,25 +75,27 @@
   /**
    * @author <a href="mailto:andreas@apache.org">Andreas Hartmann</a>
    */
  -public class PolicyBuilder {
  +public class PolicyBuilder implements InputStreamBuilder {
   
       /**
        * Ctor.
  +     * @param accreditableManager An accreditable manager.
        */
  -    protected PolicyBuilder() {
  +    public PolicyBuilder(AccreditableManager accreditableManager) {
  +        assert accreditableManager != null;
  +        this.accreditableManager = accreditableManager;
       }
  -
  +    
       /**
  -     * Returns the PolicyBuilder instance.
  -     * @return A policy builder.
  +     * Returns the accreditable manager.
  +     * @return An accreditable manager.
        */
  -    public static PolicyBuilder getInstance() {
  -        if (instance == null) {
  -            instance = new PolicyBuilder();
  -        }
  -        return instance;
  +    public AccreditableManager getAccreditableManager() {
  +        return accreditableManager;
       }
   
  +    private AccreditableManager accreditableManager;
  +
       private static PolicyBuilder instance;
   
       protected static final String POLICY_ELEMENT = "policy";
  @@ -102,15 +106,14 @@
       protected static final String IP_RANGE_ELEMENT = "ip-range";
       protected static final String ID_ATTRIBUTE = "id";
       protected static final String SSL_ATTRIBUTE = "ssl";
  -
  +    
       /**
        * Builds a policy from an input stream.
  -     * @param controller An access controller.
        * @param stream The input stream to read the policy from..
        * @return A policy.
        * @throws AccessControlException when something went wrong.
        */
  -    public DefaultPolicy buildPolicy(AccreditableManager controller, InputStream stream)
  +    public DefaultPolicy buildPolicy(InputStream stream)
           throws AccessControlException {
   
           Document document;
  @@ -121,17 +124,16 @@
               throw new AccessControlException(e);
           }
   
  -        return buildPolicy(controller, document);
  +        return buildPolicy(document);
       }
   
       /**
        * Builds a policy from an XML document.
  -     * @param controller An access controller.
        * @param document The XML document.
        * @return A policy.
        * @throws AccessControlException when something went wrong.
        */
  -    public DefaultPolicy buildPolicy(AccreditableManager controller, Document document)
  +    public DefaultPolicy buildPolicy(Document document)
           throws AccessControlException {
   
           DefaultPolicy policy = new DefaultPolicy();
  @@ -150,7 +152,7 @@
               Accreditable accreditable = null;
   
               String id = credentialElements[i].getAttribute(ID_ATTRIBUTE);
  -            accreditable = getAccreditable(controller, credentialElements[i].getLocalName(), id);
  +            accreditable = getAccreditable(credentialElements[i].getLocalName(), id);
   
               Credential credential = new Credential(accreditable);
   
  @@ -158,7 +160,7 @@
   
               for (int j = 0; j < roleElements.length; j++) {
                   String roleId = roleElements[j].getAttribute(ID_ATTRIBUTE);
  -                Role role = controller.getRoleManager().getRole(roleId);
  +                Role role = getAccreditableManager().getRoleManager().getRole(roleId);
                   credential.addRole(role);
               }
   
  @@ -177,27 +179,25 @@
   
       /**
        * Creates an accredtiable for an element.
  -     * @param controller An access controller.
        * @param elementName The elment name.
        * @param id The ID of the accreditable.
        * @return An accreditable.
        * @throws AccessControlException when something went wrong.
        */
       protected Accreditable getAccreditable(
  -        AccreditableManager controller,
           String elementName,
           String id)
           throws AccessControlException {
           Accreditable accreditable = null;
   
           if (elementName.equals(USER_ELEMENT)) {
  -            accreditable = controller.getUserManager().getUser(id);
  +            accreditable = getAccreditableManager().getUserManager().getUser(id);
           } else if (elementName.equals(GROUP_ELEMENT)) {
  -            accreditable = controller.getGroupManager().getGroup(id);
  +            accreditable = getAccreditableManager().getGroupManager().getGroup(id);
           } else if (elementName.equals(WORLD_ELEMENT)) {
               accreditable = World.getInstance();
           } else if (elementName.equals(IP_RANGE_ELEMENT)) {
  -            accreditable = controller.getIPRangeManager().getIPRange(id);
  +            accreditable = getAccreditableManager().getIPRangeManager().getIPRange(id);
           }
   
           if (accreditable == null) {
  @@ -214,7 +214,7 @@
        * @return A DOM document.
        * @throws AccessControlException when something went wrong.
        */
  -    public Document savePolicy(DefaultPolicy policy) throws AccessControlException {
  +    public static Document savePolicy(DefaultPolicy policy) throws AccessControlException {
           NamespaceHelper helper;
   
           try {
  @@ -256,7 +256,7 @@
        * @return An XML element.
        * @throws AccessControlException when something went wrong.
        */
  -    protected Element save(Accreditable accreditable, NamespaceHelper helper)
  +    protected static Element save(Accreditable accreditable, NamespaceHelper helper)
           throws AccessControlException {
           String localName = null;
           String id = null;
  @@ -285,6 +285,19 @@
           }
   
           return element;
  +    }
  +
  +    /**
  +     * @see org.apache.lenya.cms.ac2.cache.InputStreamBuilder#build(org.apache.excalibur.source.Source)
  +     */
  +    public Object build(InputStream stream) throws BuildException {
  +        Object value = null;
  +        try {
  +            value = buildPolicy(stream);
  +        } catch (AccessControlException e) {
  +            throw new BuildException(e);
  +        }
  +        return value;
       }
   
   }
  
  
  
  1.7       +2 -2      cocoon-lenya/src/java/org/apache/lenya/cms/ac2/sitemap/SitemapPolicyManager.java
  
  Index: SitemapPolicyManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac2/sitemap/SitemapPolicyManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SitemapPolicyManager.java	5 Aug 2003 11:56:02 -0000	1.6
  +++ SitemapPolicyManager.java	13 Aug 2003 13:11:45 -0000	1.7
  @@ -105,7 +105,7 @@
               getLogger().debug("Policy URL: " + policyUrl);
               source = resolver.resolveURI("cocoon://" + policyUrl);
               Document document = DocumentHelper.readDocument(source.getInputStream());
  -            policy = PolicyBuilder.getInstance().buildPolicy(accreditableManager, document);
  +            policy = new PolicyBuilder(accreditableManager).buildPolicy(document);
   
           } catch (Exception e) {
               throw new AccessControlException(e);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org