dims 01/04/24 13:18:27
Modified: src/org/apache/cocoon/components/language/markup/sitemap/java
Tag: xml-cocoon2 sitemap.xsl
src/org/apache/cocoon/components/pipeline Tag: xml-cocoon2
AbstractEventPipeline.java
CachingEventPipeline.java EventPipeline.java
src/org/apache/cocoon/components/saxconnector Tag:
xml-cocoon2 NullSAXConnector.java SAXConnector.java
XIncludeSAXConnector.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
ContentAggregator.java
Log:
Remove my hack for sitemap, will use Berin's sample to get to the Sitemap.
Revision Changes Path
No revision
No revision
1.1.2.105 +1 -3
xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
retrieving revision 1.1.2.104
retrieving revision 1.1.2.105
diff -u -r1.1.2.104 -r1.1.2.105
--- sitemap.xsl 2001/04/24 19:07:38 1.1.2.104
+++ sitemap.xsl 2001/04/24 20:18:23 1.1.2.105
@@ -98,7 +98,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.1.2.104 2001/04/24 19:07:38 dims
Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.1.2.105 2001/04/24 20:18:23 dims
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"/>";
@@ -376,7 +376,6 @@
/* the <code>EventPipeline</code> is used to collect the
xml producing sitemap
components and the <code>StreamPipeline</code> to
produce the requested resource */
EventPipeline eventPipeline =
(EventPipeline)this.manager.lookup(Roles.EVENT_PIPELINE);
- eventPipeline.setSitemap(this);
StreamPipeline pipeline =
(StreamPipeline)this.manager.lookup(Roles.STREAM_PIPELINE);
pipeline.setEventPipeline(eventPipeline);
boolean result = false;
@@ -457,7 +456,6 @@
EventPipeline eventPipeline = null;
try {
eventPipeline =
(EventPipeline)this.manager.lookup(Roles.EVENT_PIPELINE);
- eventPipeline.setSitemap(this);
pipeline =
(StreamPipeline)this.manager.lookup(Roles.STREAM_PIPELINE);
pipeline.setEventPipeline(eventPipeline);
List listOfMaps = (List)(new ArrayList());
No revision
No revision
1.1.2.7 +1 -7
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/AbstractEventPipeline.java
Index: AbstractEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/AbstractEventPipeline.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- AbstractEventPipeline.java 2001/04/24 19:07:40 1.1.2.6
+++ AbstractEventPipeline.java 2001/04/24 20:18:24 1.1.2.7
@@ -39,7 +39,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED] Ziegeler">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/04/24 19:07:40 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/04/24 20:18:24 $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
@@ -68,10 +68,6 @@
transformerSelector =
(ComponentSelector)this.manager.lookup(Roles.TRANSFORMERS);
}
- public void setSitemap(Sitemap sitemap) {
- this.sitemap = sitemap;
- }
-
public void setGenerator (String role, String source, Parameters param,
Exception e)
throws Exception {
this.setGenerator (role, source, param);
@@ -198,7 +194,6 @@
// connect SAXConnector
SAXConnector connect = (SAXConnector)
this.manager.lookup(Roles.SAX_CONNECTOR);
connect.setup((EntityResolver)environment,environment.getObjectModel(),null,null);
- connect.setSitemap(sitemap);
this.connectors.add(connect);
next = (XMLConsumer) connect;
prev.setConsumer(next);
@@ -214,7 +209,6 @@
// insert SAXConnector
SAXConnector connect = (SAXConnector)
this.manager.lookup(Roles.SAX_CONNECTOR);
connect.setup((EntityResolver)environment,environment.getObjectModel(),null,null);
- connect.setSitemap(sitemap);
this.connectors.add(connect);
next = (XMLConsumer) connect;
prev.setConsumer(next);
1.1.2.9 +1 -3
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingEventPipeline.java
Index: CachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingEventPipeline.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- CachingEventPipeline.java 2001/04/24 19:07:41 1.1.2.8
+++ CachingEventPipeline.java 2001/04/24 20:18:24 1.1.2.9
@@ -56,7 +56,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.1.2.8 $ $Date: 2001/04/24 19:07:41 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/04/24 20:18:24 $
*/
public final class CachingEventPipeline
extends AbstractEventPipeline
@@ -315,7 +315,6 @@
// connect SAXConnector
SAXConnector connect = (SAXConnector)
this.manager.lookup(Roles.SAX_CONNECTOR);
connect.setup((EntityResolver)environment,environment.getObjectModel(),null,null);
- connect.setSitemap(sitemap);
this.connectors.add(connect);
next = (XMLConsumer) connect;
prev.setConsumer(next);
@@ -336,7 +335,6 @@
// insert SAXConnector
SAXConnector connect = (SAXConnector)
this.manager.lookup(Roles.SAX_CONNECTOR);
connect.setup((EntityResolver)environment,environment.getObjectModel(),null,null);
- connect.setSitemap(sitemap);
this.connectors.add(connect);
next = (XMLConsumer) connect;
prev.setConsumer(next);
1.1.2.5 +1 -2
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/EventPipeline.java
Index: EventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/EventPipeline.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- EventPipeline.java 2001/04/24 19:07:41 1.1.2.4
+++ EventPipeline.java 2001/04/24 20:18:24 1.1.2.5
@@ -20,7 +20,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/24 19:07:41 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/24 20:18:24 $
*/
public interface EventPipeline extends Component, Composable, Recyclable,
Processor {
public void setGenerator (String role, String source, Parameters param,
Exception e) throws Exception;
@@ -28,5 +28,4 @@
public Generator getGenerator ();
public void addTransformer (String role, String source, Parameters
param) throws Exception;
public boolean process(Environment environment) throws Exception;
- public void setSitemap(Sitemap sitemap);
}
No revision
No revision
1.1.2.5 +1 -5
xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/NullSAXConnector.java
Index: NullSAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/NullSAXConnector.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- NullSAXConnector.java 2001/04/24 19:07:43 1.1.2.4
+++ NullSAXConnector.java 2001/04/24 20:18:25 1.1.2.5
@@ -18,7 +18,7 @@
/**
* 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.1.2.4 $ $Date: 2001/04/24 19:07:43 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/24 20:18:25 $
*/
public class NullSAXConnector extends AbstractXMLPipe implements Poolable,
SAXConnector {
@@ -26,10 +26,6 @@
*/
public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters params)
throws ProcessingException, SAXException, IOException {
- // do nothing.
- }
-
- public void setSitemap(Sitemap sitemap) {
// do nothing.
}
}
1.1.2.5 +1 -2
xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/SAXConnector.java
Index: SAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/SAXConnector.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SAXConnector.java 2001/04/24 19:07:44 1.1.2.4
+++ SAXConnector.java 2001/04/24 20:18:25 1.1.2.5
@@ -11,8 +11,7 @@
/**
* Provides a connection between SAX components.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/04/24 19:07:44 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/04/24 20:18:25 $
*/
public interface SAXConnector extends XMLPipe, Component,
SitemapModelComponent {
- public void setSitemap(Sitemap sitemap);
}
1.1.2.3 +1 -5
xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/XIncludeSAXConnector.java
Index: XIncludeSAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/saxconnector/Attic/XIncludeSAXConnector.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- XIncludeSAXConnector.java 2001/04/24 19:07:44 1.1.2.2
+++ XIncludeSAXConnector.java 2001/04/24 20:18:26 1.1.2.3
@@ -38,7 +38,7 @@
/**
* Copy of code from XIncludeTransformer as a starting point for
XIncludeSAXConnector.
* @author <a href="[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/04/24 19:07:44 $
+ * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/04/24 20:18:26 $
*/
public class XIncludeSAXConnector extends AbstractXMLPipe implements
Composable, Poolable, SAXConnector, Disposable {
@@ -87,10 +87,6 @@
} catch (Exception e) {
getLogger().error("cannot obtain URLFactory", e);
}
- }
-
- public void setSitemap(Sitemap sitemap) {
- this.sitemap = sitemap;
}
public void startElement(String uri, String name, String raw, Attributes
attr) throws SAXException {
No revision
No revision
1.1.2.6 +1 -2
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ContentAggregator.java
Index: ContentAggregator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ContentAggregator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ContentAggregator.java 2001/04/24 19:07:47 1.1.2.5
+++ ContentAggregator.java 2001/04/24 20:18:27 1.1.2.6
@@ -41,7 +41,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Id: ContentAggregator.java,v 1.1.2.5 2001/04/24 19:07:47
dims Exp $
+ * @version CVS $Id: ContentAggregator.java,v 1.1.2.6 2001/04/24 20:18:27
dims Exp $
*/
public class ContentAggregator extends ContentHandlerWrapper
@@ -157,7 +157,6 @@
+ (String)this.partURIs.get(i));
try {
eventPipeline =
(EventPipeline)this.manager.lookup(Roles.EVENT_PIPELINE);
- eventPipeline.setSitemap(this.sitemap);
this.partEventPipelines.add(eventPipeline);
pipeline =
(StreamPipeline)this.manager.lookup(Roles.STREAM_PIPELINE);
} catch (ComponentException cme) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
