Here is a patch upgrading the CachingCIncludeTransformer 
to use IncludeXMLConsumer. 


Maciek Kaminski
[EMAIL PROTECTED]

Index: CachingCIncludeTransformer.java
===================================================================
RCS file: 
/home/cvspublic/xml-cocoon2/src/org/apache/cocoon/transformation/CachingCIncludeTransformer.java,v
retrieving revision 1.4
diff -u -r1.4 CachingCIncludeTransformer.java
--- CachingCIncludeTransformer.java     2001/07/16 11:38:09     1.4
+++ CachingCIncludeTransformer.java     2001/07/17 09:39:25
@@ -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;
     }
 }

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

Reply via email to