cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/java/org/apache/cocoon/xml AbstractXMLPipe.java AbstractXMLProducer.java
Date Thu, 10 Jan 2002 12:08:28 GMT
cziegeler    02/01/10 04:08:28

  Modified:    src/java/org/apache/cocoon/serialization
                        AbstractSerializer.java AbstractTextSerializer.java
                        FOPSerializer.java HTMLSerializer.java
                        RTFSerializer.java TextSerializer.java
                        XMLSerializer.java
               src/java/org/apache/cocoon/xml AbstractXMLPipe.java
                        AbstractXMLProducer.java
  Log:
  Cleaned up serializer interfaces
  
  Revision  Changes    Path
  1.2       +3 -3      xml-cocoon2/src/java/org/apache/cocoon/serialization/AbstractSerializer.java
  
  Index: AbstractSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/AbstractSerializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractSerializer.java	3 Jan 2002 12:31:19 -0000	1.1
  +++ AbstractSerializer.java	10 Jan 2002 12:08:28 -0000	1.2
  @@ -8,7 +8,6 @@
   
   package org.apache.cocoon.serialization;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.xml.AbstractXMLPipe;
   
   import java.io.OutputStream;
  @@ -17,10 +16,11 @@
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:19 $
  + * @version CVS $Revision: 1.2 $ $Date: 2002/01/10 12:08:28 $
    */
   
  -public abstract class AbstractSerializer extends AbstractXMLPipe implements Serializer,
Recyclable {
  +public abstract class AbstractSerializer
  +extends AbstractXMLPipe implements Serializer {
   
       /**
        * The <code>OutputStream</code> used by this serializer.
  
  
  
  1.3       +4 -3      xml-cocoon2/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
  
  Index: AbstractTextSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractTextSerializer.java	8 Jan 2002 10:47:45 -0000	1.2
  +++ AbstractTextSerializer.java	10 Jan 2002 12:08:28 -0000	1.3
  @@ -8,7 +8,6 @@
   
   package org.apache.cocoon.serialization;
   
  -import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -44,9 +43,11 @@
    *         (Apache Software Foundation, Exoffice Technologies)
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:sylvain.wallez@anyware-tech.com">Sylvain Wallez</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2002/01/08 10:47:45 $
  + * @version CVS $Revision: 1.3 $ $Date: 2002/01/10 12:08:28 $
    */
  -public abstract class AbstractTextSerializer extends AbstractSerializer implements Configurable,
Cacheable, Poolable {
  +public abstract class AbstractTextSerializer
  +extends AbstractSerializer
  +implements Configurable, Cacheable {
   
       /**
        * The trax <code>TransformerFactory</code> used by this serializer.
  
  
  
  1.3       +3 -3      xml-cocoon2/src/java/org/apache/cocoon/serialization/FOPSerializer.java
  
  Index: FOPSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/FOPSerializer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FOPSerializer.java	8 Jan 2002 10:47:45 -0000	1.2
  +++ FOPSerializer.java	10 Jan 2002 12:08:28 -0000	1.3
  @@ -8,7 +8,6 @@
   
   package org.apache.cocoon.serialization;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -25,8 +24,9 @@
   
   import java.io.OutputStream;
   
  -public class FOPSerializer extends AbstractSerializer
  -    implements Recyclable, Configurable, Cacheable {
  +public class FOPSerializer
  +extends AbstractSerializer
  +implements Configurable, Cacheable {
   
       /**
         * The <code>Options</code> used by FOP.
  
  
  
  1.2       +2 -4      xml-cocoon2/src/java/org/apache/cocoon/serialization/HTMLSerializer.java
  
  Index: HTMLSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/HTMLSerializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HTMLSerializer.java	3 Jan 2002 12:31:19 -0000	1.1
  +++ HTMLSerializer.java	10 Jan 2002 12:08:28 -0000	1.2
  @@ -8,8 +8,6 @@
   
   package org.apache.cocoon.serialization;
   
  -import org.apache.avalon.excalibur.pool.Poolable;
  -
   import javax.xml.transform.OutputKeys;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  @@ -17,10 +15,10 @@
   
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:19 $
  + * @version CVS $Revision: 1.2 $ $Date: 2002/01/10 12:08:28 $
    */
   
  -public class HTMLSerializer extends AbstractTextSerializer implements Poolable {
  +public class HTMLSerializer extends AbstractTextSerializer {
   
       private TransformerHandler handler;
   
  
  
  
  1.2       +1 -2      xml-cocoon2/src/java/org/apache/cocoon/serialization/RTFSerializer.java
  
  Index: RTFSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/RTFSerializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RTFSerializer.java	3 Jan 2002 12:31:19 -0000	1.1
  +++ RTFSerializer.java	10 Jan 2002 12:08:28 -0000	1.2
  @@ -9,7 +9,6 @@
   
   import java.net.URL;
   import java.net.MalformedURLException;
  -import org.apache.avalon.excalibur.pool.Poolable;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -41,7 +40,7 @@
    */
   
   public class RTFSerializer extends AbstractTextSerializer
  -  implements Poolable, Composable {
  +  implements Composable {
   
       private Writer rtfWriter = null;
       private Converter handler = null;
  
  
  
  1.2       +2 -4      xml-cocoon2/src/java/org/apache/cocoon/serialization/TextSerializer.java
  
  Index: TextSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/TextSerializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TextSerializer.java	3 Jan 2002 12:31:19 -0000	1.1
  +++ TextSerializer.java	10 Jan 2002 12:08:28 -0000	1.2
  @@ -8,8 +8,6 @@
   
   package org.apache.cocoon.serialization;
   
  -import org.apache.avalon.excalibur.pool.Poolable;
  -
   import javax.xml.transform.OutputKeys;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  @@ -17,10 +15,10 @@
   
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:19 $
  + * @version CVS $Revision: 1.2 $ $Date: 2002/01/10 12:08:28 $
    */
   
  -public class TextSerializer extends AbstractTextSerializer implements Poolable {
  +public class TextSerializer extends AbstractTextSerializer {
   
       private TransformerHandler handler;
   
  
  
  
  1.2       +2 -4      xml-cocoon2/src/java/org/apache/cocoon/serialization/XMLSerializer.java
  
  Index: XMLSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/XMLSerializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLSerializer.java	3 Jan 2002 12:31:19 -0000	1.1
  +++ XMLSerializer.java	10 Jan 2002 12:08:28 -0000	1.2
  @@ -8,8 +8,6 @@
   
   package org.apache.cocoon.serialization;
   
  -import org.apache.avalon.excalibur.pool.Poolable;
  -
   import javax.xml.transform.OutputKeys;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  @@ -17,10 +15,10 @@
   
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:19 $
  + * @version CVS $Revision: 1.2 $ $Date: 2002/01/10 12:08:28 $
    */
   
  -public class XMLSerializer extends AbstractTextSerializer implements Poolable {
  +public class XMLSerializer extends AbstractTextSerializer {
   
       private TransformerHandler handler;
   
  
  
  
  1.3       +2 -3      xml-cocoon2/src/java/org/apache/cocoon/xml/AbstractXMLPipe.java
  
  Index: AbstractXMLPipe.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/AbstractXMLPipe.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractXMLPipe.java	9 Jan 2002 09:24:19 -0000	1.2
  +++ AbstractXMLPipe.java	10 Jan 2002 12:08:28 -0000	1.3
  @@ -8,7 +8,6 @@
   
   package org.apache.cocoon.xml;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
   import org.xml.sax.Attributes;
   import org.xml.sax.Locator;
   import org.xml.sax.SAXException;
  @@ -18,11 +17,11 @@
    * handlers and lexical handlers.
    *
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version CVS $Revision: 1.2 $ $Date: 2002/01/09 09:24:19 $
  + * @version CVS $Revision: 1.3 $ $Date: 2002/01/10 12:08:28 $
    */
   public abstract class AbstractXMLPipe
   extends AbstractXMLProducer
  -implements XMLPipe, Recyclable {
  +implements XMLPipe {
   
       /**
        * Receive an object for locating the origin of SAX document events.
  
  
  
  1.2       +4 -2      xml-cocoon2/src/java/org/apache/cocoon/xml/AbstractXMLProducer.java
  
  Index: AbstractXMLProducer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/AbstractXMLProducer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractXMLProducer.java	3 Jan 2002 12:31:22 -0000	1.1
  +++ AbstractXMLProducer.java	10 Jan 2002 12:08:28 -0000	1.2
  @@ -18,9 +18,11 @@
    *
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    *         (Apache Software Foundation, Exoffice Technologies)
  - * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:22 $
  + * @version CVS $Revision: 1.2 $ $Date: 2002/01/10 12:08:28 $
    */
  -public abstract class AbstractXMLProducer extends AbstractLoggable implements XMLProducer,
Recyclable {
  +public abstract class AbstractXMLProducer
  +extends AbstractLoggable
  +implements XMLProducer, Recyclable {
   
       /** The <code>XMLConsumer</code> receiving SAX events. */
       protected XMLConsumer xmlConsumer;
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message