cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/java/org/apache/cocoon/caching/impl CacheImpl.java
Date Tue, 20 Aug 2002 06:41:04 GMT
cziegeler    2002/08/19 23:41:03

  Modified:    src/webapp sitemap.xmap
               src/java/org/apache/cocoon/caching Cache.java
               src/java/org/apache/cocoon/caching/impl CacheImpl.java
  Added:       src/java/org/apache/cocoon/acting ClearCacheAction.java
  Log:
  Applying patch: extended Cache interface plus added ClearCacheAction by michaelm@fztig938.bank.dresdner.net
(Michael Melhem)
  
  Revision  Changes    Path
  1.1                  xml-cocoon2/src/java/org/apache/cocoon/acting/ClearCacheAction.java
  
  Index: ClearCacheAction.java
  ===================================================================
  /*
   
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
   
   Copyright (C) 1999-2002 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.acting;
  
  /*
   * Standard imports
   */
  import org.apache.avalon.framework.parameters.Parameters;
  import org.apache.avalon.framework.thread.ThreadSafe;
  import org.apache.cocoon.environment.ObjectModelHelper;
  import org.apache.cocoon.environment.Redirector;
  import org.apache.cocoon.environment.Request;
  import org.apache.cocoon.environment.SourceResolver;
  import org.apache.cocoon.caching.Cache;
  
  import java.util.HashMap;
  import java.util.Map;
  
  /**
   * Simple action which ensures the cache is cleared of all
   * cached results
   *
   * @author <a href="mailto:Michael.Melhem@managesoft.com">Michael Melhem</a>
   * @version CVS $Id: RequestParamAction.java,v 1.6 2002/02/22 06:59:26 cziegeler Exp $
   */
  public class ClearCacheAction extends ComposerAction implements ThreadSafe {
  
      public Map act(Redirector redirector,
                      SourceResolver resolver,
                      Map objectModel,
                      String src,
                      Parameters par
      ) throws Exception {
          Cache cache = (Cache)this.manager.lookup(Cache.ROLE);
  
          try {
              cache.clear();
              return EMPTY_MAP;
          } catch (Exception ex) {
              getLogger().debug("Exception while trying to Clearing the Cache", ex);
              return null;
          } finally {
              this.manager.release( cache );
          }
      }
  }
  
  
  
  1.73      +2 -0      xml-cocoon2/src/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- sitemap.xmap	9 Aug 2002 07:47:17 -0000	1.72
  +++ sitemap.xmap	20 Aug 2002 06:41:03 -0000	1.73
  @@ -305,6 +305,8 @@
   
      <map:action logger="sitemap.action.set-header" name="set-header" src="org.apache.cocoon.acting.HttpHeaderAction"/>
   
  +   <map:action logger="sitemap.action.clear-cache" name="clear-cache" src="org.apache.cocoon.acting.ClearCacheAction"/>
  +
     </map:actions>
   
     <!--
  
  
  
  1.5       +7 -1      xml-cocoon2/src/java/org/apache/cocoon/caching/Cache.java
  
  Index: Cache.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/Cache.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Cache.java	4 Jul 2002 11:46:05 -0000	1.4
  +++ Cache.java	20 Aug 2002 06:41:03 -0000	1.5
  @@ -97,4 +97,10 @@
        *                    request
        */
       void remove(PipelineCacheKey key);
  +    
  +    /**
  +     * clear cache of all cached responses 
  +     */
  +    void clear();
  +
   }
  
  
  
  1.5       +8 -1      xml-cocoon2/src/java/org/apache/cocoon/caching/impl/CacheImpl.java
  
  Index: CacheImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/impl/CacheImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CacheImpl.java	4 Jul 2002 11:46:05 -0000	1.4
  +++ CacheImpl.java	20 Aug 2002 06:41:03 -0000	1.5
  @@ -140,4 +140,11 @@
           this.store.remove(key);
       }
   
  +    /**
  +     * clear cache of all cached responses 
  +     */
  +    public void clear() {
  +        this.store.clear();
  +    }
  +
   }
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message