You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2003/10/22 20:07:15 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/transformation AbstractDOMTransformer.java AugmentTransformer.java EncodeURLTransformer.java I18nTransformer.java JPathTransformer.java LogTransformer.java RoleFilterTransformer.java ServiceableTransformer.java SimpleFormInstanceExtractionTransformer.java SimpleFormTransformer.java TraxTransformer.java WriteDOMSessionTransformer.java XIncludeTransformer.java
bloritsch 2003/10/22 11:07:15
Modified: src/java/org/apache/cocoon/transformation/pagination
Paginator.java
src/java/org/apache/cocoon/transformation
AbstractDOMTransformer.java AugmentTransformer.java
EncodeURLTransformer.java I18nTransformer.java
JPathTransformer.java LogTransformer.java
RoleFilterTransformer.java
ServiceableTransformer.java
SimpleFormInstanceExtractionTransformer.java
SimpleFormTransformer.java TraxTransformer.java
WriteDOMSessionTransformer.java
XIncludeTransformer.java
Log:
Update the transformers to be resettable/serviceable
Revision Changes Path
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Paginator.java 22 Oct 2003 12:51:14 -0000 1.3
+++ Paginator.java 22 Oct 2003 18:07:15 -0000 1.4
@@ -202,13 +202,13 @@
}
}
- public void recycle() {
+ public void reset() {
if (null != this.inputSource) {
this.resolver.release(this.inputSource);
this.inputSource = null;
}
this.resolver = null;
- super.recycle();
+ super.reset();
}
/**
1.2 +5 -6 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractDOMTransformer.java 9 Mar 2003 00:09:39 -0000 1.1
+++ AbstractDOMTransformer.java 22 Oct 2003 18:07:15 -0000 1.2
@@ -55,12 +55,11 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.excalibur.pool.Recyclable;
-
import org.apache.cocoon.ProcessingException;
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;
@@ -83,7 +82,7 @@
* @version CVS $Id$
*/
public abstract class AbstractDOMTransformer extends AbstractTransformer
- implements Transformer, DOMBuilder.Listener, Composable, Disposable, Recyclable {
+ implements Transformer, DOMBuilder.Listener, Composable, Disposable, Resettable {
/**
* The SAX entity resolver
@@ -148,12 +147,12 @@
/**
* Recycle the component.
*/
- public void recycle() {
+ public void reset() {
this.resolver = null;
this.source = null;
this.objectModel = null;
this.parameters = null;
- this.builder.recycle();
+ this.builder.reset();
}
/**
1.5 +10 -10 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AugmentTransformer.java 24 Sep 2003 21:41:12 -0000 1.4
+++ AugmentTransformer.java 22 Oct 2003 18:07:15 -0000 1.5
@@ -30,11 +30,11 @@
*/
public class AugmentTransformer
extends AbstractTransformer {
-
+
protected Map objectModel;
protected Request request;
protected String baseURI;
-
+
public void setup(SourceResolver resolver,
Map objectModel,
String source,
@@ -42,20 +42,20 @@
throws ProcessingException, SAXException, IOException {
this.objectModel = objectModel;
this.request = ObjectModelHelper.getRequest( this.objectModel );
-
+
String mountPoint = parameters.getParameter("mount", null);
-
+
StringBuffer uribuf = new StringBuffer();
boolean isSecure = this.request.isSecure();
int port = this.request.getServerPort();
-
+
if (isSecure) {
uribuf.append("https://");
} else {
uribuf.append("http://");
}
uribuf.append(request.getServerName());
-
+
if (isSecure) {
if (port != 443) {
uribuf.append(":").append(port);
@@ -84,7 +84,7 @@
Attributes attrs)
throws SAXException {
AttributesImpl newAttrs = null;
-
+
for (int i = 0, size = attrs.getLength(); i < size; i++) {
String attrName = attrs.getLocalName(i);
if (attrName.equals("href")) {
@@ -114,10 +114,10 @@
/**
* Recyclable
*/
- public void recycle() {
+ public void reset() {
this.objectModel = null;
this.request = null;
this.baseURI = null;
- super.recycle();
+ super.reset();
}
}
1.6 +13 -13 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EncodeURLTransformer.java 4 Aug 2003 03:44:05 -0000 1.5
+++ EncodeURLTransformer.java 22 Oct 2003 18:07:15 -0000 1.6
@@ -150,26 +150,26 @@
/**
* check if encoding of URLs is neccessary.
- *
- * THis is true if session object exists, and session-id
+ *
+ * THis is true if session object exists, and session-id
* was provided from URL, or session is new.
* The result is stored in some instance variables
*/
protected void checkForEncoding(Request request) {
this.session = request.getSession();
this.isEncodeURLNeeded = false;
-
+
if ( null != this.session ) {
- // do encoding if session id is from URL, or the session is new,
+ // do encoding if session id is from URL, or the session is new,
// fixes BUG #13855, due to paint007@mc.duke.edu
if ( request.isRequestedSessionIdFromURL() || this.session.isNew()) {
this.isEncodeURLNeeded = true;
}
}
}
-
-
+
+
/**
* Setup the transformer.
* <p>
@@ -185,12 +185,12 @@
throws ProcessingException, SAXException, IOException {
this.checkForEncoding(ObjectModelHelper.getRequest(objectModel));
-
+
if (this.isEncodeURLNeeded) {
this.response = ObjectModelHelper.getResponse(objectModel);
// don't check if URL encoding is needed now, as
- // a generator might create a new session
+ // a generator might create a new session
final String includeName = parameters.getParameter(INCLUDE_NAME,
this.includeNameConfigure);
final String excludeName = parameters.getParameter(EXCLUDE_NAME,
@@ -235,8 +235,8 @@
/**
* Recycle resources of this transformer
*/
- public void recycle() {
- super.recycle();
+ public void reset() {
+ super.reset();
this.response = null;
this.session = null;
this.elementAttributeMatching = null;
@@ -337,7 +337,7 @@
}
return encoded_url;
}
-
+
/**
* A helper class for matching element names, and attribute names.
*
1.14 +14 -14 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- I18nTransformer.java 24 Sep 2003 21:41:12 -0000 1.13
+++ I18nTransformer.java 22 Oct 2003 18:07:15 -0000 1.14
@@ -51,14 +51,14 @@
package org.apache.cocoon.transformation;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
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;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.sitemap.PatternException;
import org.apache.cocoon.components.treeprocessor.variables.PreparedVariableResolver;
@@ -238,7 +238,7 @@
*/
public class I18nTransformer extends AbstractTransformer
implements CacheableProcessingComponent,
- Composable, Configurable, Disposable {
+ Serviceable, Configurable, Disposable {
/**
* The namespace for i18n is "http://apache.org/cocoon/i18n/2.1".
@@ -759,7 +759,7 @@
}
// Component manager for this component
- protected ComponentManager manager;
+ protected ServiceManager manager;
private SourceResolver sourceResolver;
@@ -884,13 +884,13 @@
* Implementation of composable interface.
* Looksup the Bundle Factory to be used.
*/
- public void compose(ComponentManager manager) {
+ public void service(ServiceManager manager) {
this.manager = manager;
try {
this.factory = (BundleFactory)manager.lookup(BundleFactory.ROLE);
debug("BundleFactory is obtained");
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
this.getLogger().error("BundleFactory is not loaded", ce);
}
}
@@ -1231,14 +1231,14 @@
prev_state = current_state;
current_state = STATE_INSIDE_TEXT;
-
+
current_key = attr.getValue("", I18N_KEY_ATTRIBUTE);
if (current_key == null) {
// Try the namespaced attribute
current_key = attr.getValue(I18N_NAMESPACE_URI, I18N_KEY_ATTRIBUTE);
if (current_key == null) {
// Try the old namespace
- current_key = attr.getValue(I18N_OLD_NAMESPACE_URI, I18N_KEY_ATTRIBUTE);
+ current_key = attr.getValue(I18N_OLD_NAMESPACE_URI, I18N_KEY_ATTRIBUTE);
}
}
@@ -1565,7 +1565,7 @@
// Translate all attributes from i18n:attr="name1 name2 ..."
// using their values as keys
int i18n_attr_index = temp_attr.getIndex(I18N_NAMESPACE_URI,I18N_ATTR_ATTRIBUTE);
-
+
if (i18n_attr_index == -1) {
// Try the old namespace
i18n_attr_index = temp_attr.getIndex(I18N_OLD_NAMESPACE_URI,I18N_ATTR_ATTRIBUTE);
@@ -1963,7 +1963,7 @@
to_fmt.setMaximumFractionDigits(309);
for (int i = value.length() - 1;
i >= 0 && value.charAt(i) != dec; i--, decAt++) {
-
+
}
if (decAt < value.length())to_fmt.setMinimumFractionDigits(decAt);
@@ -2147,7 +2147,7 @@
getLogger().debug("I18nTransformer: " + msg);
}
- public void recycle() {
+ public void reset() {
// restore untranslated-text if necessary
if (globalUntranslated != null)
untranslated = globalUntranslated;
@@ -2168,7 +2168,7 @@
sourceResolver = null;
objectModel = null;
- super.recycle();
+ super.reset();
}
public void dispose() {
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JPathTransformer.java 18 May 2003 16:36:41 -0000 1.4
+++ JPathTransformer.java 22 Oct 2003 18:07:15 -0000 1.5
@@ -395,8 +395,8 @@
/**
* Release all held resources.
*/
- public void recycle() {
- super.recycle();
+ public void reset() {
+ super.reset();
m_cache.clear();
m_kont = null;
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogTransformer.java 20 May 2003 20:48:44 -0000 1.2
+++ LogTransformer.java 22 Oct 2003 18:07:15 -0000 1.3
@@ -140,8 +140,8 @@
/**
* Recycle
*/
- public void recycle() {
- super.recycle();
+ public void reset() {
+ super.reset();
try {
if (this.logfile != null) logfile.close();
} catch (Exception e) {
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RoleFilterTransformer.java 4 Sep 2003 14:51:27 -0000 1.3
+++ RoleFilterTransformer.java 22 Oct 2003 18:07:15 -0000 1.4
@@ -180,8 +180,8 @@
return attr;
}
- public void recycle() {
+ public void reset() {
this.request = null;
- super.recycle();
+ super.reset();
}
}
1.2 +8 -8 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServiceableTransformer.java 4 Sep 2003 14:40:32 -0000 1.1
+++ ServiceableTransformer.java 22 Oct 2003 18:07:15 -0000 1.2
@@ -65,14 +65,14 @@
/**
* This class can be used as a base class for own transformer implementations
* that need to lookup other components.
- *
+ *
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
* (Apache Software Foundation)
* @version CVS $Id$
*/
-public abstract class ServiceableTransformer
- extends AbstractTransformer
+public abstract class ServiceableTransformer
+ extends AbstractTransformer
implements Serviceable, Disposable {
/** The current <code>SourceResolver</code>. */
@@ -85,7 +85,7 @@
protected String source;
/** The ServiceManager */
protected ServiceManager manager;
-
+
/**
* Set the <code>SourceResolver</code>, object model <code>Map</code>,
* the source and sitemap <code>Parameters</code> used to process the request.
@@ -101,14 +101,14 @@
/**
* Recycle the generator by removing references
*/
- public void recycle() {
- super.recycle();
+ public void reset() {
+ super.reset();
this.resolver = null;
this.objectModel = null;
this.source = null;
this.parameters = null;
}
-
+
/* (non-Javadoc)
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
1.2 +7 -8 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleFormInstanceExtractionTransformer.java 9 Mar 2003 00:09:39 -0000 1.1
+++ SimpleFormInstanceExtractionTransformer.java 22 Oct 2003 18:07:15 -0000 1.2
@@ -62,12 +62,11 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.excalibur.pool.Recyclable;
-
import org.apache.cocoon.ProcessingException;
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,8 +87,8 @@
* @author <a href="mailto:haul@apache.org">Christian Haul</a>
* @version CVS $Id$
*/
-public class SimpleFormInstanceExtractionTransformer extends AbstractExtractionTransformer
- implements Configurable, Composable, Recyclable {
+public class SimpleFormInstanceExtractionTransformer extends AbstractExtractionTransformer
+ implements Configurable, Composable, Resettable {
protected class ElementData {
public String uri = null;
@@ -162,8 +161,8 @@
this.objectModel = objectModel;
}
- public void recycle() {
- super.recycle();
+ public void reset() {
+ super.reset();
this.instanceName = null;
}
@@ -247,7 +246,7 @@
* @param doc a <code>Document</code> value
*/
public void handleExtractedDocument(Document doc) {
-
+
ComponentSelector outputSelector = null;
OutputModule output = null;
1.7 +23 -32 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SimpleFormTransformer.java 10 Oct 2003 10:49:23 -0000 1.6
+++ SimpleFormTransformer.java 22 Oct 2003 18:07:15 -0000 1.7
@@ -56,8 +56,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.excalibur.pool.Recyclable;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.acting.ValidatorActionResult;
import org.apache.cocoon.components.language.markup.xsp.XSPFormValidatorHelper;
@@ -65,6 +63,7 @@
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;
@@ -77,8 +76,8 @@
import java.util.List;
import java.util.Map;
-/**
- * Eliminates the need for XSP to use FormValidatorAction or HTML forms.
+/**
+ * Eliminates the need for XSP to use FormValidatorAction or HTML forms.
* Caveat: Select options need a value attribute to work correctly.
*
* <p>This transformer fills all HTML 4 form elements with values from
@@ -106,13 +105,13 @@
*
* <p><em>Names of error elements are never augmented by prefix, suffix or
* form name.</em></p>
- *
+ *
* <p>Page parts with multiple occurrences depending on the number of
* actual parameters can be enclosed in <repeat on="expr" using="var"/>
* elements. <em>expr</em> is used to determine the number of occurrences
* and <em>var</em> will be expanded with the ordinary number. Repeat elements
* can be nested.</p>
- *
+ *
* <p>Example:</p>
* <pre>
* <repeat on="mult" using="i"><input type="text" name="mult[${i}]"/></repeat>
@@ -129,9 +128,9 @@
*
* <p>Configuration elements:
* <table>
- * <tr><td>input-module</td><td>(String) InputModule configuration,
+ * <tr><td>input-module</td><td>(String) InputModule configuration,
* defaults to an empty configuration and the "request-param" module</td></tr>
- * <tr><td>fixed-attribute</td><td>(String) Name of the attribute used to
+ * <tr><td>fixed-attribute</td><td>(String) Name of the attribute used to
* indicate that this element should not be changed. ("fixed")</td></tr>
* <tr><td>use-form-name</td><td>(boolean) Add the name of the form to the
* name of form elements. Uses default Separator , if default separator is null
@@ -139,7 +138,7 @@
* <tr><td>use-form-name-twice</td><td>(boolean) Add the name of the form twice to the
* name of form elements. This is useful when the form instance has no
* all enclosing root tag and the form name is used instead <em>and</em> the
- * form name needs to be used to find the form data. Uses default Separator ,
+ * form name needs to be used to find the form data. Uses default Separator ,
* if default separator is null or empty, separator is set to "/".("false")</td></tr>
* <tr><td>separator</td><td>(String) Separator between form name and element name ("/")
* </td></tr>
@@ -176,7 +175,7 @@
* @author <a href="mailto:haul@apache.org">Christian Haul</a>
* @version CVS $Id$
*/
-public class SimpleFormTransformer extends AbstractSAXTransformer implements Recyclable {
+public class SimpleFormTransformer extends AbstractSAXTransformer implements Resettable {
/** strip numbers from repeated element name attributes */
private boolean stripNumber = true;
@@ -306,7 +305,7 @@
protected Map formValues = null;
/**
- * Keep track of repeater status.
+ * Keep track of repeater status.
*/
protected class RepeaterStatus {
public String var = null;
@@ -325,7 +324,7 @@
}
/**
- * Keep track of multiple values.
+ * Keep track of multiple values.
*/
protected class ValueList {
private int current = -1;
@@ -353,7 +352,8 @@
}
/** set per instance variables to defaults */
- private void reset() {
+ public void reset() {
+ super.reset();
this.skipChildrenOnly = false;
this.values = null;
this.validationResults = null;
@@ -486,14 +486,6 @@
}
/**
- * Recycle this component.
- */
- public void recycle() {
- super.recycle();
- this.reset();
- }
-
- /**
* Generate string representation of attributes. For debug only.
*/
protected String printAttributes(Attributes attr) {
@@ -790,8 +782,8 @@
/**
* Start processing a form element. Sets protection indicator if attribute
- * "fixed" is present and either "true" or "yes". Removes attribute "fixed"
- * if present.
+ * "fixed" is present and either "true" or "yes". Removes attribute "fixed"
+ * if present.
* @param uri The namespace of the element.
* @param name The local name of the element.
* @param raw The qualified name of the element.
@@ -826,7 +818,7 @@
* Start recording repeat element contents and push repeat expression and
* variable to repeater stack. Only start recording, if no other recorder is
* currently running.
- *
+ *
* @param uri
* @param name
* @param raw
@@ -855,7 +847,7 @@
/**
* Stop recording repeat contents and replay required number of times.
* Stop only if outmost repeat element is ending.
- *
+ *
* @param uri
* @param name
* @param raw
@@ -1000,7 +992,7 @@
/**
* Remove extra information from element's attributes. Currently only removes
* the repeater variable from the element's name attribute if present.
- *
+ *
* @param attr
* @return modified attributes
*/
@@ -1079,7 +1071,7 @@
/**
* Obtain values from used InputModule if not done already and return the
* next value. If no more values exist, returns null.
- *
+ *
* @param name
* @return
*/
@@ -1156,7 +1148,7 @@
/**
* Calls the super's method startTransformingElement.
- *
+ *
* @param uri
* @param name
* @param raw
@@ -1173,8 +1165,7 @@
* ignoreEventsCount if skip is true. Increment can be done either before
* invoking super's method, so that the element itself is skipped, or afterwards,
* so that only the children are skipped.
- *
- * @param increment skip counter
+ *
* @param skip only children
* @param uri
* @param name
@@ -1209,7 +1200,7 @@
/**
* Calls the super's method endTransformingElement and decrements the
* ignoreEventsCount if larger than zero.
- *
+ *
* @param uri
* @param name
* @param raw
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TraxTransformer.java 6 May 2003 09:00:17 -0000 1.6
+++ TraxTransformer.java 22 Oct 2003 18:07:15 -0000 1.7
@@ -490,7 +490,7 @@
/**
* Recyclable
*/
- public void recycle() {
+ public void reset() {
this.objectModel = null;
if (this.inputSource != null) {
this.resolver.release(this.inputSource);
@@ -518,7 +518,7 @@
this.logicSheetParameters = null;
this.transformerHandler = null;
this.transformerValidity = null;
- super.recycle();
+ super.reset();
}
/**
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WriteDOMSessionTransformer.java 24 Sep 2003 21:41:12 -0000 1.2
+++ WriteDOMSessionTransformer.java 22 Oct 2003 18:07:15 -0000 1.3
@@ -102,8 +102,8 @@
/**
* Recyclable
*/
- public void recycle() {
- super.recycle();
+ public void reset() {
+ super.reset();
this.session = null;
this.builder = null;
this.buildDom = false;
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XIncludeTransformer.java 24 Sep 2003 21:41:12 -0000 1.10
+++ XIncludeTransformer.java 22 Oct 2003 18:07:15 -0000 1.11
@@ -126,12 +126,12 @@
this.manager = manager;
}
- public void recycle()
+ public void reset()
{
// Reset all variables to initial state.
this.resolver = null;
this.xIncludePipe = null;
- super.recycle();
+ super.reset();
}
/**