bloritsch 2003/10/22 11:03:08
Modified: src/java/org/apache/cocoon/serialization
AbstractSerializer.java AbstractTextSerializer.java
LinkSerializer.java TextSerializer.java
ZipArchiveSerializer.java
src/java/org/apache/cocoon/reading AbstractReader.java
ResourceReader.java
Log:
Update the serializers and readers to be resettable/serviceable
Revision Changes Path
1.2 +4 -4
cocoon-2.2/src/java/org/apache/cocoon/serialization/AbstractSerializer.java
Index: AbstractSerializer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/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 9 Mar 2003 00:09:36 -0000 1.1
+++ AbstractSerializer.java 22 Oct 2003 18:03:07 -0000 1.2
@@ -73,7 +73,7 @@
* Set the [EMAIL PROTECTED] OutputStream} where the requested resource
should
* be serialized.
*/
- public void setOutputStream(OutputStream out)
+ public void setOutputStream(OutputStream out)
throws IOException {
this.output = out;
}
@@ -90,8 +90,8 @@
/**
* Recycle serializer by removing references
*/
- public void recycle() {
- super.recycle();
+ public void reset() {
+ super.reset();
this.output = null;
}
1.6 +4 -4
cocoon-2.2/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
Index: AbstractTextSerializer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractTextSerializer.java 11 Jun 2003 00:11:15 -0000 1.5
+++ AbstractTextSerializer.java 22 Oct 2003 18:03:07 -0000 1.6
@@ -275,11 +275,11 @@
}
}
- public void recycle() {
- super.recycle();
+ public void reset() {
+ super.reset();
if (this.namespacePipe != null) {
- this.namespacePipe.recycle();
+ this.namespacePipe.reset();
}
}
1.4 +5 -5
cocoon-2.2/src/java/org/apache/cocoon/serialization/LinkSerializer.java
Index: LinkSerializer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/serialization/LinkSerializer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LinkSerializer.java 7 Oct 2003 16:39:47 -0000 1.3
+++ LinkSerializer.java 22 Oct 2003 18:03:07 -0000 1.4
@@ -64,8 +64,8 @@
* @version CVS $Id$
*/
-public class LinkSerializer
- extends ExtendedXLinkPipe
+public class LinkSerializer
+ extends ExtendedXLinkPipe
implements Serializer {
private PrintStream out;
@@ -131,8 +131,8 @@
/**
* Recyclable
*/
- public void recycle() {
- super.recycle();
+ public void reset() {
+ super.reset();
this.out = null;
}
}
1.3 +4 -4
cocoon-2.2/src/java/org/apache/cocoon/serialization/TextSerializer.java
Index: TextSerializer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/serialization/TextSerializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TextSerializer.java 27 Apr 2003 17:57:41 -0000 1.2
+++ TextSerializer.java 22 Oct 2003 18:03:07 -0000 1.3
@@ -108,7 +108,7 @@
this.setContentHandler(handler);
this.setLexicalHandler(handler);
} catch (Exception e) {
- final String message = "Cannot set TextSerializer outputstream";
+ final String message = "Cannot set TextSerializer outputstream";
throw new CascadingIOException(message, e);
}
}
@@ -136,8 +136,8 @@
super.endDocument();
}
- public void recycle() {
- super.recycle();
+ public void reset() {
+ super.reset();
this.hasRootElement = false;
this.hadNoRootElement = false;
}
1.6 +8 -9
cocoon-2.2/src/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java
Index: ZipArchiveSerializer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ZipArchiveSerializer.java 6 Jul 2003 11:35:40 -0000 1.5
+++ ZipArchiveSerializer.java 22 Oct 2003 18:03:07 -0000 1.6
@@ -111,10 +111,10 @@
// TODO (2) : handle more attributes on <entry> for properties of ZipEntry
// (compression method and level, time, comment, etc.)
-public class ZipArchiveSerializer
- extends AbstractSerializer
+public class ZipArchiveSerializer
+ extends AbstractSerializer
implements Composable, Disposable {
-
+
/**
* The namespace for elements handled by this serializer,
* "http://apache.org/cocoon/zip-archive/1.0";.
@@ -412,9 +412,8 @@
}
/**
- * @see org.apache.avalon.excalibur.pool.Recyclable#recycle()
*/
- public void recycle() {
+ public void reset() {
this.exception = null;
if (this.serializer != null) {
this.selector.release(this.serializer);
@@ -422,11 +421,11 @@
if (this.selector != null) {
this.manager.release(this.selector);
}
-
+
this.nsSupport.reset();
- super.recycle();
+ super.reset();
}
-
+
/* (non-Javadoc)
* @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
1.2 +4 -4
cocoon-2.2/src/java/org/apache/cocoon/reading/AbstractReader.java
Index: AbstractReader.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/reading/AbstractReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractReader.java 9 Mar 2003 00:09:35 -0000 1.1
+++ AbstractReader.java 22 Oct 2003 18:03:08 -0000 1.2
@@ -50,11 +50,11 @@
*/
package org.apache.cocoon.reading;
-import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.mpool.Resettable;
import org.xml.sax.SAXException;
import java.io.BufferedOutputStream;
@@ -71,7 +71,7 @@
*/
public abstract class AbstractReader
extends AbstractLogEnabled
- implements Reader, Recyclable {
+ implements Reader, Resettable {
/** The current <code>SourceResolver</code>. */
protected SourceResolver resolver;
@@ -123,7 +123,7 @@
/**
* Recycle the component
*/
- public void recycle() {
+ public void reset() {
this.out = null;
this.resolver = null;
this.source = null;
1.3 +5 -5
cocoon-2.2/src/java/org/apache/cocoon/reading/ResourceReader.java
Index: ResourceReader.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/reading/ResourceReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceReader.java 19 Mar 2003 15:42:17 -0000 1.2
+++ ResourceReader.java 22 Oct 2003 18:03:08 -0000 1.3
@@ -142,12 +142,12 @@
/**
* Recyclable
*/
- public void recycle() {
+ public void reset() {
if (inputSource != null) {
super.resolver.release(inputSource);
inputSource = null;
}
- super.recycle();
+ super.reset();
}
/**
@@ -276,12 +276,12 @@
else {
response.addHeader("Vary", "Host");
}
-
+
long lastModified = getLastModified();
if (lastModified > 0) {
response.setDateHeader("Last-Modified", lastModified);
}
-
+
try {
inputStream = inputSource.getInputStream();
}
