cziegeler 01/05/28 05:07:56
Modified: src/org/apache/cocoon/components/pipeline
AbstractEventPipeline.java
src/org/apache/cocoon/components/saxconnector
NullSAXConnector.java
Log:
Fixed NullSAXConnector to use the SourceResolver. When the NullSAXConnector is
configured it is NOT used - so the same effect as a missing configured sax connector
Revision Changes Path
1.4 +5 -2
xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java
Index: AbstractEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractEventPipeline.java 2001/05/23 09:40:51 1.3
+++ AbstractEventPipeline.java 2001/05/28 12:07:55 1.4
@@ -21,6 +21,7 @@
import org.apache.cocoon.Processor;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.saxconnector.SAXConnector;
+import org.apache.cocoon.components.saxconnector.NullSAXConnector;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.generation.Generator;
import org.apache.cocoon.sitemap.ErrorNotifier;
@@ -34,7 +35,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:cziegeler@Carsten Ziegeler">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 09:40:51 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/28 12:07:55 $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
@@ -68,7 +69,9 @@
this.configuredSAXConnector = false;
try {
saxConnector = this.manager.lookup(Roles.SAX_CONNECTOR);
- this.configuredSAXConnector = true;
+ // FIXME (CZ) remove the NullSAXConnector test when it is an optional
+ // configuration
+ this.configuredSAXConnector = !(saxConnector instanceof
NullSAXConnector);
this.manager.release(saxConnector);
} catch (ComponentException ignore) {}
}
1.5 +3 -3
xml-cocoon2/src/org/apache/cocoon/components/saxconnector/NullSAXConnector.java
Index: NullSAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/saxconnector/NullSAXConnector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NullSAXConnector.java 2001/05/28 12:01:15 1.4
+++ NullSAXConnector.java 2001/05/28 12:07:55 1.5
@@ -11,16 +11,16 @@
import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.sitemap.Sitemap;
import org.apache.cocoon.xml.AbstractXMLPipe;
import org.apache.avalon.excalibur.pool.Poolable;
-import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
/**
* Null implementation of the SAXConnector. Simply sends events on to the next
component in the pipeline.
* @author <a href="[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/05/28 12:01:15 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/05/28 12:07:55 $
*/
public class NullSAXConnector extends AbstractXMLPipe implements Poolable,
SAXConnector {
/** Set the sitemap
@@ -31,7 +31,7 @@
/** Setup this SAXConnector.
*/
- public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters params)
+ public void setup(SourceResolver resolver, Map objectModel, String src,
Parameters params)
throws ProcessingException, SAXException, IOException {
// do nothing.
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
