cziegeler 2003/08/07 01:52:15
Modified: src/java/org/apache/cocoon/components/pipeline/impl
CachingProcessingPipeline.java
AbstractCachingProcessingPipeline.java
CachingPointProcessingPipeline.java
src/blocks/eventcache/java/org/apache/cocoon/caching/impl
EventAwareCacheImpl.java
src/java/org/apache/cocoon/caching/impl CacheImpl.java
src/java/org/apache/cocoon/caching Cache.java
Log:
Remove obsolete parameter from cache interface (totally forgot this...)
Revision Changes Path
1.3 +3 -5
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingProcessingPipeline.java
Index: CachingProcessingPipeline.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingProcessingPipeline.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CachingProcessingPipeline.java 13 Mar 2003 05:58:28 -0000 1.2
+++ CachingProcessingPipeline.java 7 Aug 2003 08:52:15 -0000 1.3
@@ -88,15 +88,13 @@
CachedResponse response = new
CachedResponse(this.toCacheSourceValidities,
((CachingOutputStream)os).getContent(),
expiresObj);
- this.cache.store(environment.getObjectModel(),
- this.toCacheKey,
+ this.cache.store(this.toCacheKey,
response);
} else {
CachedResponse response = new
CachedResponse(this.toCacheSourceValidities,
(byte[])this.xmlSerializer.getSAXFragment(),
expiresObj);
- this.cache.store(environment.getObjectModel(),
- this.toCacheKey,
+ this.cache.store(this.toCacheKey,
response);
}
}
1.11 +1 -2
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
Index: AbstractCachingProcessingPipeline.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractCachingProcessingPipeline.java 31 Jul 2003 12:39:04 -0000
1.10
+++ AbstractCachingProcessingPipeline.java 7 Aug 2003 08:52:15 -0000
1.11
@@ -813,7 +813,6 @@
// store the response
if (pcKey != null) {
this.cache.store(
- environment.getObjectModel(),
pcKey,
new CachedResponse( new SourceValidity[]
{readerValidity},
((CachingOutputStream)outputStream).getContent())
1.3 +3 -5
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java
Index: CachingPointProcessingPipeline.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CachingPointProcessingPipeline.java 13 Mar 2003 05:58:28 -0000
1.2
+++ CachingPointProcessingPipeline.java 7 Aug 2003 08:52:15 -0000
1.3
@@ -217,8 +217,7 @@
}
CachedResponse response = new
CachedResponse(this.toCacheSourceValidities,
((CachingOutputStream)os).getContent());
- this.cache.store(environment.getObjectModel(),
- this.toCacheKey.copy(),
+ this.cache.store(this.toCacheKey.copy(),
response);
//
// Scan back along the pipelineCacheKey for
@@ -246,8 +245,7 @@
XMLSerializer serializer = (XMLSerializer)
itt.previous();
CachedResponse response = new
CachedResponse(this.toCacheSourceValidities,
(byte[])serializer.getSAXFragment());
- this.cache.store(environment.getObjectModel(),
- this.toCacheKey.copy(),
+ this.cache.store(this.toCacheKey.copy(),
response);
if (this.getLogger().isDebugEnabled()) {
1.4 +3 -5
cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventAwareCacheImpl.java
Index: EventAwareCacheImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventAwareCacheImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EventAwareCacheImpl.java 20 Jul 2003 21:08:06 -0000 1.3
+++ EventAwareCacheImpl.java 7 Aug 2003 08:52:15 -0000 1.4
@@ -46,7 +46,6 @@
package org.apache.cocoon.caching.impl;
import java.util.Iterator;
-import java.util.Map;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentException;
@@ -100,8 +99,7 @@
*
* <code>AggregatedValidity</code> is handled recursively.
*/
- public void store(Map objectModel,
- PipelineCacheKey key,
+ public void store(PipelineCacheKey key,
CachedResponse response)
throws ProcessingException {
SourceValidity[] validities = response.getValidityObjects();
@@ -109,7 +107,7 @@
SourceValidity val = validities[i];
examineValidity(val, key);
}
- super.store(objectModel, key, response);
+ super.store(key, response);
}
/**
1.6 +2 -5
cocoon-2.1/src/java/org/apache/cocoon/caching/impl/CacheImpl.java
Index: CacheImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/caching/impl/CacheImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CacheImpl.java 31 Jul 2003 14:28:18 -0000 1.5
+++ CacheImpl.java 7 Aug 2003 08:52:15 -0000 1.6
@@ -52,7 +52,6 @@
import java.io.IOException;
import java.io.Serializable;
-import java.util.Map;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
@@ -107,13 +106,11 @@
/**
* Store a cached response
- * @param objectModel all information about the request
* @param key the key used by the caching algorithm to identify
the
* request
* @param response the cached response
*/
- public void store(Map objectModel,
- Serializable key,
+ public void store(Serializable key,
CachedResponse response)
throws ProcessingException {
try {
1.4 +4 -7 cocoon-2.1/src/java/org/apache/cocoon/caching/Cache.java
Index: Cache.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/caching/Cache.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Cache.java 31 Jul 2003 14:28:18 -0000 1.3
+++ Cache.java 7 Aug 2003 08:52:15 -0000 1.4
@@ -50,12 +50,11 @@
*/
package org.apache.cocoon.caching;
+import java.io.Serializable;
+
import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.ProcessingException;
-import java.io.Serializable;
-import java.util.Map;
-
/**
* This is the Cocoon cache. This component is responsible for storing
* and retrieving cached responses. It can be used to monitor the cache
@@ -74,13 +73,11 @@
/**
* Store a cached response
- * @param objectModel all information about the request
* @param key the key used by the caching algorithm to identify
the
* request
* @param response the cached response
*/
- void store(Map objectModel,
- Serializable key,
+ void store(Serializable key,
CachedResponse response)
throws ProcessingException;
