dims 01/05/03 17:31:30
Modified: src/org/apache/cocoon/components/pipeline Tag: xml-cocoon2
AbstractStreamPipeline.java
CachingStreamPipeline.java
src/org/apache/cocoon/serialization Tag: xml-cocoon2
AbstractSerializer.java LinkSerializer.java
SVGSerializer.java Serializer.java
Log:
Undid my change to Serializer due to giacomo and carsten's -1.
BTW, If anyone needs their Serializer to have access to objectModel, they
can subclass CachingStreamPipeline, overload process method to do exactly
what i just deleted from CVS.
Revision Changes Path
No revision
No revision
1.1.2.9 +1 -7
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/AbstractStreamPipeline.java
Index: AbstractStreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/AbstractStreamPipeline.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- AbstractStreamPipeline.java 2001/05/03 14:09:16 1.1.2.8
+++ AbstractStreamPipeline.java 2001/05/04 00:31:26 1.1.2.9
@@ -35,7 +35,7 @@
* resource
* </UL>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/05/03 14:09:16 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/05/04 00:31:26 $
*/
public abstract class AbstractStreamPipeline extends AbstractLoggable
implements StreamPipeline, Disposable {
protected EventPipeline eventPipeline;
@@ -122,12 +122,6 @@
} else {
if ( !checkPipeline() ) {
throw new ProcessingException("Attempted to process
incomplete pipeline.");
- }
-
- try {
- this.serializer.setup((EntityResolver)
environment,environment.getObjectModel(),serializerSource,serializerParam);
- } catch ( Exception e ) {
- throw new ProcessingException("Error in serializer setup",e);
}
setupPipeline(environment);
1.1.2.11 +1 -7
xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingStreamPipeline.java
Index: CachingStreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/pipeline/Attic/CachingStreamPipeline.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- CachingStreamPipeline.java 2001/05/03 14:09:19 1.1.2.10
+++ CachingStreamPipeline.java 2001/05/04 00:31:26 1.1.2.11
@@ -44,7 +44,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/05/03 14:09:19 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/05/04 00:31:26 $
*/
public final class CachingStreamPipeline extends AbstractStreamPipeline {
@@ -234,12 +234,6 @@
} else {
if ( !this.checkPipeline() ) {
throw new ProcessingException("Attempted to process
incomplete pipeline.");
- }
-
- try {
- this.serializer.setup((EntityResolver)
environment,environment.getObjectModel(),serializerSource,serializerParam);
- } catch ( Exception e ) {
- throw new ProcessingException("Error in serializer setup",e);
}
try {
No revision
No revision
1.1.2.17 +1 -8
xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractSerializer.java
Index: AbstractSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractSerializer.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- AbstractSerializer.java 2001/05/03 14:09:28 1.1.2.16
+++ AbstractSerializer.java 2001/05/04 00:31:27 1.1.2.17
@@ -23,7 +23,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/05/03 14:09:28 $
+ * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/05/04 00:31:27 $
*/
public abstract class AbstractSerializer extends AbstractXMLPipe implements
Serializer, Recyclable {
@@ -32,13 +32,6 @@
* The <code>OutputStream</code> used by this serializer.
*/
protected OutputStream output;
-
- /**
- * Set the <code>EntityResolver</code> the object model <code>Map</code>,
- * the source and sitemap <code>Parameters</code> used to process the
request.
- */
- public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters par)
- throws ProcessingException, SAXException, IOException {}
/**
* Set the <code>OutputStream</code> where the XML should be serialized.
1.1.2.12 +1 -8
xml-cocoon/src/org/apache/cocoon/serialization/Attic/LinkSerializer.java
Index: LinkSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/LinkSerializer.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- LinkSerializer.java 2001/05/03 14:09:33 1.1.2.11
+++ LinkSerializer.java 2001/05/04 00:31:27 1.1.2.12
@@ -23,20 +23,13 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/05/03 14:09:33 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/05/04 00:31:27 $
*/
public class LinkSerializer extends ExtendedXLinkPipe implements Serializer,
Poolable {
private PrintStream out;
- /**
- * Set the <code>EntityResolver</code> the object model <code>Map</code>,
- * the source and sitemap <code>Parameters</code> used to process the
request.
- */
- public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters par)
- throws ProcessingException, SAXException, IOException {}
-
/**
* Set the <code>OutputStream</code> where the requested resource should
* be serialized.
1.1.2.38 +1 -8
xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java
Index: SVGSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java,v
retrieving revision 1.1.2.37
retrieving revision 1.1.2.38
diff -u -r1.1.2.37 -r1.1.2.38
--- SVGSerializer.java 2001/05/03 14:09:35 1.1.2.37
+++ SVGSerializer.java 2001/05/04 00:31:28 1.1.2.38
@@ -47,7 +47,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ross Burton</a>
- * @version CVS $Revision: 1.1.2.37 $ $Date: 2001/05/03 14:09:35 $
+ * @version CVS $Revision: 1.1.2.38 $ $Date: 2001/05/04 00:31:28 $
*/
public class SVGSerializer extends SVGBuilder
implements Composable, Serializer, Configurable, Poolable, Cacheable
{
@@ -70,13 +70,6 @@
Transcoder transcoder = null;
/** The Transcoder Factory to use */
TranscoderFactory factory =
ExtendableTranscoderFactory.getTranscoderFactoryImplementation();
-
- /**
- * Set the <code>EntityResolver</code> the object model <code>Map</code>,
- * the source and sitemap <code>Parameters</code> used to process the
request.
- */
- public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters par)
- throws ProcessingException, SAXException, IOException {}
/**
* Set the <code>OutputStream</code> where the XML should be serialized.
1.1.2.6 +2 -3
xml-cocoon/src/org/apache/cocoon/serialization/Attic/Serializer.java
Index: Serializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/Serializer.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Serializer.java 2001/05/03 14:09:37 1.1.2.5
+++ Serializer.java 2001/05/04 00:31:29 1.1.2.6
@@ -7,7 +7,6 @@
*****************************************************************************/
package org.apache.cocoon.serialization;
-import org.apache.cocoon.sitemap.SitemapModelComponent;
import org.apache.cocoon.sitemap.SitemapOutputComponent;
import org.apache.cocoon.xml.XMLConsumer;
@@ -15,7 +14,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/05/03 14:09:37 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/05/04 00:31:29 $
*/
-public interface Serializer extends XMLConsumer, SitemapOutputComponent,
SitemapModelComponent {
+public interface Serializer extends XMLConsumer, SitemapOutputComponent {
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
