cziegeler 2003/03/19 07:42:17
Modified: src/java/org/apache/cocoon/generation FileGenerator.java
ServerPagesGenerator.java AbstractServerPage.java
. changes.xml
src/java/org/apache/cocoon/transformation
FilterTransformer.java EncodeURLTransformer.java
TraxTransformer.java CIncludeTransformer.java
I18nTransformer.java RoleFilterTransformer.java
src/blocks/slide/java/org/apache/cocoon/generation
SourceDescriptionGenerator.java
src/blocks/chaperon/java/org/apache/cocoon/transformation
ParserTransformer.java PatternTransformer.java
LexicalTransformer.java
src/blocks/chaperon/java/org/apache/cocoon/generation
TextGenerator.java
src/blocks/batik/java/org/apache/cocoon/transformation
FragmentExtractorTransformer.java
src/blocks/itext/java/org/apache/cocoon/serialization
iTextSerializer.java
src/java/org/apache/cocoon/sitemap ContentAggregator.java
src/blocks/batik/java/org/apache/cocoon/serialization
SVGSerializer.java
src/java/org/apache/cocoon/components/pipeline/impl
AbstractCachingProcessingPipeline.java
src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart
AsciiArtSVGGenerator.java
src/blocks/batik/java/org/apache/cocoon/generation
FragmentExtractorGenerator.java
src/blocks/xmldb/java/org/apache/cocoon/transformation
XMLDBTransformer.java
src/blocks/fop/java/org/apache/cocoon/serialization
FOPSerializer.java
src/blocks/databases/java/org/apache/cocoon/reading
DatabaseReader.java
src/scratchpad/src/org/apache/cocoon/reading
ImageReader.java
src/java/org/apache/cocoon/caching
CacheableProcessingComponent.java
src/scratchpad/src/org/apache/cocoon/transformation/pagination
Paginator.java
src/blocks/xmldb/java/org/apache/cocoon/generation
XMLDBCollectionGenerator.java XMLDBGenerator.java
src/java/org/apache/cocoon/serialization
AbstractTextSerializer.java
src/blocks/html/java/org/apache/cocoon/generation
HTMLGenerator.java
src/blocks/lucene/java/org/apache/cocoon/transformation
LuceneIndexTransformer.java
src/java/org/apache/cocoon/reading ResourceReader.java
Log:
Correcting method names of new CacheableProcessingComponent interface.
It's now possible to write components that support the 2.0.x and the
2.1.x caching algorithm.
This hurts a little bit but as this is alpha anyway...otherwise we are not
compatible!
Revision Changes Path
1.2 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/generation/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/FileGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileGenerator.java 9 Mar 2003 00:09:31 -0000 1.1
+++ FileGenerator.java 19 Mar 2003 15:42:13 -0000 1.2
@@ -113,7 +113,7 @@
*
* @return The generated key hashes the src
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return this.inputSource.getURI();
}
@@ -123,7 +123,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return this.inputSource.getValidity();
}
1.2 +5 -5
cocoon-2.1/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerPagesGenerator.java 9 Mar 2003 00:09:31 -0000 1.1
+++ ServerPagesGenerator.java 19 Mar 2003 15:42:13 -0000 1.2
@@ -142,8 +142,8 @@
* @return The generated key or <code>null</code> if the component
* is currently not cacheable.
*/
- public Serializable generateKey() {
- Object generatorkey = generator.generateKey();
+ public Serializable getKey() {
+ Object generatorkey = generator.getKey();
if (generatorkey==null)
return this.inputSource.getURI();
return this.inputSource.getURI() + '-' + generatorkey;
@@ -157,10 +157,10 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
// VG: Input source's systemID is part of the key,
// and need not be included into the validity.
- return generator.generateValidity();
+ return generator.getValidity();
}
/**
1.2 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/generation/AbstractServerPage.java
Index: AbstractServerPage.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/AbstractServerPage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractServerPage.java 9 Mar 2003 00:09:31 -0000 1.1
+++ AbstractServerPage.java 19 Mar 2003 15:42:13 -0000 1.2
@@ -145,7 +145,7 @@
* @return The generated key or <code>null</code> if the component
* is currently not cacheable.
*/
- public Serializable generateKey() {
+ public Serializable getKey() {
return null;
}
@@ -158,7 +158,7 @@
* is the default if hasContentChange() gives false otherwise
* <code>null</code> will be returned.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
if (hasContentChanged(request))
return null;
else
1.10 +6 -1 cocoon-2.1/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/changes.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- changes.xml 19 Mar 2003 08:52:12 -0000 1.9
+++ changes.xml 19 Mar 2003 15:42:13 -0000 1.10
@@ -43,6 +43,11 @@
<release version="@version@" date="@date@">
<action dev="CZ" type="update">
+ Correcting method names of new CacheableProcessingComponent interface.
+ It's now possible to write components that support the 2.0.x and the
+ 2.1.x caching algorithm.
+ </action>
+ <action dev="CZ" type="update">
Setting minimum JDK version from 1.2 to 1.3.
</action>
<action dev="CZ" type="update">
1.2 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/transformation/FilterTransformer.java
Index: FilterTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/FilterTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilterTransformer.java 9 Mar 2003 00:09:39 -0000 1.1
+++ FilterTransformer.java 19 Mar 2003 15:42:14 -0000 1.2
@@ -132,7 +132,7 @@
* @return The generated key or <code>0</code> if the component
* is currently not cacheable.
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return this.elementName + '<' + this.count + '>' + this.blocknr;
}
@@ -144,7 +144,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return NOPValidity.SHARED_INSTANCE;
}
1.4 +4 -4
cocoon-2.1/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
Index: EncodeURLTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EncodeURLTransformer.java 16 Mar 2003 17:49:15 -0000 1.3
+++ EncodeURLTransformer.java 19 Mar 2003 15:42:14 -0000 1.4
@@ -249,7 +249,7 @@
*
* @return The generated key hashes the src
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
if (this.isEncodeURLNeeded) {
return null;
} else {
@@ -263,7 +263,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
if (this.isEncodeURLNeeded) {
return null;
} else {
1.2 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TraxTransformer.java 9 Mar 2003 00:09:40 -0000 1.1
+++ TraxTransformer.java 19 Mar 2003 15:42:14 -0000 1.2
@@ -295,7 +295,7 @@
*
* @return The generated key hashes the src
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
Map map = this.getLogicSheetParameters();
if (map == null) {
return this.inputSource.getURI();
@@ -320,7 +320,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
/*
* VG: Key is generated using parameter/value pairs,
* so this information does not need to be verified again
1.2 +5 -5
cocoon-2.1/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
Index: CIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CIncludeTransformer.java 9 Mar 2003 00:09:39 -0000 1.1
+++ CIncludeTransformer.java 19 Mar 2003 15:42:14 -0000 1.2
@@ -647,9 +647,9 @@
}
/**
- * @see org.apache.cocoon.caching.CacheableProcessingComponent#generateKey()
+ * @see org.apache.cocoon.caching.CacheableProcessingComponent#getKey()
*/
- public Serializable generateKey() {
+ public Serializable getKey() {
if (this.supportCaching
&& null != this.cacheManager
&& this.cachingSession.getExpires() > 0) {
@@ -659,9 +659,9 @@
}
/**
- * @see
org.apache.cocoon.caching.CacheableProcessingComponent#generateValidity()
+ * @see org.apache.cocoon.caching.CacheableProcessingComponent#getValidity()
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
if (this.supportCaching
&& null != this.cacheManager
&& this.cachingSession.getExpires() > 0
1.4 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- I18nTransformer.java 16 Mar 2003 17:49:15 -0000 1.3
+++ I18nTransformer.java 19 Mar 2003 15:42:14 -0000 1.4
@@ -847,7 +847,7 @@
* Implemenation of CacheableProcessingComponents.
* Generates unique key for the current locale.
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return catalogueLocation + '/' + catalogueName + '?' + this.locale;
}
@@ -856,7 +856,7 @@
* Generates validity object for this transformer or <code>null</code>
* if this instance is not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return I18N_NOP_VALIDITY;
}
1.2 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/transformation/RoleFilterTransformer.java
Index: RoleFilterTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/RoleFilterTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RoleFilterTransformer.java 9 Mar 2003 00:09:39 -0000 1.1
+++ RoleFilterTransformer.java 19 Mar 2003 15:42:14 -0000 1.2
@@ -106,7 +106,7 @@
/**
* Disable caching
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return null;
}
1.2 +3 -3
cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/generation/SourceDescriptionGenerator.java
Index: SourceDescriptionGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/generation/SourceDescriptionGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceDescriptionGenerator.java 9 Mar 2003 00:06:22 -0000 1.1
+++ SourceDescriptionGenerator.java 19 Mar 2003 15:42:14 -0000 1.2
@@ -209,7 +209,7 @@
*
* @return The generated key hashes the src
*/
- public Serializable generateKey() {
+ public Serializable getKey() {
StringBuffer key = new StringBuffer();
@@ -237,7 +237,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
AggregatedValidity validity = new AggregatedValidity();
1.2 +3 -3
cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java
Index: ParserTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParserTransformer.java 9 Mar 2003 00:02:49 -0000 1.1
+++ ParserTransformer.java 19 Mar 2003 15:42:14 -0000 1.2
@@ -275,7 +275,7 @@
*
* @return The generated key hashes the src
*/
- public Serializable generateKey() {
+ public Serializable getKey() {
return this.grammarSource.getURI();
}
@@ -285,7 +285,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return this.grammarSource.getValidity();
}
1.2 +3 -3
cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java
Index: PatternTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PatternTransformer.java 9 Mar 2003 00:02:49 -0000 1.1
+++ PatternTransformer.java 19 Mar 2003 15:42:14 -0000 1.2
@@ -250,7 +250,7 @@
*
* @return The generated key hashes the src
*/
- public Serializable generateKey() {
+ public Serializable getKey() {
return this.lexiconSource.getURI();
}
@@ -260,7 +260,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return this.lexiconSource.getValidity();
}
1.2 +3 -3
cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java
Index: LexicalTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LexicalTransformer.java 9 Mar 2003 00:02:49 -0000 1.1
+++ LexicalTransformer.java 19 Mar 2003 15:42:14 -0000 1.2
@@ -261,7 +261,7 @@
*
* @return The generated key hashes the src
*/
- public Serializable generateKey() {
+ public Serializable getKey() {
return this.lexiconSource.getURI();
}
@@ -271,7 +271,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return this.lexiconSource.getValidity();
}
1.2 +3 -3
cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/generation/TextGenerator.java
Index: TextGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/chaperon/java/org/apache/cocoon/generation/TextGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TextGenerator.java 9 Mar 2003 00:02:49 -0000 1.1
+++ TextGenerator.java 19 Mar 2003 15:42:15 -0000 1.2
@@ -137,7 +137,7 @@
*
* @return The generated key hashes the src
*/
- public Serializable generateKey() {
+ public Serializable getKey() {
return inputSource.getURI();
}
@@ -147,7 +147,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return this.inputSource.getValidity();
}
1.2 +3 -3
cocoon-2.1/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Index: FragmentExtractorTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FragmentExtractorTransformer.java 9 Mar 2003 00:02:39 -0000 1.1
+++ FragmentExtractorTransformer.java 19 Mar 2003 15:42:15 -0000 1.2
@@ -182,7 +182,7 @@
*
* @return The generated key hashes the src
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return "1";
}
@@ -192,7 +192,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return NOPValidity.SHARED_INSTANCE;
}
1.3 +3 -3
cocoon-2.1/src/blocks/itext/java/org/apache/cocoon/serialization/iTextSerializer.java
Index: iTextSerializer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/itext/java/org/apache/cocoon/serialization/iTextSerializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iTextSerializer.java 11 Mar 2003 17:44:20 -0000 1.2
+++ iTextSerializer.java 19 Mar 2003 15:42:15 -0000 1.3
@@ -109,11 +109,11 @@
this.contentHandler = new SAXiTextHandler(document);
}
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return "1";
}
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return NOPValidity.SHARED_INSTANCE;
}
1.2 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
Index: ContentAggregator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/sitemap/ContentAggregator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentAggregator.java 9 Mar 2003 00:09:38 -0000 1.1
+++ ContentAggregator.java 19 Mar 2003 15:42:15 -0000 1.2
@@ -171,7 +171,7 @@
*
* @return The generated key hashes the src
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
try {
StringBuffer buffer = new StringBuffer();
buffer.append("CA(")
@@ -208,7 +208,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
try {
AggregatedValidity v = new AggregatedValidity();
Source current;
1.2 +3 -3
cocoon-2.1/src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java
Index: SVGSerializer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/batik/java/org/apache/cocoon/serialization/SVGSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGSerializer.java 9 Mar 2003 00:02:38 -0000 1.1
+++ SVGSerializer.java 19 Mar 2003 15:42:15 -0000 1.2
@@ -295,7 +295,7 @@
* @return The generated key or <code>0</code> if the component
* is currently not cacheable.
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return "1";
}
@@ -307,7 +307,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return NOPValidity.SHARED_INSTANCE;
}
1.2 +10 -10
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractCachingProcessingPipeline.java 9 Mar 2003 00:09:08 -0000 1.1
+++ AbstractCachingProcessingPipeline.java 19 Mar 2003 15:42:15 -0000 1.2
@@ -331,7 +331,7 @@
// is the generator cacheable?
if (super.generator instanceof CacheableProcessingComponent) {
- key = ((CacheableProcessingComponent)super.generator).generateKey();
+ key = ((CacheableProcessingComponent)super.generator).getKey();
this.generatorIsCacheableProcessingComponent = true;
} else if (super.generator instanceof Cacheable) {
key = new Long(((Cacheable)super.generator).generateKey());
@@ -354,7 +354,7 @@
(Transformer)super.transformers.get(this.firstNotCacheableTransformerIndex);
key = null;
if (trans instanceof CacheableProcessingComponent) {
- key = ((CacheableProcessingComponent)trans).generateKey();
+ key = ((CacheableProcessingComponent)trans).getKey();
this.transformerIsCacheableProcessingComponent[this.firstNotCacheableTransformerIndex]
= true;
} else if (trans instanceof Cacheable) {
key = new Long(((Cacheable)trans).generateKey());
@@ -376,7 +376,7 @@
key = null;
if (super.serializer instanceof CacheableProcessingComponent) {
- key =
((CacheableProcessingComponent)this.serializer).generateKey();
+ key = ((CacheableProcessingComponent)this.serializer).getKey();
this.serializerIsCacheableProcessingComponent = true;
} else if (this.serializer instanceof Cacheable) {
key = new Long(((Cacheable)this.serializer).generateKey());
@@ -684,7 +684,7 @@
Serializable readerKey = null;
boolean isCacheableProcessingComponent = false;
if (super.reader instanceof CacheableProcessingComponent) {
- readerKey =
((CacheableProcessingComponent)super.reader).generateKey();
+ readerKey = ((CacheableProcessingComponent)super.reader).getKey();
isCacheableProcessingComponent = true;
} else if (super.reader instanceof Cacheable) {
readerKey = new Long(((Cacheable)super.reader).generateKey());
@@ -718,7 +718,7 @@
if ( result == 0 ) {
// get reader validity and compare
if (isCacheableProcessingComponent) {
- readerValidity =
((CacheableProcessingComponent)super.reader).generateValidity();
+ readerValidity =
((CacheableProcessingComponent)super.reader).getValidity();
} else {
CacheValidity cv =
((Cacheable)super.reader).generateValidity();
if ( cv != null ) {
@@ -766,7 +766,7 @@
}
if (readerValidity == null) {
if (isCacheableProcessingComponent) {
- readerValidity =
((CacheableProcessingComponent)super.reader).generateValidity();
+ readerValidity =
((CacheableProcessingComponent)super.reader).getValidity();
} else {
CacheValidity cv =
((Cacheable)super.reader).generateValidity();
if ( cv != null ) {
@@ -857,7 +857,7 @@
if (index == 0) {
// test generator
if (this.generatorIsCacheableProcessingComponent) {
- validity =
((CacheableProcessingComponent)super.generator).generateValidity();
+ validity =
((CacheableProcessingComponent)super.generator).getValidity();
} else {
validity =
CacheValidityToSourceValidity.createValidity(((Cacheable)super.generator).generateValidity());
}
@@ -865,14 +865,14 @@
// test transformer
final Transformer trans = (Transformer)super.transformers.get(index-1);
if (this.transformerIsCacheableProcessingComponent[index-1]) {
- validity = ((CacheableProcessingComponent)trans).generateValidity();
+ validity = ((CacheableProcessingComponent)trans).getValidity();
} else {
validity =
CacheValidityToSourceValidity.createValidity(((Cacheable)trans).generateValidity());
}
} else {
// test serializer
if (this.serializerIsCacheableProcessingComponent) {
- validity =
((CacheableProcessingComponent)super.serializer).generateValidity();
+ validity =
((CacheableProcessingComponent)super.serializer).getValidity();
} else {
validity =
CacheValidityToSourceValidity.createValidity(((Cacheable)super.serializer).generateValidity());
}
1.3 +3 -3
cocoon-2.1/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtSVGGenerator.java
Index: AsciiArtSVGGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/asciiart/java/org/apache/cocoon/generation/asciiart/AsciiArtSVGGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AsciiArtSVGGenerator.java 11 Mar 2003 17:44:15 -0000 1.2
+++ AsciiArtSVGGenerator.java 19 Mar 2003 15:42:15 -0000 1.3
@@ -165,7 +165,7 @@
*
[EMAIL PROTECTED] The generated key hashes the src
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return this.inputSource.getURI();
}
@@ -176,7 +176,7 @@
[EMAIL PROTECTED] The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return this.inputSource.getValidity();
}
1.2 +3 -3
cocoon-2.1/src/blocks/batik/java/org/apache/cocoon/generation/FragmentExtractorGenerator.java
Index: FragmentExtractorGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/batik/java/org/apache/cocoon/generation/FragmentExtractorGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FragmentExtractorGenerator.java 9 Mar 2003 00:02:38 -0000 1.1
+++ FragmentExtractorGenerator.java 19 Mar 2003 15:42:16 -0000 1.2
@@ -84,7 +84,7 @@
*
* @return The generated key hashes the src
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return this.source;
}
@@ -94,7 +94,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return NOPValidity.SHARED_INSTANCE;
}
1.2 +3 -3
cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/transformation/XMLDBTransformer.java
Index: XMLDBTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/transformation/XMLDBTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLDBTransformer.java 9 Mar 2003 00:06:50 -0000 1.1
+++ XMLDBTransformer.java 19 Mar 2003 15:42:16 -0000 1.2
@@ -263,7 +263,7 @@
* @return The generated key or <code>null</code> if the component
* is currently not cacheable.
*/
- public Serializable generateKey() {
+ public Serializable getKey() {
return null;
}
@@ -275,7 +275,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return null;
}
1.4 +3 -3
cocoon-2.1/src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java
Index: FOPSerializer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/fop/java/org/apache/cocoon/serialization/FOPSerializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FOPSerializer.java 16 Mar 2003 04:47:53 -0000 1.3
+++ FOPSerializer.java 19 Mar 2003 15:42:16 -0000 1.4
@@ -276,7 +276,7 @@
* @return The generated key or <code>0</code> if the component
* is currently not cacheable.
*/
- public Serializable generateKey() {
+ public Serializable getKey() {
return "1";
}
@@ -288,7 +288,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return NOPValidity.SHARED_INSTANCE;
}
1.2 +3 -3
cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/reading/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/reading/DatabaseReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DatabaseReader.java 9 Mar 2003 00:03:10 -0000 1.1
+++ DatabaseReader.java 19 Mar 2003 15:42:16 -0000 1.2
@@ -341,7 +341,7 @@
*
* @return The generated key hashes the src
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return this.source;
}
@@ -351,7 +351,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
if (this.lastModified > 0) {
return new TimeStampValidity(this.lastModified);
} else {
1.3 +3 -3
cocoon-2.1/src/scratchpad/src/org/apache/cocoon/reading/ImageReader.java
Index: ImageReader.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/reading/ImageReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ImageReader.java 16 Mar 2003 18:03:54 -0000 1.2
+++ ImageReader.java 19 Mar 2003 15:42:16 -0000 1.3
@@ -212,11 +212,11 @@
* @return The generated key consists from src and width and height
* parameters
*/
- public Serializable generateKey() {
+ public Serializable getKey() {
if (width > 0 || height > 0) {
return this.inputSource.getURI() + ':' + this.width + ':' + this.height;
} else {
- return super.generateKey();
+ return super.getKey();
}
}
}
1.2 +5 -5
cocoon-2.1/src/java/org/apache/cocoon/caching/CacheableProcessingComponent.java
Index: CacheableProcessingComponent.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/caching/CacheableProcessingComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CacheableProcessingComponent.java 9 Mar 2003 00:08:44 -0000 1.1
+++ CacheableProcessingComponent.java 19 Mar 2003 15:42:16 -0000 1.2
@@ -67,20 +67,20 @@
/**
* Generate the unique key.
* This key must be unique inside the space of this component.
- * This method must be invoked before the generateValidity() method.
+ * This method must be invoked before the getValidity() method.
*
* @return The generated key or <code>null</code> if the component
* is currently not cacheable.
*/
- Serializable generateKey();
+ Serializable getKey();
/**
* Generate the validity object.
- * Before this method can be invoked the generateKey() method
+ * Before this method can be invoked the getKey() method
* must be invoked.
*
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- SourceValidity generateValidity();
+ SourceValidity getValidity();
}
1.3 +3 -3
cocoon-2.1/src/scratchpad/src/org/apache/cocoon/transformation/pagination/Paginator.java
Index: Paginator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/transformation/pagination/Paginator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Paginator.java 16 Mar 2003 18:03:55 -0000 1.2
+++ Paginator.java 19 Mar 2003 15:42:16 -0000 1.3
@@ -201,7 +201,7 @@
* @return The generated key or <code>null</code> if the component
* is currently not cacheable.
*/
- public Serializable generateKey() {
+ public Serializable getKey() {
if (this.inputSource.getLastModified() != 0) {
return this.inputSource.getURI() + page;
} else {
@@ -217,7 +217,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
if (this.inputSource.getLastModified() != 0) {
AggregatedValidity validity = new AggregatedValidity();
validity.add(new TimeStampValidity(page));
1.2 +2 -9
cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java
Index: XMLDBCollectionGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBCollectionGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLDBCollectionGenerator.java 9 Mar 2003 00:06:49 -0000 1.1
+++ XMLDBCollectionGenerator.java 19 Mar 2003 15:42:16 -0000 1.2
@@ -187,14 +187,7 @@
/**
* The component isn't cached (yet)
*/
- public SourceValidity generateValidity() {
- return null;
- }
-
- /**
- * The component isn't cached (yet)
- */
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return null;
}
1.2 +2 -9
cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBGenerator.java
Index: XMLDBGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmldb/java/org/apache/cocoon/generation/XMLDBGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLDBGenerator.java 9 Mar 2003 00:06:49 -0000 1.1
+++ XMLDBGenerator.java 19 Mar 2003 15:42:16 -0000 1.2
@@ -180,14 +180,7 @@
/**
* The component isn't cached (yet)
*/
- public SourceValidity generateValidity() {
- return null;
- }
-
- /**
- * The component isn't cached (yet)
- */
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return null;
}
1.2 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
Index: AbstractTextSerializer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractTextSerializer.java 9 Mar 2003 00:09:36 -0000 1.1
+++ AbstractTextSerializer.java 19 Mar 2003 15:42:16 -0000 1.2
@@ -280,7 +280,7 @@
* @return The generated key or <code>0</code> if the component
* is currently not cacheable.
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return "1";
}
@@ -292,7 +292,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return NOPValidity.SHARED_INSTANCE;
}
1.3 +3 -3
cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HTMLGenerator.java 12 Mar 2003 09:35:38 -0000 1.2
+++ HTMLGenerator.java 19 Mar 2003 15:42:17 -0000 1.3
@@ -248,7 +248,7 @@
* @return The generated key or <code>0</code> if the component
* is currently not cacheable.
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
if (this.inputSource == null)
return null;
@@ -269,7 +269,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
if (this.inputSource == null)
return null;
return this.inputSource.getValidity();
1.4 +3 -3
cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/transformation/LuceneIndexTransformer.java
Index: LuceneIndexTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/lucene/java/org/apache/cocoon/transformation/LuceneIndexTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LuceneIndexTransformer.java 12 Mar 2003 09:35:39 -0000 1.3
+++ LuceneIndexTransformer.java 19 Mar 2003 15:42:17 -0000 1.4
@@ -199,7 +199,7 @@
*
* @return The generated key
*/
- public Serializable generateKey() {
+ public Serializable getKey() {
return "1";
}
@@ -209,7 +209,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return NOPValidity.SHARED_INSTANCE;
}
1.2 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/reading/ResourceReader.java
Index: ResourceReader.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/reading/ResourceReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceReader.java 9 Mar 2003 00:09:35 -0000 1.1
+++ ResourceReader.java 19 Mar 2003 15:42:17 -0000 1.2
@@ -156,7 +156,7 @@
*
* @return The generated key hashes the src
*/
- public java.io.Serializable generateKey() {
+ public java.io.Serializable getKey() {
return inputSource.getURI();
}
@@ -166,7 +166,7 @@
* @return The generated validity object or <code>null</code> if the
* component is currently not cacheable.
*/
- public SourceValidity generateValidity() {
+ public SourceValidity getValidity() {
return inputSource.getValidity();
}
