cziegeler 01/07/17 03:59:22
Modified: src/org/apache/cocoon/transformation
CachingCIncludeTransformer.java
Log:
Here is a patch upgrading the CachingCIncludeTransformer
to use IncludeXMLConsumer.
Submitted by: Maciek Kaminski ([EMAIL PROTECTED])
Revision Changes Path
1.5 +13 -5
xml-cocoon2/src/org/apache/cocoon/transformation/CachingCIncludeTransformer.java
Index: CachingCIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/CachingCIncludeTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CachingCIncludeTransformer.java 2001/07/16 11:38:09 1.4
+++ CachingCIncludeTransformer.java 2001/07/17 10:59:22 1.5
@@ -49,7 +49,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Maciek Kaminski</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/07/16 11:38:09 $ $Author: cziegeler $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/07/17 10:59:22 $ $Author: cziegeler $
*/
public class CachingCIncludeTransformer extends AbstractTransformer
implements Recyclable, Composable, Cacheable {
@@ -67,8 +67,12 @@
/** The current <code>ComponentManager</code>. */
protected ComponentManager manager = null;
+ /** The current <code>IncludeCacheValidity</code>. */
protected IncludeCacheValidity currentCacheValidity;
+ /** The current <code>IncludeXMLConsumer</code> that ommits start and
endDocument events. */
+ protected IncludeXMLConsumer consumer;
+
/**
* Setup the component.
*/
@@ -142,7 +146,6 @@
// complete validity information
if(currentCacheValidity != null ) {
try {
-
currentCacheValidity.add(src,
sourceResolver.resolve(src).getLastModified());
getLogger().debug("currentCacheValidity: " + currentCacheValidity);
} catch (Exception e) {
@@ -163,9 +166,7 @@
}
try {
- getLogger().debug("sourceResolver:" + sourceResolver);
- getLogger().debug("this.sourceResolver.resolve(src):" +
this.sourceResolver.resolve(src));
- this.sourceResolver.resolve(src).stream(this);
+ this.sourceResolver.resolve(src).stream(getConsumer());
} catch (Exception e) {
getLogger().error("CachingCIncludeTransformer", e);
throw new SAXException("CachingCIncludeTransformer could not read
resource", e);
@@ -212,5 +213,12 @@
getLogger().error("CachingCIncludeTransformer: could not generateKey",
e);
return null;
}
+ }
+
+ protected IncludeXMLConsumer getConsumer() {
+ if(consumer == null) {
+ consumer = new IncludeXMLConsumer(this);
+ }
+ return consumer;
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
