cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components AuthenticationManager.java
Date Wed, 19 Mar 2003 12:47:34 GMT
cziegeler    2003/03/19 04:47:34

  Modified:    src/java/org/apache/cocoon/components/modules/input
                        SitemapVariableHolder.java
               src/java/org/apache/cocoon/components
                        SitemapConfigurable.java
               src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components
                        AuthenticationManager.java
  Added:       src/java/org/apache/cocoon/components
                        SitemapConfigurationHolder.java
                        ChainedConfiguration.java
  Log:
  Start refactoring SitemapConfigurable
  
  Revision  Changes    Path
  1.2       +5 -20     cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/SitemapVariableHolder.java
  
  Index: SitemapVariableHolder.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/SitemapVariableHolder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SitemapVariableHolder.java	9 Mar 2003 00:09:03 -0000	1.1
  +++ SitemapVariableHolder.java	19 Mar 2003 12:47:34 -0000	1.2
  @@ -50,21 +50,17 @@
   */
   package org.apache.cocoon.components.modules.input;
   
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
  +
   import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.SitemapConfigurable;
  -import org.apache.cocoon.environment.SourceResolver;
  -import org.xml.sax.SAXException;
  -
  -import java.io.IOException;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Map;
   
   /**
    * This "component" is a trick to get global variables on a per
  @@ -111,17 +107,6 @@
           }
       }
   
  -     /**
  -     * Set the <code>SourceResolver</code>, objectModel <code>Map</code>,
  -     * used to process the request.
  -     *  This method is automatically called for each request. Do not invoke
  -     *  this method by hand.
  -     */
  -    public void setup(SourceResolver resolver, Map objectModel)
  -    throws ProcessingException, SAXException, IOException {
  -        // we don't need them...
  -    }
  -    
       /**
        * Set the <code>Configuration</code> from a sitemap
        */
  
  
  
  1.2       +2 -3      cocoon-2.1/src/java/org/apache/cocoon/components/SitemapConfigurable.java
  
  Index: SitemapConfigurable.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/SitemapConfigurable.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SitemapConfigurable.java	9 Mar 2003 00:08:47 -0000	1.1
  +++ SitemapConfigurable.java	19 Mar 2003 12:47:34 -0000	1.2
  @@ -62,8 +62,7 @@
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @version CVS $Id$
    */
  -public interface SitemapConfigurable
  -    extends RequestLifecycleComponent {
  +public interface SitemapConfigurable {
   
       /**
        * Set the <code>Configuration</code>.
  
  
  
  1.1                  cocoon-2.1/src/java/org/apache/cocoon/components/SitemapConfigurationHolder.java
  
  Index: SitemapConfigurationHolder.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
      used to  endorse or promote  products derived from  this software without
      prior written permission. For written permission, please contact
      apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation and was  originally created by
   Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache
   Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.cocoon.components;
  
  /**
   * A {@link SitemapConfigurable} component gets the sitemap configuration
   * using this object.
   * 
   * @since 2.1
   * 
   * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
   * @version CVS $Id: SitemapConfigurationHolder.java,v 1.1 2003/03/19 12:47:34 cziegeler
Exp $
   */
  public interface SitemapConfigurationHolder {
  
      /**
       * Get the  configuration for the current sitemap
       * @return The configuration
       */
      ChainedConfiguration getConfiguration();
      
      /**
       * Get the prepared configuration for the current sitemap
       * @return The configuration or null if no prepared is available
       */
      Object getPreparedConfiguration();
      
      /**
       * Set the prepared configuration for the current sitemap.
       * After it is set by a component, it can be get using
       * {@link getPreparedConfiguration()}.
       * 
       * @param preparedConfig The prepared configuration
       */
      void setPreparedConfiguration(Object preparedConfig);
  }
  
  
  
  1.1                  cocoon-2.1/src/java/org/apache/cocoon/components/ChainedConfiguration.java
  
  Index: ChainedConfiguration.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
      used to  endorse or promote  products derived from  this software without
      prior written permission. For written permission, please contact
      apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation and was  originally created by
   Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache
   Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.cocoon.components;
  
  import org.apache.avalon.framework.configuration.Configuration;
  
  /**
   * This configuration object is used for {@link SitemapConfigurable} 
   * components. It extends {@link Configuration} by a parent.
   * 
   * @since 2.1
   * 
   * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
   * @version CVS $Id: ChainedConfiguration.java,v 1.1 2003/03/19 12:47:34 cziegeler Exp $
   */
  public interface ChainedConfiguration extends Configuration {
  
      /** 
       * Get the parent configuration
       * @return the parent configuration or null.
       */
      ChainedConfiguration getParent();
  }
  
  
  
  1.2       +3 -2      cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/AuthenticationManager.java
  
  Index: AuthenticationManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/AuthenticationManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AuthenticationManager.java	9 Mar 2003 00:02:18 -0000	1.1
  +++ AuthenticationManager.java	19 Mar 2003 12:47:34 -0000	1.2
  @@ -64,6 +64,7 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.components.RequestLifecycleComponent;
   import org.apache.cocoon.components.SitemapConfigurable;
   import org.apache.cocoon.environment.ObjectModelHelper;
   import org.apache.cocoon.environment.Redirector;
  @@ -99,7 +100,7 @@
   */
   public final class AuthenticationManager
   extends AbstractSessionComponent
  -implements Configurable, SitemapConfigurable {
  +implements Configurable, SitemapConfigurable, RequestLifecycleComponent {
   
       /** The Avalon Role */
       public static final String ROLE = AuthenticationManager.class.getName();
  
  
  

Mime
View raw message