cziegeler 01/05/23 02:40:56
Modified: src/org/apache/cocoon cocoon.roles
src/org/apache/cocoon/components/pipeline
AbstractEventPipeline.java
CachingEventPipeline.java
NonCachingEventPipeline.java
webapp cocoon.xconf sitemap.xmap
webapp/docs/samples samples.xml
Log:
SAXConnector is optional now, removed the transparent content aggregation
sample
Revision Changes Path
1.3 +1 -2 xml-cocoon2/src/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cocoon.roles 2001/05/11 12:40:24 1.2
+++ cocoon.roles 2001/05/23 09:40:50 1.3
@@ -45,8 +45,7 @@
default-class="org.apache.avalon.excalibur.component.DefaultComponentPoolController"/>
<role name="org.apache.cocoon.components.saxconnector.SAXConnector"
- shorthand="sax-connector"
-
default-class="org.apache.cocoon.components.saxconnector.NullSAXConnector"/>
+ shorthand="sax-connector"/>
<role name="org.apache.cocoon.components.image.ImageEncoderSelector"
shorthand="image-encoder"/>
1.3 +30 -18
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractEventPipeline.java 2001/05/22 14:35:04 1.2
+++ AbstractEventPipeline.java 2001/05/23 09:40:51 1.3
@@ -34,7 +34,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED] Ziegeler">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/22 14:35:04 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 09:40:51 $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
@@ -56,11 +56,21 @@
/** the sitemap */
protected Sitemap sitemap;
+ /** is a SAXConnector configured? */
+ protected boolean configuredSAXConnector;
+
public void compose (ComponentManager manager)
throws ComponentException {
this.manager = manager;
generatorSelector = (ComponentSelector)
this.manager.lookup(Roles.GENERATORS);
transformerSelector =
(ComponentSelector)this.manager.lookup(Roles.TRANSFORMERS);
+ Component saxConnector = null;
+ this.configuredSAXConnector = false;
+ try {
+ saxConnector = this.manager.lookup(Roles.SAX_CONNECTOR);
+ this.configuredSAXConnector = true;
+ this.manager.release(saxConnector);
+ } catch (ComponentException ignore) {}
}
public final void setSitemap(final Sitemap sitemap) {
@@ -192,7 +202,25 @@
try {
Iterator itt = this.transformers.iterator();
while ( itt.hasNext() ) {
- // connect SAXConnector
+ if (this.configuredSAXConnector == true) {
+ // 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 = (XMLConsumer) connect;
+ prev.setConsumer(next);
+ prev = (XMLProducer) connect;
+ }
+ // Connect next component.
+ Transformer trans = (Transformer) itt.next();
+ next = (XMLConsumer) trans;
+ prev.setConsumer(next);
+ prev = (XMLProducer) trans;
+ }
+
+ if (this.configuredSAXConnector == true) {
+ // insert SAXConnector
SAXConnector connect = (SAXConnector)
this.manager.lookup(Roles.SAX_CONNECTOR);
connect.setup(environment,environment.getObjectModel(),null,null);
connect.setSitemap(this.sitemap);
@@ -200,23 +228,7 @@
next = (XMLConsumer) connect;
prev.setConsumer(next);
prev = (XMLProducer) connect;
-
- // Connect next component.
- Transformer trans = (Transformer) itt.next();
- next = (XMLConsumer) trans;
- prev.setConsumer(next);
- prev = (XMLProducer) trans;
}
-
- // 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 = (XMLConsumer) connect;
- prev.setConsumer(next);
- prev = (XMLProducer) connect;
-
// insert this consumer
prev.setConsumer(super.xmlConsumer);
} catch ( IOException e ) {
1.6 +21 -17
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CachingEventPipeline.java 2001/05/22 14:35:26 1.5
+++ CachingEventPipeline.java 2001/05/23 09:40:51 1.6
@@ -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.5 $ $Date: 2001/05/22 14:35:26 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/05/23 09:40:51 $
*/
public final class CachingEventPipeline
extends AbstractEventPipeline
@@ -325,14 +325,16 @@
Iterator itt = usedTransformers.iterator();
while ( itt.hasNext() ) {
- // 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 = (XMLConsumer) connect;
- prev.setConsumer(next);
- prev = (XMLProducer) connect;
+ if (this.configuredSAXConnector == true) {
+ // 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 = (XMLConsumer) connect;
+ prev.setConsumer(next);
+ prev = (XMLProducer) connect;
+ }
// Connect next component.
next = (XMLConsumer) itt.next();
@@ -349,14 +351,16 @@
prev = (XMLProducer) next;
}
- // 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 = (XMLConsumer) connect;
- prev.setConsumer(next);
- prev = (XMLProducer) connect;
+ if (this.configuredSAXConnector == true) {
+ // 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 = (XMLConsumer) connect;
+ prev.setConsumer(next);
+ prev = (XMLProducer) connect;
+ }
// insert this consumer
next = super.xmlConsumer;
1.4 +1 -2
xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingEventPipeline.java
Index: NonCachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/NonCachingEventPipeline.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NonCachingEventPipeline.java 2001/05/22 14:35:41 1.3
+++ NonCachingEventPipeline.java 2001/05/23 09:40:52 1.4
@@ -19,7 +19,6 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
import org.apache.cocoon.Roles;
-import org.apache.cocoon.components.saxconnector.SAXConnector;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.generation.Generator;
import org.apache.cocoon.sitemap.ErrorNotifier;
@@ -31,7 +30,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/22 14:35:41 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/23 09:40:52 $
*/
public class NonCachingEventPipeline extends AbstractEventPipeline
implements Recyclable {
1.6 +0 -2 xml-cocoon2/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/cocoon.xconf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cocoon.xconf 2001/05/16 10:15:49 1.5
+++ cocoon.xconf 2001/05/23 09:40:53 1.6
@@ -156,8 +156,6 @@
<!-- this component is used as a PoolController for the sitemap component
pools -->
<pool-controller
class="org.apache.avalon.excalibur.component.DefaultComponentPoolController"/>
- <sax-connector
class="org.apache.cocoon.components.saxconnector.CIncludeSAXConnector"/>
-
<stream-pipeline
class="org.apache.cocoon.components.pipeline.CachingStreamPipeline"/>
<!-- Caching of stream pipeline:
1.9 +0 -8 xml-cocoon2/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/sitemap.xmap,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sitemap.xmap 2001/05/22 16:21:06 1.8
+++ sitemap.xmap 2001/05/23 09:40:54 1.9
@@ -290,14 +290,6 @@
<map:serialize/>
</map:match>
- <map:match pattern="news/aggregate.xsp">
- <map:generate type="serverpages" src="docs/samples/xsp/aggregate.xsp"/>
- <map:transform src="stylesheets/news/news.xsl">
- <map:parameter name="view-source"
value="docs/samples/xsp/aggregate.xsp"/>
- </map:transform>
- <map:serialize/>
- </map:match>
-
<!-- ================ Static =========================== -->
<map:match pattern="fo">
1.3 +0 -3 xml-cocoon2/webapp/docs/samples/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/docs/samples/samples.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- samples.xml 2001/05/16 14:40:52 1.2
+++ samples.xml 2001/05/23 09:40:55 1.3
@@ -76,9 +76,6 @@
<sample name="Simple XSP" href="xsp/simple">
Simple XSP example.
</sample>
- <sample name="Content Aggregation" href="news/aggregate.xsp">
- Sample for Transparent Content Aggregation.
- </sample>
<sample name="Simple Internationalization" href="i18n/simple.xml">
Sample for Internationalization.
</sample>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
