cziegeler 01/06/20 23:53:15
Modified: src/org/apache/cocoon/components/language/markup/sitemap/java
sitemap.xsl
src/org/apache/cocoon/components/pipeline
AbstractEventPipeline.java
CachingEventPipeline.java EventPipeline.java
src/org/apache/cocoon/components/saxconnector
LoggingSAXConnector.java NullSAXConnector.java
SAXConnector.java
Log:
Cleaned up sax connector and event pipeline interface
Revision Changes Path
1.18 +1 -7
xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sitemap.xsl 2001/06/19 11:56:56 1.17
+++ sitemap.xsl 2001/06/21 06:52:56 1.18
@@ -127,7 +127,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Id: sitemap.xsl,v 1.17 2001/06/19 11:56:56 dims Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.18 2001/06/21 06:52:56 cziegeler Exp $
*/
public class <xsl:value-of select="@file-name"/> extends AbstractSitemap {
static final String LOCATION = "<xsl:value-of select="translate(@file-path,
'/', '.')"/>.<xsl:value-of select="@file-name"/>";
@@ -321,7 +321,6 @@
public boolean resource_<xsl:value-of select="translate(@name, '- ',
'__')"/> (StreamPipeline pipeline,
EventPipeline eventPipeline, List listOfMaps, Environment environment,
String cocoon_view, boolean internalRequest)
throws Exception {
- eventPipeline.setSitemap(this);
Map map = null;
Parameters param = null;
Map objectModel = environment.getObjectModel();
@@ -345,7 +344,6 @@
private boolean view_<xsl:value-of select="translate(@name, '- ', '__')"/>
(StreamPipeline pipeline,
EventPipeline eventPipeline, List listOfMaps, Environment environment,
boolean internalRequest)
throws Exception {
- eventPipeline.setSitemap(this);
Map map = null;
Parameters param = null;
SitemapRedirector redirector = new SitemapRedirector(environment);
@@ -412,7 +410,6 @@
try {
eventPipeline = (EventPipeline)this.manager.lookup(Roles.EVENT_PIPELINE);
pipeline = (StreamPipeline)this.manager.lookup(Roles.STREAM_PIPELINE);
- eventPipeline.setSitemap(this);
pipeline.setEventPipeline(eventPipeline);
result = process (environment, pipeline, eventPipeline, false);
} catch (Exception e) {
@@ -447,8 +444,6 @@
XPath kind expressions in values of src attribute used with
generate and transform elements */
List listOfMaps = (List) new ArrayList();
- eventPipeline.setSitemap(this);
-
<!-- process the pipelines -->
<!-- for each pipeline element generate a try/catch block -->
<xsl:for-each select="/map:sitemap/map:pipelines/map:pipeline">
@@ -516,7 +511,6 @@
try {
eventPipeline =
(EventPipeline)this.manager.lookup(Roles.EVENT_PIPELINE);
pipeline = (StreamPipeline)this.manager.lookup(Roles.STREAM_PIPELINE);
- eventPipeline.setSitemap(this);
pipeline.setEventPipeline(eventPipeline);
List listOfMaps = (List)(new ArrayList());
Map map;
1.9 +1 -13
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractEventPipeline.java 2001/06/14 10:47:35 1.8
+++ AbstractEventPipeline.java 2001/06/21 06:53:02 1.9
@@ -25,7 +25,6 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.generation.Generator;
import org.apache.cocoon.sitemap.ErrorNotifier;
-import org.apache.cocoon.sitemap.Sitemap;
import org.apache.cocoon.transformation.Transformer;
import org.apache.cocoon.xml.AbstractXMLProducer;
import org.apache.cocoon.xml.XMLConsumer;
@@ -35,7 +34,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:cziegeler@Carsten Ziegeler">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/06/14 10:47:35 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/06/21 06:53:02 $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
@@ -54,9 +53,6 @@
/** the component manager */
protected ComponentManager manager;
- /** the sitemap */
- protected Sitemap sitemap;
-
/** is a SAXConnector configured? */
protected boolean configuredSAXConnector;
@@ -76,10 +72,6 @@
} catch (ComponentException ignore) {}
}
- public final void setSitemap(final Sitemap sitemap) {
- this.sitemap = sitemap;
- }
-
public void setGenerator (String role, String source, Parameters param,
Exception e)
throws Exception {
this.setGenerator (role, source, param);
@@ -206,7 +198,6 @@
// connect SAXConnector
SAXConnector connect = (SAXConnector)
this.manager.lookup(Roles.SAX_CONNECTOR);
connect.setup(environment,environment.getObjectModel(),null,null);
- connect.setSitemap(this.sitemap);
this.connectors.add(connect);
next = connect;
prev.setConsumer(next);
@@ -223,7 +214,6 @@
// insert SAXConnector
SAXConnector connect = (SAXConnector)
this.manager.lookup(Roles.SAX_CONNECTOR);
connect.setup(environment,environment.getObjectModel(),null,null);
- connect.setSitemap(this.sitemap);
this.connectors.add(connect);
next = connect;
prev.setConsumer(next);
@@ -259,8 +249,6 @@
public void recycle() {
super.recycle();
-
- this.sitemap = null;
try {
// Release generator.
1.11 +1 -3
xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java
Index: CachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CachingEventPipeline.java 2001/06/14 10:47:35 1.10
+++ CachingEventPipeline.java 2001/06/21 06:53:03 1.11
@@ -52,7 +52,7 @@
* does not cache! (If it would cache, the response would be cached twice!)
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.10 $ $Date: 2001/06/14 10:47:35 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/06/21 06:53:03 $
*/
public final class CachingEventPipeline
extends AbstractEventPipeline
@@ -326,7 +326,6 @@
// connect SAXConnector
SAXConnector connect = (SAXConnector)
this.manager.lookup(Roles.SAX_CONNECTOR);
connect.setup(environment,environment.getObjectModel(),null,null);
- connect.setSitemap(this.sitemap);
this.connectors.add(connect);
next = connect;
prev.setConsumer(next);
@@ -351,7 +350,6 @@
// insert SAXConnector
SAXConnector connect = (SAXConnector)
this.manager.lookup(Roles.SAX_CONNECTOR);
connect.setup(environment,environment.getObjectModel(),null,null);
- connect.setSitemap(this.sitemap);
this.connectors.add(connect);
next = connect;
prev.setConsumer(next);
1.4 +1 -2
xml-cocoon2/src/org/apache/cocoon/components/pipeline/EventPipeline.java
Index: EventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/EventPipeline.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EventPipeline.java 2001/06/08 20:28:17 1.3
+++ EventPipeline.java 2001/06/21 06:53:04 1.4
@@ -18,13 +18,12 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/06/08 20:28:17 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/06/21 06:53:04 $
*/
public interface EventPipeline extends Component, Composable, Recyclable, Processor
{
void setGenerator (String role, String source, Parameters param, Exception e)
throws Exception;
void setGenerator (String role, String source, Parameters param) throws
Exception;
Generator getGenerator ();
void addTransformer (String role, String source, Parameters param) throws
Exception;
- void setSitemap(Sitemap sitemap);
boolean process(Environment environment) throws Exception;
}
1.3 +2 -11
xml-cocoon2/src/org/apache/cocoon/components/saxconnector/LoggingSAXConnector.java
Index: LoggingSAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/saxconnector/LoggingSAXConnector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoggingSAXConnector.java 2001/06/20 13:19:16 1.2
+++ LoggingSAXConnector.java 2001/06/21 06:53:09 1.3
@@ -15,13 +15,11 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
-import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
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.cocoon.xml.XMLConsumer;
import org.xml.sax.Attributes;
@@ -31,21 +29,14 @@
/**
* This SAX connector logs all intermediate sax streams to the log.
* @author <a href="[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/06/20 13:19:16 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/06/21 06:53:09 $
*/
public class LoggingSAXConnector
extends AbstractXMLPipe
-implements Recyclable, SAXConnector {
+implements SAXConnector {
/** The writer getting the xml */
protected Writer writer;
-
- /** Set the sitemap
- */
- public final void setSitemap(Sitemap sitemap) {
- // do nothing.
- }
-
/** The SAX Transformer factory */
protected static SAXTransformerFactory transFactory =
1.6 +2 -9
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NullSAXConnector.java 2001/05/28 12:07:55 1.5
+++ NullSAXConnector.java 2001/06/21 06:53:10 1.6
@@ -12,22 +12,15 @@
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.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.5 $ $Date: 2001/05/28 12:07:55 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/06/21 06:53:10 $
*/
-public class NullSAXConnector extends AbstractXMLPipe implements Poolable,
SAXConnector {
- /** Set the sitemap
- */
- public final void setSitemap(Sitemap sitemap) {
- // do nothing.
- }
+public class NullSAXConnector extends AbstractXMLPipe implements SAXConnector {
/** Setup this SAXConnector.
*/
1.2 +1 -9
xml-cocoon2/src/org/apache/cocoon/components/saxconnector/SAXConnector.java
Index: SAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/saxconnector/SAXConnector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SAXConnector.java 2001/05/09 20:50:00 1.1
+++ SAXConnector.java 2001/06/21 06:53:12 1.2
@@ -8,21 +8,13 @@
package org.apache.cocoon.components.saxconnector;
import org.apache.avalon.framework.component.Component;
-import org.apache.cocoon.sitemap.Sitemap;
import org.apache.cocoon.sitemap.SitemapModelComponent;
import org.apache.cocoon.xml.XMLPipe;
-import org.xml.sax.XMLFilter;
/**
* Provides a connection between SAX components.
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Russell</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:50:00 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/06/21 06:53:12 $
*/
public interface SAXConnector extends XMLPipe, Component, SitemapModelComponent {
- /**
- * Pass reference to containing Sitemap.
- * This is a temporary hack until something better
- * comes along.
- */
- void setSitemap(Sitemap sitemap);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
