You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/06/08 19:42:00 UTC
svn commit: r189610 - in /cocoon:
blocks/scratchpad/trunk/java/org/apache/cocoon/caching/
blocks/scratchpad/trunk/java/org/apache/cocoon/components/pipeline/impl/
trunk/ trunk/src/java/org/apache/cocoon/caching/
trunk/src/java/org/apache/cocoon/components/pipeline/impl/ trunk/src/webapp/
Author: cziegeler
Date: Wed Jun 8 10:41:59 2005
New Revision: 189610
URL: http://svn.apache.org/viewcvs?rev=189610&view=rev
Log:
Move expires pipeline implementation out of the scratchpad.
Added:
cocoon/trunk/src/java/org/apache/cocoon/caching/IdentifierCacheKey.java
- copied, changed from r189607, cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/caching/IdentifierCacheKey.java
cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java
- copied, changed from r189607, cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java
Removed:
cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/caching/IdentifierCacheKey.java
cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java
Modified:
cocoon/trunk/src/webapp/sitemap.xmap
cocoon/trunk/status.xml
Copied: cocoon/trunk/src/java/org/apache/cocoon/caching/IdentifierCacheKey.java (from r189607, cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/caching/IdentifierCacheKey.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/caching/IdentifierCacheKey.java?p2=cocoon/trunk/src/java/org/apache/cocoon/caching/IdentifierCacheKey.java&p1=cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/caching/IdentifierCacheKey.java&r1=189607&r2=189610&rev=189610&view=diff
==============================================================================
--- cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/caching/IdentifierCacheKey.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/caching/IdentifierCacheKey.java Wed Jun 8 10:41:59 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
* for an internal pipeline call.
*
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: IdentifierCacheKey.java,v 1.2 2004/07/06 10:45:39 unico Exp $
+ * @version CVS $Id$
* @since 2.1.1
*/
public class IdentifierCacheKey
Copied: cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java (from r189607, cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java)
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java?p2=cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java&p1=cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java&r1=189607&r2=189610&rev=189610&view=diff
==============================================================================
--- cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java Wed Jun 8 10:41:59 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: cocoon/trunk/src/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/sitemap.xmap?rev=189610&r1=189609&r2=189610&view=diff
==============================================================================
--- cocoon/trunk/src/webapp/sitemap.xmap (original)
+++ cocoon/trunk/src/webapp/sitemap.xmap Wed Jun 8 10:41:59 2005
@@ -429,6 +429,13 @@
<map:pipe name="noncaching" src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline">
<!-- parameter name="outputBufferSize" value="8192"/ -->
</map:pipe>
+ <!--+
+ | This pipeline implementation caches the complete content for a defined
+ | period of time (expires). The cache key is the current uri.
+ +-->
+ <map:pipe name="expires" src="org.apache.cocoon.components.pipeline.impl.ExpiresCachingProcessingPipeline">
+ <parameter name="cache-expires" value="180"/> <!-- Expires in secondes -->
+ </map:pipe>
</map:pipes>
<!-- include some additional components -->
Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=189610&r1=189609&r2=189610&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Wed Jun 8 10:41:59 2005
@@ -457,6 +457,9 @@
</action>
</release>
<release version="2.1.8" date="TBD">
+ <action dev="CZ" type="update">
+ Move expires pipeline implementation out of the scratchpad.
+ </action>
<action dev="CZ" type="add">
Add setter action to set values in the object model, request or session.
</action>