You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/12/06 22:22:11 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/servlet/multipart MultipartHttpServletRequest.java
cziegeler 2003/12/06 13:22:10
Modified: src/java/org/apache/cocoon/transformation
WriteDOMSessionTransformer.java LogTransformer.java
AbstractExtractionTransformer.java
AugmentTransformer.java JPathTransformer.java
AbstractDOMTransformer.java
SimpleFormTransformer.java TraxTransformer.java
I18nTransformer.java AbstractSAXTransformer.java
RoleFilterTransformer.java
ServiceableTransformer.java
XIncludeTransformer.java CIncludeTransformer.java
EncodeURLTransformer.java
SimpleFormInstanceExtractionTransformer.java
src/java/org/apache/cocoon/generation ServletGenerator.java
AbstractGenerator.java XPathDirectoryGenerator.java
ServerPagesGenerator.java LinkStatusGenerator.java
JXTemplateGenerator.java FileGenerator.java
StreamGenerator.java DirectoryGenerator.java
src/java/org/apache/cocoon/sitemap ContentAggregator.java
NotifyingGenerator.java
src/java/org/apache/cocoon/serialization LinkSerializer.java
ZipArchiveSerializer.java TextSerializer.java
AbstractSerializer.java AbstractTextSerializer.java
src/java/org/apache/cocoon/transformation/pagination
Paginator.java
src/java/org/apache/cocoon/xml/dom DOMBuilder.java
DOMStreamer.java
src/java/org/apache/cocoon/components/language/markup/xsp
XSPGenerator.java JSGenerator.java
src/java/org/apache/cocoon/components/crawler
SimpleCocoonCrawlerImpl.java
src/java/org/apache/cocoon/xml ContentHandlerWrapper.java
AbstractXMLProducer.java
src/java/org/apache/cocoon/i18n
XMLResourceBundleFactory.java
src/java/org/apache/cocoon/components/pipeline/impl
CachingPointProcessingPipeline.java
AbstractCachingProcessingPipeline.java
BaseCachingProcessingPipeline.java
src/java/org/apache/cocoon/reading AbstractReader.java
ResourceReader.java
src/java/org/apache/cocoon/environment/http
HttpEnvironment.java
src/java/org/apache/cocoon/components/language/markup
CocoonMarkupLanguage.java
AbstractMarkupLanguage.java
src/java/org/apache/cocoon/components/language/programming/java
AbstractJavaCompiler.java
src/java/org/apache/cocoon/components/sax
XMLByteStreamInterpreter.java
XMLByteStreamCompiler.java
src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
src/java/org/apache/cocoon Processor.java
src/java/org/apache/cocoon/servlet/multipart
MultipartHttpServletRequest.java
Log:
Back to good old Recyclable - no we are a little bit more compatible again :)
Revision Changes Path
1.4 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
Index: WriteDOMSessionTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WriteDOMSessionTransformer.java 22 Oct 2003 18:07:15 -0000 1.3
+++ WriteDOMSessionTransformer.java 6 Dec 2003 21:22:07 -0000 1.4
@@ -102,8 +102,8 @@
/**
* Recyclable
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.session = null;
this.builder = null;
this.buildDom = false;
1.5 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/transformation/LogTransformer.java
Index: LogTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/LogTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LogTransformer.java 24 Oct 2003 12:50:08 -0000 1.4
+++ LogTransformer.java 6 Dec 2003 21:22:07 -0000 1.5
@@ -140,8 +140,8 @@
/**
* Recycle
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
try {
if (this.logfile != null) logfile.close();
} catch (Exception e) {
1.4 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/transformation/AbstractExtractionTransformer.java
Index: AbstractExtractionTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/AbstractExtractionTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractExtractionTransformer.java 23 Oct 2003 08:09:32 -0000 1.3
+++ AbstractExtractionTransformer.java 6 Dec 2003 21:22:07 -0000 1.4
@@ -90,8 +90,8 @@
prefixMap = new HashMap();
}
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.extractLevel = 0;
this.currentBuilder = null;
this.prefixMap = null;
1.6 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/transformation/AugmentTransformer.java
Index: AugmentTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/AugmentTransformer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AugmentTransformer.java 22 Oct 2003 18:07:15 -0000 1.5
+++ AugmentTransformer.java 6 Dec 2003 21:22:07 -0000 1.6
@@ -114,10 +114,10 @@
/**
* Recyclable
*/
- public void reset() {
+ public void recycle() {
this.objectModel = null;
this.request = null;
this.baseURI = null;
- super.reset();
+ super.recycle();
}
}
1.6 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/transformation/JPathTransformer.java
Index: JPathTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/JPathTransformer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JPathTransformer.java 22 Oct 2003 18:07:15 -0000 1.5
+++ JPathTransformer.java 6 Dec 2003 21:22:07 -0000 1.6
@@ -395,8 +395,8 @@
/**
* Release all held resources.
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
m_cache.clear();
m_kont = null;
1.3 +5 -5 cocoon-2.2/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java
Index: AbstractDOMTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractDOMTransformer.java 22 Oct 2003 18:07:15 -0000 1.2
+++ AbstractDOMTransformer.java 6 Dec 2003 21:22:07 -0000 1.3
@@ -50,6 +50,7 @@
*/
package org.apache.cocoon.transformation;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
@@ -59,7 +60,6 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.dom.DOMBuilder;
import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.excalibur.mpool.Resettable;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -82,7 +82,7 @@
* @version CVS $Id$
*/
public abstract class AbstractDOMTransformer extends AbstractTransformer
- implements Transformer, DOMBuilder.Listener, Composable, Disposable, Resettable {
+ implements Transformer, DOMBuilder.Listener, Composable, Disposable, Recyclable {
/**
* The SAX entity resolver
@@ -147,12 +147,12 @@
/**
* Recycle the component.
*/
- public void reset() {
+ public void recycle() {
this.resolver = null;
this.source = null;
this.objectModel = null;
this.parameters = null;
- this.builder.reset();
+ this.builder.recycle();
}
/**
1.8 +6 -6 cocoon-2.2/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
Index: SimpleFormTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SimpleFormTransformer.java 22 Oct 2003 18:07:15 -0000 1.7
+++ SimpleFormTransformer.java 6 Dec 2003 21:22:07 -0000 1.8
@@ -50,6 +50,7 @@
*/
package org.apache.cocoon.transformation;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -63,7 +64,6 @@
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.HashMap;
import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.apache.excalibur.mpool.Resettable;
import org.w3c.dom.DocumentFragment;
import org.xml.sax.Attributes;
@@ -175,7 +175,7 @@
* @author <a href="mailto:haul@apache.org">Christian Haul</a>
* @version CVS $Id$
*/
-public class SimpleFormTransformer extends AbstractSAXTransformer implements Resettable {
+public class SimpleFormTransformer extends AbstractSAXTransformer implements Recyclable {
/** strip numbers from repeated element name attributes */
private boolean stripNumber = true;
@@ -352,8 +352,8 @@
}
/** set per instance variables to defaults */
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.skipChildrenOnly = false;
this.values = null;
this.validationResults = null;
@@ -421,7 +421,7 @@
public void setup(SourceResolver resolver, Map objectModel, String src, Parameters par)
throws ProcessingException, SAXException, IOException {
- this.reset();
+ this.recycle();
super.setup(resolver, objectModel, src, par);
1.11 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TraxTransformer.java 29 Oct 2003 18:58:06 -0000 1.10
+++ TraxTransformer.java 6 Dec 2003 21:22:07 -0000 1.11
@@ -538,7 +538,7 @@
/**
* Recyclable
*/
- public void reset() {
+ public void recycle() {
this.objectModel = null;
if (this.inputSource != null) {
this.resolver.release(this.inputSource);
@@ -568,7 +568,7 @@
this.transformerHandler = null;
this.transformerValidity = null;
this.exceptionDuringSetConsumer = null;
- super.reset();
+ super.recycle();
}
/**
1.16 +3 -5 cocoon-2.2/src/java/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- I18nTransformer.java 27 Nov 2003 03:41:10 -0000 1.15
+++ I18nTransformer.java 6 Dec 2003 21:22:07 -0000 1.16
@@ -54,7 +54,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.service.ServiceManager;
@@ -68,7 +67,6 @@
import org.apache.cocoon.i18n.BundleFactory;
import org.apache.cocoon.i18n.I18nUtils;
import org.apache.cocoon.transformation.helpers.MirrorRecorder;
-import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceValidity;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -2082,7 +2080,7 @@
return new MirrorRecorder(value);
}
- public void reset() {
+ public void recycle() {
// restore untranslated-text if necessary
if (globalUntranslated != null) {
untranslated = globalUntranslated;
@@ -2103,7 +2101,7 @@
sourceResolver = null;
objectModel = null;
- super.reset();
+ super.recycle();
}
public void dispose() {
1.9 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
Index: AbstractSAXTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractSAXTransformer.java 23 Oct 2003 07:49:58 -0000 1.8
+++ AbstractSAXTransformer.java 6 Dec 2003 21:22:07 -0000 1.9
@@ -259,8 +259,8 @@
/**
* Recycle this component.
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.objectModel = null;
this.request = null;
this.response = null;
1.5 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/transformation/RoleFilterTransformer.java
Index: RoleFilterTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/RoleFilterTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RoleFilterTransformer.java 22 Oct 2003 18:07:15 -0000 1.4
+++ RoleFilterTransformer.java 6 Dec 2003 21:22:07 -0000 1.5
@@ -180,8 +180,8 @@
return attr;
}
- public void reset() {
+ public void recycle() {
this.request = null;
- super.reset();
+ super.recycle();
}
}
1.3 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/transformation/ServiceableTransformer.java
Index: ServiceableTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/ServiceableTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServiceableTransformer.java 22 Oct 2003 18:07:15 -0000 1.2
+++ ServiceableTransformer.java 6 Dec 2003 21:22:07 -0000 1.3
@@ -101,8 +101,8 @@
/**
* Recycle the generator by removing references
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.resolver = null;
this.objectModel = null;
this.source = null;
1.12 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XIncludeTransformer.java 22 Oct 2003 18:07:15 -0000 1.11
+++ XIncludeTransformer.java 6 Dec 2003 21:22:07 -0000 1.12
@@ -126,12 +126,12 @@
this.manager = manager;
}
- public void reset()
+ public void recycle()
{
// Reset all variables to initial state.
this.resolver = null;
this.xIncludePipe = null;
- super.reset();
+ super.recycle();
}
/**
1.11 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
Index: CIncludeTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CIncludeTransformer.java 23 Oct 2003 08:27:46 -0000 1.10
+++ CIncludeTransformer.java 6 Dec 2003 21:22:07 -0000 1.11
@@ -262,7 +262,7 @@
/**
* Recycle the component
*/
- public void reset() {
+ public void recycle() {
if ( null != this.cachingSession ) {
this.cacheManager.terminateSession( this.cachingSession );
}
@@ -271,7 +271,7 @@
this.manager.release( this.recorder );
this.recorder = null;
}
- super.reset();
+ super.recycle();
this.configurationParameters = null;
this.resourceParameters = null;
if (this.getLogger().isErrorEnabled()) {
1.7 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
Index: EncodeURLTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EncodeURLTransformer.java 22 Oct 2003 18:07:15 -0000 1.6
+++ EncodeURLTransformer.java 6 Dec 2003 21:22:07 -0000 1.7
@@ -235,8 +235,8 @@
/**
* Recycle resources of this transformer
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.response = null;
this.session = null;
this.elementAttributeMatching = null;
1.4 +5 -5 cocoon-2.2/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java
Index: SimpleFormInstanceExtractionTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleFormInstanceExtractionTransformer.java 27 Oct 2003 21:36:50 -0000 1.3
+++ SimpleFormInstanceExtractionTransformer.java 6 Dec 2003 21:22:07 -0000 1.4
@@ -53,6 +53,7 @@
import java.io.IOException;
import java.util.Map;
+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;
@@ -66,7 +67,6 @@
import org.apache.cocoon.components.modules.output.OutputModule;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.xml.dom.DocumentWrapper;
-import org.apache.excalibur.mpool.Resettable;
import org.w3c.dom.Document;
import org.xml.sax.Attributes;
@@ -88,7 +88,7 @@
* @version CVS $Id$
*/
public class SimpleFormInstanceExtractionTransformer extends AbstractExtractionTransformer
- implements Configurable, Serviceable, Resettable {
+ implements Configurable, Serviceable, Recyclable {
protected class ElementData {
public String uri = null;
@@ -161,8 +161,8 @@
this.objectModel = objectModel;
}
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.instanceName = null;
}
1.6 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/generation/ServletGenerator.java
Index: ServletGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/ServletGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServletGenerator.java 27 Oct 2003 07:29:31 -0000 1.5
+++ ServletGenerator.java 6 Dec 2003 21:22:08 -0000 1.6
@@ -85,8 +85,8 @@
/**
* Recycle the generator by removing references
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.request = null;
this.response = null;
this.context = null;
1.5 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/generation/AbstractGenerator.java
Index: AbstractGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/AbstractGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractGenerator.java 27 Oct 2003 07:29:31 -0000 1.4
+++ AbstractGenerator.java 6 Dec 2003 21:22:08 -0000 1.5
@@ -96,8 +96,8 @@
/**
* Recycle the generator by removing references
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.resolver = null;
this.objectModel = null;
this.source = null;
1.6 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
Index: XPathDirectoryGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathDirectoryGenerator.java 22 Oct 2003 18:02:29 -0000 1.5
+++ XPathDirectoryGenerator.java 6 Dec 2003 21:22:08 -0000 1.6
@@ -243,11 +243,11 @@
/**
* Recycle resources
*/
- public void reset() {
+ public void recycle() {
this.xpath = null;
this.doc = null;
//this.parser = null;
//this.processor = null;
- super.reset();
+ super.recycle();
}
}
1.8 +6 -6 cocoon-2.2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServerPagesGenerator.java 27 Oct 2003 07:29:31 -0000 1.7
+++ ServerPagesGenerator.java 6 Dec 2003 21:22:08 -0000 1.8
@@ -287,7 +287,7 @@
/**
* Recycle the generator by removing references
*/
- public void reset() {
+ public void recycle() {
if (this.generator != null) {
this.programGenerator.release(this.generator);
this.generator = null;
@@ -297,10 +297,10 @@
this.inputSource = null;
}
if (this.completionPipe != null) {
- this.completionPipe.reset();
+ this.completionPipe.recycle();
this.completionPipe = null;
}
- super.reset();
+ super.recycle();
}
/**
@@ -472,9 +472,9 @@
}
}
- public void reset() {
+ public void recycle() {
this.eventStack.clear();
- super.reset();
+ super.recycle();
}
}
}
1.7 +5 -5 cocoon-2.2/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java
Index: LinkStatusGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LinkStatusGenerator.java 27 Oct 2003 07:29:31 -0000 1.6
+++ LinkStatusGenerator.java 6 Dec 2003 21:22:08 -0000 1.7
@@ -63,6 +63,7 @@
import java.util.List;
import java.util.Map;
+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;
@@ -72,7 +73,6 @@
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.Tokenizer;
-import org.apache.excalibur.mpool.Resettable;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
import org.xml.sax.SAXException;
@@ -86,7 +86,7 @@
* @author Bernhard Huber (huber@apache.org)
* @version CVS $Id$
*/
-public class LinkStatusGenerator extends ServiceableGenerator implements Resettable, Configurable {
+public class LinkStatusGenerator extends ServiceableGenerator implements Recyclable, Configurable {
/** The URI of the namespace of this generator. */
protected static final String URI =
"http://apache.org/cocoon/linkstatus/2.0";
@@ -678,8 +678,8 @@
return false;
}
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.attributes = null;
//this.excludeCrawlingURL = null;
1.18 +5 -5 cocoon-2.2/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Index: JXTemplateGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JXTemplateGenerator.java 9 Nov 2003 19:55:51 -0000 1.17
+++ JXTemplateGenerator.java 6 Dec 2003 21:22:08 -0000 1.18
@@ -2590,8 +2590,8 @@
TemplateConsumer templateConsumer;
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
templateConsumer = null;
}
@@ -2627,7 +2627,7 @@
/* (non-Javadoc)
* @see org.apache.avalon.excalibur.pool.Recyclable#recycle()
*/
- public void reset() {
+ public void recycle() {
if ( this.resolver != null) {
this.resolver.release(this.inputSource);
}
@@ -2636,7 +2636,7 @@
this.globalJexlContext = null;
this.variables = null;
this.definitions = null;
- super.reset();
+ super.recycle();
}
/* (non-Javadoc)
1.8 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/generation/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/FileGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FileGenerator.java 27 Oct 2003 07:29:31 -0000 1.7
+++ FileGenerator.java 6 Dec 2003 21:22:08 -0000 1.8
@@ -84,12 +84,12 @@
* Recycle this component.
* All instance variables are set to <code>null</code>.
*/
- public void reset() {
+ public void recycle() {
if (null != this.inputSource) {
super.resolver.release(this.inputSource);
this.inputSource = null;
}
- super.reset();
+ super.recycle();
}
/**
1.8 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/generation/StreamGenerator.java
Index: StreamGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/StreamGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StreamGenerator.java 27 Oct 2003 07:29:31 -0000 1.7
+++ StreamGenerator.java 6 Dec 2003 21:22:08 -0000 1.8
@@ -103,8 +103,8 @@
* Recycle this component.
* All instance variables are set to <code>null</code>.
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.inputSource = null;
}
1.13 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/generation/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/DirectoryGenerator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DirectoryGenerator.java 27 Oct 2003 07:38:10 -0000 1.12
+++ DirectoryGenerator.java 6 Dec 2003 21:22:08 -0000 1.13
@@ -548,7 +548,7 @@
/**
* Recycle resources
*/
- public void reset() {
+ public void recycle() {
this.cacheKeyParList = null;
this.attributes = null;
this.dateFormatter = null;
@@ -556,7 +556,7 @@
this.includeRE = null;
this.excludeRE = null;
this.validity = null;
- super.reset();
+ super.recycle();
}
/** Specific validity class, that holds all files that have been generated */
1.7 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java
Index: ContentAggregator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContentAggregator.java 24 Oct 2003 13:45:10 -0000 1.6
+++ ContentAggregator.java 6 Dec 2003 21:22:08 -0000 1.7
@@ -290,8 +290,8 @@
/**
* Recycle the producer by removing references
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.rootElement = null;
for(int i=0; i<this.parts.size();i++) {
final Part current = (Part)this.parts.get(i);
1.4 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/sitemap/NotifyingGenerator.java
Index: NotifyingGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/NotifyingGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NotifyingGenerator.java 22 Oct 2003 18:08:10 -0000 1.3
+++ NotifyingGenerator.java 6 Dec 2003 21:22:08 -0000 1.4
@@ -103,8 +103,8 @@
/**
* Recycle
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.notification = null;
}
}
1.5 +3 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LinkSerializer.java 22 Oct 2003 18:03:07 -0000 1.4
+++ LinkSerializer.java 6 Dec 2003 21:22:09 -0000 1.5
@@ -131,8 +131,8 @@
/**
* Recyclable
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.out = null;
}
}
1.7 +3 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ZipArchiveSerializer.java 22 Oct 2003 18:03:07 -0000 1.6
+++ ZipArchiveSerializer.java 6 Dec 2003 21:22:09 -0000 1.7
@@ -413,7 +413,7 @@
/**
*/
- public void reset() {
+ public void recycle() {
this.exception = null;
if (this.serializer != null) {
this.selector.release(this.serializer);
@@ -423,7 +423,7 @@
}
this.nsSupport.reset();
- super.reset();
+ super.recycle();
}
/* (non-Javadoc)
1.4 +3 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TextSerializer.java 22 Oct 2003 18:03:07 -0000 1.3
+++ TextSerializer.java 6 Dec 2003 21:22:09 -0000 1.4
@@ -136,8 +136,8 @@
super.endDocument();
}
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.hasRootElement = false;
this.hadNoRootElement = false;
}
1.3 +3 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractSerializer.java 22 Oct 2003 18:03:07 -0000 1.2
+++ AbstractSerializer.java 6 Dec 2003 21:22:09 -0000 1.3
@@ -90,8 +90,8 @@
/**
* Recycle serializer by removing references
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.output = null;
}
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractTextSerializer.java 22 Oct 2003 18:03:07 -0000 1.6
+++ AbstractTextSerializer.java 6 Dec 2003 21:22:09 -0000 1.7
@@ -275,11 +275,11 @@
}
}
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
if (this.namespacePipe != null) {
- this.namespacePipe.reset();
+ this.namespacePipe.recycle();
}
}
1.5 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/transformation/pagination/Paginator.java
Index: Paginator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/pagination/Paginator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Paginator.java 22 Oct 2003 18:07:15 -0000 1.4
+++ Paginator.java 6 Dec 2003 21:22:09 -0000 1.5
@@ -202,13 +202,13 @@
}
}
- public void reset() {
+ public void recycle() {
if (null != this.inputSource) {
this.resolver.release(this.inputSource);
this.inputSource = null;
}
this.resolver = null;
- super.reset();
+ super.recycle();
}
/**
1.3 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/xml/dom/DOMBuilder.java
Index: DOMBuilder.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/xml/dom/DOMBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DOMBuilder.java 22 Oct 2003 18:04:22 -0000 1.2
+++ DOMBuilder.java 6 Dec 2003 21:22:09 -0000 1.3
@@ -154,8 +154,8 @@
/**
* Recycling
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
try {
TransformerHandler handler = factory.newTransformerHandler();
1.14 +6 -6 cocoon-2.2/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java
Index: DOMStreamer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DOMStreamer.java 22 Oct 2003 18:04:22 -0000 1.13
+++ DOMStreamer.java 6 Dec 2003 21:22:09 -0000 1.14
@@ -184,9 +184,9 @@
this.normalizeNamespaces = normalizeNamespaces;
}
- public void reset() {
- defaultDOMStreamer.reset();
- namespaceNormalizingDOMStreamer.reset();
+ public void recycle() {
+ defaultDOMStreamer.recycle();
+ namespaceNormalizingDOMStreamer.recycle();
normalizeNamespaces = DEFAULT_NORMALIZE_NAMESPACES;
}
@@ -220,8 +220,8 @@
/** Counter used when generating new namespace prefixes. */
protected int newPrefixCounter = 0;
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
currentElementInfo = null;
newPrefixCounter = 0;
}
1.3 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java
Index: XSPGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSPGenerator.java 22 Oct 2003 18:13:36 -0000 1.2
+++ XSPGenerator.java 6 Dec 2003 21:22:09 -0000 1.3
@@ -50,6 +50,7 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -57,7 +58,6 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.generation.AbstractServerPage;
-import org.apache.excalibur.mpool.Resettable;
import org.xml.sax.SAXException;
/**
@@ -66,7 +66,7 @@
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
* @version CVS $Id$
*/
-public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent, Contextualizable, Resettable {
+public abstract class XSPGenerator extends AbstractServerPage implements CompiledComponent, Contextualizable, Recyclable {
protected Context avalonContext = null;
/** Contextualize this class */
1.3 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/JSGenerator.java
Index: JSGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/JSGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JSGenerator.java 22 Oct 2003 18:13:36 -0000 1.2
+++ JSGenerator.java 6 Dec 2003 21:22:09 -0000 1.3
@@ -194,7 +194,7 @@
}
}
- public void reset() {
+ public void recycle() {
global.delete("contentHandler");
global.delete("objectModel");
@@ -204,7 +204,7 @@
global.delete("resolver");
global.delete("parameters");
- super.reset();
+ super.recycle();
}
public void dispose() {
1.4 +5 -5 cocoon-2.2/src/java/org/apache/cocoon/components/crawler/SimpleCocoonCrawlerImpl.java
Index: SimpleCocoonCrawlerImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/crawler/SimpleCocoonCrawlerImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleCocoonCrawlerImpl.java 22 Oct 2003 22:04:25 -0000 1.3
+++ SimpleCocoonCrawlerImpl.java 6 Dec 2003 21:22:09 -0000 1.4
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.crawler;
-import org.apache.excalibur.mpool.Resettable;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -84,7 +84,7 @@
* @x-avalon.info name="cocoon-crawler"
*/
public class SimpleCocoonCrawlerImpl extends AbstractLogEnabled
- implements CocoonCrawler, Configurable, Disposable, Resettable {
+ implements CocoonCrawler, Configurable, Disposable, Recyclable {
/**
* Config element name specifying expected link content-typ.
@@ -315,7 +315,7 @@
/**
* recylcle this object, relasing resources
*/
- public void reset() {
+ public void recycle() {
crawled = null;
urlsToProcess = null;
urlsNextDepth = null;
1.3 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/xml/ContentHandlerWrapper.java
Index: ContentHandlerWrapper.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/xml/ContentHandlerWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContentHandlerWrapper.java 22 Oct 2003 18:04:23 -0000 1.2
+++ ContentHandlerWrapper.java 6 Dec 2003 21:22:09 -0000 1.3
@@ -50,12 +50,12 @@
*/
package org.apache.cocoon.xml;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
-import org.apache.excalibur.mpool.Resettable;
/**
* This class is an utility class "wrapping" around a SAX version 2.0
@@ -67,7 +67,7 @@
* (Apache Software Foundation, Computer Associates)
* @version CVS $Id$
*/
-public class ContentHandlerWrapper extends AbstractXMLConsumer implements Resettable {
+public class ContentHandlerWrapper extends AbstractXMLConsumer implements Recyclable {
/** The current <code>ContentHandler</code>. */
protected ContentHandler contentHandler;
@@ -124,7 +124,7 @@
this.lexicalHandler=lexicalHandler;
}
- public void reset () {
+ public void recycle () {
this.contentHandler = null;
this.lexicalHandler = null;
}
1.3 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/xml/AbstractXMLProducer.java
Index: AbstractXMLProducer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/xml/AbstractXMLProducer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractXMLProducer.java 22 Oct 2003 18:04:23 -0000 1.2
+++ AbstractXMLProducer.java 6 Dec 2003 21:22:09 -0000 1.3
@@ -50,8 +50,8 @@
*/
package org.apache.cocoon.xml;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.excalibur.mpool.Resettable;
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
@@ -65,7 +65,7 @@
*/
public abstract class AbstractXMLProducer
extends AbstractLogEnabled
-implements XMLProducer, Resettable {
+implements XMLProducer, Recyclable {
/** The <code>XMLConsumer</code> receiving SAX events. */
protected XMLConsumer xmlConsumer;
@@ -115,7 +115,7 @@
/**
* Recycle the producer by removing references
*/
- public void reset() {
+ public void recycle() {
this.xmlConsumer = null;
this.contentHandler = null;
this.lexicalHandler = null;
1.6 +1 -2 cocoon-2.2/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
Index: XMLResourceBundleFactory.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLResourceBundleFactory.java 27 Nov 2003 02:55:50 -0000 1.5
+++ XMLResourceBundleFactory.java 6 Dec 2003 21:22:09 -0000 1.6
@@ -51,7 +51,6 @@
package org.apache.cocoon.i18n;
import java.io.FileNotFoundException;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
1.6 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java
Index: CachingPointProcessingPipeline.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CachingPointProcessingPipeline.java 27 Oct 2003 08:09:36 -0000 1.5
+++ CachingPointProcessingPipeline.java 6 Dec 2003 21:22:09 -0000 1.6
@@ -434,8 +434,8 @@
/**
* Recyclable Interface
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
Iterator itt = this.xmlSerializerArray.iterator();
while (itt.hasNext()) {
1.17 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
Index: AbstractCachingProcessingPipeline.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AbstractCachingProcessingPipeline.java 27 Oct 2003 08:09:36 -0000 1.16
+++ AbstractCachingProcessingPipeline.java 6 Dec 2003 21:22:09 -0000 1.17
@@ -896,7 +896,7 @@
/**
* Recyclable Interface
*/
- public void reset() {
+ public void recycle() {
this.generatorRole = null;
this.transformerRoles.clear();
@@ -909,7 +909,7 @@
this.toCacheKey = null;
this.toCacheSourceValidities = null;
- super.reset();
+ super.recycle();
}
}
1.3 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/impl/BaseCachingProcessingPipeline.java
Index: BaseCachingProcessingPipeline.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/impl/BaseCachingProcessingPipeline.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseCachingProcessingPipeline.java 27 Oct 2003 08:09:36 -0000 1.2
+++ BaseCachingProcessingPipeline.java 6 Dec 2003 21:22:10 -0000 1.3
@@ -102,14 +102,14 @@
/**
* Recyclable Interface
*/
- public void reset() {
+ public void recycle() {
this.manager.release( this.xmlDeserializer );
this.xmlDeserializer = null;
this.manager.release( this.xmlSerializer );
this.xmlSerializer = null;
- super.reset();
+ super.recycle();
}
/**
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractReader.java 22 Oct 2003 18:03:08 -0000 1.2
+++ AbstractReader.java 6 Dec 2003 21:22:10 -0000 1.3
@@ -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, Resettable {
+ implements Reader, Recyclable {
/** The current <code>SourceResolver</code>. */
protected SourceResolver resolver;
@@ -123,7 +123,7 @@
/**
* Recycle the component
*/
- public void reset() {
+ public void recycle() {
this.out = null;
this.resolver = null;
this.source = null;
1.4 +3 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceReader.java 22 Oct 2003 18:03:08 -0000 1.3
+++ ResourceReader.java 6 Dec 2003 21:22:10 -0000 1.4
@@ -142,12 +142,12 @@
/**
* Recyclable
*/
- public void reset() {
+ public void recycle() {
if (inputSource != null) {
super.resolver.release(inputSource);
inputSource = null;
}
- super.reset();
+ super.recycle();
}
/**
1.17 +1 -4 cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java
Index: HttpEnvironment.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- HttpEnvironment.java 30 Oct 2003 16:50:47 -0000 1.16
+++ HttpEnvironment.java 6 Dec 2003 21:22:10 -0000 1.17
@@ -60,9 +60,6 @@
import org.apache.cocoon.environment.AbstractEnvironment;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.PermanentRedirector;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Session;
import org.apache.cocoon.util.NetUtils;
/**
1.4 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java
Index: CocoonMarkupLanguage.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CocoonMarkupLanguage.java 22 Oct 2003 18:13:36 -0000 1.3
+++ CocoonMarkupLanguage.java 6 Dec 2003 21:22:10 -0000 1.4
@@ -98,8 +98,8 @@
/**
* Recycle this component: clear logic sheet list and dependencies.
*/
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.dependencies.clear();
}
1.4 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractMarkupLanguage.java 22 Oct 2003 18:13:36 -0000 1.3
+++ AbstractMarkupLanguage.java 6 Dec 2003 21:22:10 -0000 1.4
@@ -50,6 +50,7 @@
*/
package org.apache.cocoon.components.language.markup;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -71,7 +72,6 @@
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.excalibur.store.Store;
-import org.apache.excalibur.mpool.Resettable;
import org.apache.cocoon.util.HashMap;
import org.xml.sax.Attributes;
@@ -98,7 +98,7 @@
public abstract class AbstractMarkupLanguage
extends AbstractLogEnabled
implements MarkupLanguage, Composable, Configurable, Parameterizable,
- Resettable, Disposable
+ Recyclable, Disposable
{
/** The 'file' URL protocol. */
private static final String FILE = "file:";
@@ -233,7 +233,7 @@
/**
* Recycle this component: clear logic sheet list and dependencies.
*/
- public void reset() {
+ public void recycle() {
this.logicSheetList.clear();
}
1.3 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/java/AbstractJavaCompiler.java
Index: AbstractJavaCompiler.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/java/AbstractJavaCompiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractJavaCompiler.java 22 Oct 2003 18:14:48 -0000 1.2
+++ AbstractJavaCompiler.java 6 Dec 2003 21:22:10 -0000 1.3
@@ -50,9 +50,9 @@
*/
package org.apache.cocoon.components.language.programming.java;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.components.language.programming.LanguageCompiler;
-import org.apache.excalibur.mpool.Resettable;
import java.io.BufferedReader;
import java.io.IOException;
@@ -66,7 +66,7 @@
* @version CVS $Id$
* @since 2.0
*/
-public abstract class AbstractJavaCompiler extends AbstractLogEnabled implements LanguageCompiler, Resettable {
+public abstract class AbstractJavaCompiler extends AbstractLogEnabled implements LanguageCompiler, Recyclable {
/**
* The source program filename
@@ -222,7 +222,7 @@
* This method is called by the component manager before this
* component is return to its pool.
*/
- public void reset() {
+ public void recycle() {
file = null;
srcDir = null;
destDir = null;
1.7 +5 -5 cocoon-2.2/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java
Index: XMLByteStreamInterpreter.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLByteStreamInterpreter.java 23 Oct 2003 08:37:44 -0000 1.6
+++ XMLByteStreamInterpreter.java 6 Dec 2003 21:22:10 -0000 1.7
@@ -52,8 +52,8 @@
import java.util.ArrayList;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.xml.AbstractXMLProducer;
-import org.apache.excalibur.mpool.Resettable;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -72,7 +72,7 @@
public final class XMLByteStreamInterpreter
extends AbstractXMLProducer
-implements XMLDeserializer, Resettable {
+implements XMLDeserializer, Recyclable {
private static final int START_DOCUMENT = 0;
private static final int END_DOCUMENT = 1;
@@ -97,8 +97,8 @@
private byte[] input;
private int currentPos;
- public void reset() {
- super.reset();
+ public void recycle() {
+ super.recycle();
this.list.clear();
this.input = null;
}
1.6 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java
Index: XMLByteStreamCompiler.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLByteStreamCompiler.java 7 Nov 2003 14:33:40 -0000 1.5
+++ XMLByteStreamCompiler.java 6 Dec 2003 21:22:10 -0000 1.6
@@ -50,8 +50,8 @@
*/
package org.apache.cocoon.components.sax;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.excalibur.mpool.Resettable;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -72,7 +72,7 @@
*/
public final class XMLByteStreamCompiler
-implements XMLSerializer, Resettable {
+implements XMLSerializer, Recyclable {
private HashMap map;
private int count;
@@ -101,7 +101,7 @@
this.bufCount = 6;
}
- public void reset() {
+ public void recycle() {
this.initOutput();
}
1.17 +4 -4 cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
Index: AbstractProcessingPipeline.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AbstractProcessingPipeline.java 7 Nov 2003 08:54:44 -0000 1.16
+++ AbstractProcessingPipeline.java 6 Dec 2003 21:22:10 -0000 1.17
@@ -58,6 +58,7 @@
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
@@ -81,7 +82,6 @@
import org.apache.cocoon.transformation.Transformer;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
-import org.apache.excalibur.mpool.Resettable;
import org.apache.excalibur.source.SourceValidity;
import org.xml.sax.SAXException;
@@ -94,7 +94,7 @@
*/
public abstract class AbstractProcessingPipeline
extends AbstractLogEnabled
- implements ProcessingPipeline, Parameterizable, Resettable, Serviceable {
+ implements ProcessingPipeline, Parameterizable, Recyclable, Serviceable {
// Generator stuff
protected Generator generator;
@@ -653,7 +653,7 @@
return true;
}
- public void reset() {
+ public void recycle() {
// release reader.
if ( this.readerSelector != null) {
this.readerSelector.release(this.reader);
1.11 +1 -2 cocoon-2.2/src/java/org/apache/cocoon/Processor.java
Index: Processor.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/Processor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Processor.java 14 Nov 2003 16:31:49 -0000 1.10
+++ Processor.java 6 Dec 2003 21:22:10 -0000 1.11
@@ -52,7 +52,6 @@
import java.util.Map;
-import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.EnvironmentHelper;
1.6 +1 -2 cocoon-2.2/src/java/org/apache/cocoon/servlet/multipart/MultipartHttpServletRequest.java
Index: MultipartHttpServletRequest.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/servlet/multipart/MultipartHttpServletRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MultipartHttpServletRequest.java 13 Nov 2003 15:02:07 -0000 1.5
+++ MultipartHttpServletRequest.java 6 Dec 2003 21:22:10 -0000 1.6
@@ -51,7 +51,6 @@
package org.apache.cocoon.servlet.multipart;
import java.io.BufferedReader;
-import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.Principal;