bloritsch 01/02/22 09:11:00
Modified: src/org/apache/cocoon Tag: xml-cocoon2
CocoonComponentSelector.java ComponentFactory.java
DefaultComponentManager.java
src/org/apache/cocoon/components/language/generator Tag:
xml-cocoon2 CompiledComponent.java
ProgramGenerator.java ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPGenerator.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
DirectoryGenerator.java FileGenerator.java
FragmentExtractorGenerator.java HTMLGenerator.java
PhpGenerator.java RequestGenerator.java
ServerPagesGenerator.java StatusGenerator.java
src/org/apache/cocoon/reading Tag: xml-cocoon2
AbstractReader.java
src/org/apache/cocoon/serialization Tag: xml-cocoon2
FOPSerializer.java HTMLSerializer.java
LinkSerializer.java SVGSerializer.java
TextSerializer.java XMLSerializer.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
AbstractSitemap.java ResourcePipeline.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
I18nTransformer.java LogTransformer.java
SQLTransformer.java TraxTransformer.java
XIncludeTransformer.java XTTransformer.java
Removed: src/org/apache/cocoon Tag: xml-cocoon2 PoolClient.java
src/org/apache/cocoon/components/language/generator Tag:
xml-cocoon2 AbstractCompiledComponent.java
Log:
First stab at Component Releasing.
Revision Changes Path
No revision
No revision
1.1.2.23 +1 -2
xml-cocoon/src/org/apache/cocoon/Attic/CocoonComponentSelector.java
Index: CocoonComponentSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/CocoonComponentSelector.java,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- CocoonComponentSelector.java 2001/02/22 15:03:09 1.1.2.22
+++ CocoonComponentSelector.java 2001/02/22 17:10:17 1.1.2.23
@@ -43,7 +43,7 @@
/** Default component manager for Cocoon's non sitemap components.
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/02/22 15:03:09 $
+ * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/02/22 17:10:17 $
*/
public class CocoonComponentSelector implements Contextualizable,
ComponentSelector, Composer, Configurable, ThreadSafe, Loggable {
protected Logger log;
@@ -229,7 +229,6 @@
cf.setLogger(this.log);
pool = new ComponentPool(cf, new ComponentPoolController());
- cf.setPool(pool);
pool.setLogger(this.log);
pool.init();
} catch (Exception e) {
1.1.2.10 +3 -19
xml-cocoon/src/org/apache/cocoon/Attic/ComponentFactory.java
Index: ComponentFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/ComponentFactory.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- ComponentFactory.java 2001/02/19 21:57:45 1.1.2.9
+++ ComponentFactory.java 2001/02/22 17:10:18 1.1.2.10
@@ -9,7 +9,6 @@
package org.apache.cocoon;
import org.apache.avalon.util.pool.ObjectFactory;
-import org.apache.avalon.Poolable;
import org.apache.avalon.util.pool.Pool;
import org.apache.avalon.Configuration;
@@ -19,15 +18,16 @@
import org.apache.avalon.ThreadSafe;
import org.apache.avalon.Contextualizable;
import org.apache.avalon.Context;
+import org.apache.avalon.Poolable;
import org.apache.log.Logger;
import org.apache.avalon.Loggable;
/** Factory for Cocoon components.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/19 21:57:45 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/02/22 17:10:18 $
*/
-public class ComponentFactory implements ObjectFactory, PoolClient,
ThreadSafe, Loggable {
+public class ComponentFactory implements ObjectFactory, ThreadSafe, Loggable
{
private Logger log;
/** The class which this <code>ComponentFactory</code>
@@ -47,16 +47,6 @@
*/
private Context context;
- /** The Pool for the component
- */
- private Pool pool;
-
- public void setPool(Pool pool) {
- if (this.pool == null) {
- this.pool = pool;
- }
- }
-
/** Construct a new component factory for the specified component.
* @param componentClass the class to instantiate (must have a default
constructor).
* @param config the <code>Configuration</code> object to pass to new
instances.
@@ -98,14 +88,8 @@
((Configurable)comp).configure(this.conf);
}
- if ( comp instanceof PoolClient) {
- ((PoolClient) comp).setPool(this.pool);
- }
-
return comp;
}
-
- public void returnToPool() {}
public final Class getCreatedClass() {
return componentClass;
1.1.2.21 +1 -2
xml-cocoon/src/org/apache/cocoon/Attic/DefaultComponentManager.java
Index: DefaultComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/DefaultComponentManager.java,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- DefaultComponentManager.java 2001/02/22 15:03:09 1.1.2.20
+++ DefaultComponentManager.java 2001/02/22 17:10:20 1.1.2.21
@@ -41,7 +41,7 @@
/** Default component manager for Cocoon's non sitemap components.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/02/22 15:03:09 $
+ * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/02/22 17:10:20 $
*/
public class DefaultComponentManager implements ComponentManager, Loggable,
Configurable, Contextualizable {
@@ -267,7 +267,6 @@
cf.setLogger(this.log);
pool = new ComponentPool(cf, new ComponentPoolController());
- cf.setPool(pool);
pool.setLogger(this.log);
pool.init();
} catch (Exception e) {
No revision
No revision
1.1.2.5 +3 -3
xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/CompiledComponent.java
Index: CompiledComponent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/CompiledComponent.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- CompiledComponent.java 2001/02/16 22:07:33 1.1.2.4
+++ CompiledComponent.java 2001/02/22 17:10:25 1.1.2.5
@@ -9,14 +9,14 @@
import org.apache.avalon.Composer;
import org.apache.avalon.Modifiable;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
/**
* This interface is the common base of all Compiled Components. This
* includes Sitemaps and XSP Pages
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/02/16 22:07:33 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/02/22 17:10:25 $
*/
-public interface CompiledComponent extends Composer, PoolClient, Modifiable {
+public interface CompiledComponent extends Composer, Poolable, Modifiable {
}
1.1.2.9 +9 -1
xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGenerator.java
Index: ProgramGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGenerator.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- ProgramGenerator.java 2001/02/16 15:38:27 1.1.2.8
+++ ProgramGenerator.java 2001/02/22 17:10:26 1.1.2.9
@@ -17,7 +17,7 @@
* documents writeen in a <code>MarkupLanguage</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/16 15:38:27 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/22 17:10:26 $
*/
public interface ProgramGenerator extends Component {
/**
@@ -36,4 +36,12 @@
File file, String markupLanguage, String programmingLanguage,
EntityResolver resolver
) throws Exception;
+
+ /**
+ * Release a program built from an XML document written in a
+ * <code>MarkupLanguage</code>.
+ *
+ * @param CompiledSheet
+ */
+ void release(CompiledComponent component);
}
1.1.2.36 +5 -1
xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -u -r1.1.2.35 -r1.1.2.36
--- ProgramGeneratorImpl.java 2001/02/22 12:07:58 1.1.2.35
+++ ProgramGeneratorImpl.java 2001/02/22 17:10:26 1.1.2.36
@@ -46,7 +46,7 @@
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.35 $ $Date: 2001/02/22 12:07:58 $
+ * @version CVS $Revision: 1.1.2.36 $ $Date: 2001/02/22 17:10:26 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable implements
ProgramGenerator, Contextualizable, Composer, Configurable, ThreadSafe {
@@ -227,5 +227,9 @@
}
return program;
+ }
+
+ public void release(CompiledComponent component) {
+ this.cache.release((Component) component);
}
}
No revision
No revision
1.1.2.14 +3 -15
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java
Index: XSPGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- XSPGenerator.java 2001/02/16 22:07:37 1.1.2.13
+++ XSPGenerator.java 2001/02/22 17:10:28 1.1.2.14
@@ -12,11 +12,10 @@
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.language.generator.CompiledComponent;
-import org.apache.cocoon.PoolClient;
import org.apache.log.Logger;
import org.apache.avalon.Loggable;
-import org.apache.avalon.util.pool.Pool;
+import org.apache.avalon.Poolable;
import org.apache.cocoon.generation.AbstractServerPage;
@@ -24,11 +23,10 @@
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/02/16 22:07:37 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/02/22 17:10:28 $
*/
-public abstract class XSPGenerator extends AbstractServerPage implements
Loggable, PoolClient, CompiledComponent {
+public abstract class XSPGenerator extends AbstractServerPage implements
Loggable, Poolable, CompiledComponent {
- protected Pool pool;
protected Parser parser;
protected Logger log;
@@ -54,14 +52,4 @@
log.error("Can't find component", e);
}
}
- public void setPool(Pool pool) {
- if (this.pool == null) {
- this.pool = pool;
- }
- }
-
- public void returnToPool() {
- super.recycle();
- this.pool.put(this);
- }
}
No revision
No revision
1.1.2.19 +3 -14
xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- DirectoryGenerator.java 2001/02/19 15:58:08 1.1.2.18
+++ DirectoryGenerator.java 2001/02/22 17:10:30 1.1.2.19
@@ -21,13 +21,12 @@
import org.xml.sax.helpers.AttributesImpl;
import org.apache.avalon.Parameters;
-import org.apache.avalon.util.pool.Pool;
+import org.apache.avalon.Poolable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.components.url.URLFactory;
-import org.apache.cocoon.PoolClient;
/**
* Generates an XML directory listing.
@@ -62,9 +61,9 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/02/19 15:58:08 $ */
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/02/22 17:10:30 $ */
-public class DirectoryGenerator extends ComposerGenerator implements
PoolClient {
+public class DirectoryGenerator extends ComposerGenerator implements
Poolable {
/** The URI of the namespace of this generator. */
protected static final String URI =
@@ -89,16 +88,6 @@
protected int depth;
protected AttributesImpl attributes = new AttributesImpl();
protected SimpleDateFormat dateFormatter;
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
/**
* Set the request parameters. Must be called before the generate
1.1.2.20 +3 -14
xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- FileGenerator.java 2001/02/19 21:13:30 1.1.2.19
+++ FileGenerator.java 2001/02/22 17:10:31 1.1.2.20
@@ -31,8 +31,7 @@
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
import org.apache.avalon.Parameters;
-import org.apache.avalon.util.pool.Pool;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
/**
*
@@ -59,9 +58,9 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/02/19 21:13:30 $
+ * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/02/22 17:10:31 $
*/
-public class FileGenerator extends ComposerGenerator implements PoolClient,
Configurable {
+public class FileGenerator extends ComposerGenerator implements Poolable,
Configurable {
/** The store service instance */
private Store store = null;
@@ -71,16 +70,6 @@
/** The default configuration for useStore */
private boolean defaultUseStore;
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
/**
* Set the current <code>ComponentManager</code> instance used by this
1.1.2.6 +3 -14
xml-cocoon/src/org/apache/cocoon/generation/Attic/FragmentExtractorGenerator.java
Index: FragmentExtractorGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FragmentExtractorGenerator.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FragmentExtractorGenerator.java 2001/02/19 21:57:48 1.1.2.5
+++ FragmentExtractorGenerator.java 2001/02/22 17:10:33 1.1.2.6
@@ -5,8 +5,7 @@
import org.apache.cocoon.generation.AbstractGenerator;
import org.apache.cocoon.xml.dom.DOMStreamer;
import org.apache.avalon.Parameters;
-import org.apache.avalon.util.pool.Pool;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXException;
@@ -29,22 +28,12 @@
* This is by no means complete yet, but it should prove useful, particularly
* for offline generation.
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/02/19 21:57:48 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/02/22 17:10:33 $
*/
-public class FragmentExtractorGenerator extends AbstractGenerator implements
PoolClient {
+public class FragmentExtractorGenerator extends AbstractGenerator implements
Poolable {
/** The fragment store. */
private static Map fragmentStore = new HashMap();
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
/** Construct a new <code>FragmentExtractorGenerator</code> and ensure
that the
* fragment store is initialized and threadsafe (since it is a global
store, not
1.1.2.12 +3 -13
xml-cocoon/src/org/apache/cocoon/generation/Attic/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/HTMLGenerator.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- HTMLGenerator.java 2001/02/19 21:13:32 1.1.2.11
+++ HTMLGenerator.java 2001/02/22 17:10:33 1.1.2.12
@@ -7,8 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.avalon.util.pool.Pool;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.ProcessingException;
@@ -30,18 +29,9 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/02/19 21:13:32 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/02/22 17:10:33 $
*/
-public class HTMLGenerator extends ComposerGenerator implements PoolClient {
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
+public class HTMLGenerator extends ComposerGenerator implements Poolable {
/**
* Generate XML data.
1.1.2.14 +2 -13
xml-cocoon/src/org/apache/cocoon/generation/Attic/PhpGenerator.java
Index: PhpGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/PhpGenerator.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- PhpGenerator.java 2001/02/19 21:13:33 1.1.2.13
+++ PhpGenerator.java 2001/02/22 17:10:34 1.1.2.14
@@ -17,8 +17,7 @@
import org.apache.cocoon.components.parser.Parser;
-import org.apache.avalon.util.pool.Pool;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -29,19 +28,9 @@
* results into SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sam Ruby</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/02/19 21:13:33 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/02/22 17:10:34 $
*/
public class PhpGenerator extends ServletGenerator implements Poolable {
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
/**
* Stub implementation of Servlet Config
1.1.2.9 +3 -14
xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java
Index: RequestGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/RequestGenerator.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- RequestGenerator.java 2001/02/19 21:13:33 1.1.2.8
+++ RequestGenerator.java 2001/02/22 17:10:34 1.1.2.9
@@ -13,30 +13,19 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.avalon.util.pool.Pool;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/19 21:13:33 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/22 17:10:34 $
*/
-public class RequestGenerator extends ServletGenerator implements PoolClient
{
+public class RequestGenerator extends ServletGenerator implements Poolable {
/** The URI of the namespace of this generator. */
private String URI="http://xml.apache.org/cocoon/2.0/RequestGenerator";;
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
/**
* Generate XML data.
1.1.2.20 +5 -30
xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServerPagesGenerator.java,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- ServerPagesGenerator.java 2001/02/19 21:13:34 1.1.2.19
+++ ServerPagesGenerator.java 2001/02/22 17:10:35 1.1.2.20
@@ -21,7 +21,8 @@
import org.apache.avalon.Composer;
import org.apache.avalon.ComponentManager;
-import org.apache.avalon.util.pool.Pool;
+import org.apache.avalon.Poolable;
+import org.apache.avalon.Loggable;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.components.language.generator.ProgramGenerator;
@@ -34,19 +35,17 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.Roles;
-import org.apache.cocoon.PoolClient;
-import org.apache.avalon.Loggable;
/**
* This class acts as a proxy to a dynamically loaded<code>Generator</code>
* delegating actual SAX event generation.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/02/19 21:13:34 $
+ * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/02/22 17:10:35 $
*/
public class ServerPagesGenerator
extends ServletGenerator
- implements ContentHandler, LexicalHandler, PoolClient
+ implements ContentHandler, LexicalHandler, Poolable
{
/**
* The sitemap-defined server pages program generator
@@ -55,16 +54,6 @@
protected static URLFactory factory = null;
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
-
/**
* Set the global component manager. This method sets the sitemap-defined
* program generator
@@ -154,20 +143,6 @@
throw new ResourceNotFoundException(e.getMessage(), e);
}
-/* if (generator instanceof Loggable) {
- ((Loggable) generator).setLogger(getLogger());
- }
-
- // Delegate XML production to loaded generator
- if (generator instanceof Composer) {
- try {
- ((Composer) generator).compose(this.manager);
- } catch (Exception e) {
- getLogger().error("Could not compose generator", e);
- throw new ProcessingException("Could not compose generator");
- }
- }
-*/
generator.setContentHandler(this);
generator.setLexicalHandler(this);
generator.setup(this.resolver, this.objectModel, this.source,
this.parameters);
@@ -204,7 +179,7 @@
}
}
- generator.returnToPool();
+ programGenerator.release(generator);
}
/* Handlers */
1.1.2.10 +3 -14
xml-cocoon/src/org/apache/cocoon/generation/Attic/StatusGenerator.java
Index: StatusGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/StatusGenerator.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- StatusGenerator.java 2001/02/19 15:58:08 1.1.2.9
+++ StatusGenerator.java 2001/02/22 17:10:35 1.1.2.10
@@ -23,10 +23,8 @@
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
-import org.apache.avalon.util.pool.Pool;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
-
/** Generates an XML representation of the current status of Cocoon.
* Potted DTD:
*
@@ -53,10 +51,9 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a> (Luminas
Limited)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/19 15:58:08 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/02/22 17:10:35 $
*/
-public class StatusGenerator extends ComposerGenerator implements PoolClient
{
- private Pool pool;
+public class StatusGenerator extends ComposerGenerator implements Poolable {
/** The XML namespace for the output document.
*/
@@ -67,14 +64,6 @@
*/
protected static final String xlinkNamespace =
"http://www.w3.org/1999/xlink";;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
/** Generate the status information in XML format.
* @throws SAXException
No revision
No revision
1.1.2.10 +3 -14
xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java
Index: AbstractReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/AbstractReader.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- AbstractReader.java 2001/02/20 20:34:17 1.1.2.9
+++ AbstractReader.java 2001/02/22 17:10:41 1.1.2.10
@@ -10,20 +10,18 @@
import java.io.OutputStream;
import java.util.Map;
-import org.apache.cocoon.PoolClient;
-
import org.xml.sax.EntityResolver;
import org.apache.avalon.Parameters;
import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.util.pool.Pool;
+import org.apache.avalon.Poolable;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/20 20:34:17 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/02/22 17:10:41 $
*/
-public abstract class AbstractReader extends AbstractLoggable implements
PoolClient, Reader {
+public abstract class AbstractReader extends AbstractLoggable implements
Poolable, Reader {
/** The current <code>EntityResolver</code>. */
protected EntityResolver resolver=null;
/** The current <code>Map</code> of the object model. */
@@ -34,16 +32,7 @@
protected String source=null;
/** The <code>OutputStream</code> to write on. */
protected OutputStream out=null;
- /** The pool to return the object to */
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
- public void returnToPool() {
- this.pool.put(this);
- }
/**
* Set the <code>EntityResolver</code> the object model <code>Map</code>,
* the source and sitemap <code>Parameters</code> used to process the
request.
No revision
No revision
1.1.2.13 +3 -14
xml-cocoon/src/org/apache/cocoon/serialization/Attic/FOPSerializer.java
Index: FOPSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/FOPSerializer.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FOPSerializer.java 2001/02/19 15:58:09 1.1.2.12
+++ FOPSerializer.java 2001/02/22 17:10:42 1.1.2.13
@@ -12,8 +12,7 @@
import java.io.OutputStream;
import java.io.PrintWriter;
-import org.apache.avalon.util.pool.Pool;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
import org.apache.fop.apps.Driver;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.Version;
@@ -30,25 +29,15 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/02/19 15:58:09 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/02/22 17:10:42 $
*
*/
-public class FOPSerializer extends AbstractSerializer implements
MessageListener, PoolClient {
+public class FOPSerializer extends AbstractSerializer implements
MessageListener, Poolable {
/**
* The FOP driver
*/
private Driver driver = null;
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
/**
* Create the FOP driver
1.1.2.14 +3 -14
xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java
Index: HTMLSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- HTMLSerializer.java 2001/02/20 21:06:46 1.1.2.13
+++ HTMLSerializer.java 2001/02/22 17:10:44 1.1.2.14
@@ -10,10 +10,9 @@
import java.io.OutputStream;
-import org.apache.avalon.util.pool.Pool;
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
@@ -21,22 +20,12 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/02/20 21:06:46 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/02/22 17:10:44 $
*/
-public class HTMLSerializer extends AbstractTextSerializer implements
PoolClient {
+public class HTMLSerializer extends AbstractTextSerializer implements
Poolable {
private TransformerHandler handler;
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
public HTMLSerializer() {
}
1.1.2.7 +3 -14
xml-cocoon/src/org/apache/cocoon/serialization/Attic/LinkSerializer.java
Index: LinkSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/LinkSerializer.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- LinkSerializer.java 2001/02/19 15:58:10 1.1.2.6
+++ LinkSerializer.java 2001/02/22 17:10:44 1.1.2.7
@@ -13,8 +13,7 @@
import java.io.IOException;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.PoolClient;
-import org.apache.avalon.util.pool.Pool;
+import org.apache.avalon.Poolable;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -23,22 +22,12 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/02/19 15:58:10 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/22 17:10:44 $
*/
-public class LinkSerializer extends ExtendedXLinkPipe implements Serializer,
PoolClient {
+public class LinkSerializer extends ExtendedXLinkPipe implements Serializer,
Poolable {
private PrintStream out;
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
/**
* Set the <code>OutputStream</code> where the requested resource should
1.1.2.26 +5 -16
xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java
Index: SVGSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/SVGSerializer.java,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- SVGSerializer.java 2001/02/21 23:42:54 1.1.2.25
+++ SVGSerializer.java 2001/02/22 17:10:45 1.1.2.26
@@ -14,7 +14,6 @@
import org.apache.cocoon.xml.*;
import org.apache.cocoon.xml.dom.*;
import org.apache.avalon.*;
-import org.apache.avalon.util.pool.Pool;
import java.io.*;
import java.awt.*;
import java.awt.image.*;
@@ -31,20 +30,10 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Ross Burton</a>
- * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/02/21 23:42:54 $
+ * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/02/22 17:10:45 $
*/
-public class SVGSerializer extends SVGBuilder implements Composer,
Serializer, Configurable, PoolClient {
+public class SVGSerializer extends SVGBuilder implements Composer,
Serializer, Configurable, Poolable {
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
-
/** The <code>ContentHandler</code> receiving SAX events. */
private ContentHandler contentHandler=null;
/** The <code>LexicalHandler</code> receiving SAX events. */
@@ -68,7 +57,7 @@
public void setOutputStream(OutputStream out) {
this.output = new BufferedOutputStream(out);
}
-
+
/**
* Set the configurations for this serializer.
*/
@@ -78,7 +67,7 @@
// TODO: take the mime type and create a transcoder from it
// allow the parameter "transcoder" to override it however
String transcoderName = null; // TODO: whatever the factory will say
it is
-
+
// Iterate through the parameters, looking for a transcoder reference
for (Iterator i = conf.getChildren("parameter"); i.hasNext(); ) {
Configuration paramConf = (Configuration)i.next();
@@ -131,7 +120,7 @@
// Assume String, and get the value. Allow an empty
string.
value = paramConf.getValue("");
}
- // TODO: if (logger.isDebug())
+ // TODO: if (logger.isDebug())
log.debug("SVG Serializer: adding hint \"" + name + "\" with
value \"" + value.toString() + "\"");
transcoder.addTranscodingHint(key, value);
} catch (ClassCastException ex) {
1.1.2.10 +3 -14
xml-cocoon/src/org/apache/cocoon/serialization/Attic/TextSerializer.java
Index: TextSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/TextSerializer.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- TextSerializer.java 2001/02/20 21:06:47 1.1.2.9
+++ TextSerializer.java 2001/02/22 17:10:45 1.1.2.10
@@ -14,29 +14,18 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.OutputKeys;
-import org.apache.avalon.util.pool.Pool;
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/20 21:06:47 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/02/22 17:10:45 $
*/
-public class TextSerializer extends AbstractTextSerializer implements
PoolClient {
+public class TextSerializer extends AbstractTextSerializer implements
Poolable {
private TransformerHandler handler;
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
public TextSerializer() {
}
1.1.2.14 +3 -14
xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java
Index: XMLSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- XMLSerializer.java 2001/02/20 21:06:47 1.1.2.13
+++ XMLSerializer.java 2001/02/22 17:10:46 1.1.2.14
@@ -14,29 +14,18 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.OutputKeys;
-import org.apache.avalon.util.pool.Pool;
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/02/20 21:06:47 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/02/22 17:10:46 $
*/
-public class XMLSerializer extends AbstractTextSerializer implements
PoolClient {
+public class XMLSerializer extends AbstractTextSerializer implements
Poolable {
private TransformerHandler handler;
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
public XMLSerializer() {
}
No revision
No revision
1.1.2.24 +3 -3
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java
Index: AbstractSitemap.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- AbstractSitemap.java 2001/02/19 21:57:49 1.1.2.23
+++ AbstractSitemap.java 2001/02/22 17:10:51 1.1.2.24
@@ -25,6 +25,7 @@
import org.apache.avalon.Configuration;
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.ComponentNotFoundException;
+import org.apache.avalon.AbstractLoggable;
import org.apache.cocoon.CocoonComponentSelector;
import org.apache.cocoon.ProcessingException;
@@ -32,7 +33,6 @@
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.components.classloader.RepositoryClassLoader;
-import
org.apache.cocoon.components.language.generator.AbstractCompiledComponent;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.util.ClassUtils;
@@ -42,9 +42,9 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/02/19 21:57:49 $
+ * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/02/22 17:10:51 $
*/
-public abstract class AbstractSitemap extends AbstractCompiledComponent
implements Sitemap {
+public abstract class AbstractSitemap extends AbstractLoggable implements
Sitemap {
private Context context;
private static final int BYTE_ARRAY_SIZE = 1024;
1.1.2.22 +17 -32
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourcePipeline.java
Index: ResourcePipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourcePipeline.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- ResourcePipeline.java 2001/02/19 21:57:50 1.1.2.21
+++ ResourcePipeline.java 2001/02/22 17:10:52 1.1.2.22
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.sitemap;
-import java.util.Vector;
+import java.util.ArrayList;
import java.io.IOException;
import java.io.OutputStream;
@@ -26,7 +26,6 @@
import org.apache.cocoon.transformation.Transformer;
import org.apache.cocoon.serialization.Serializer;
import org.apache.cocoon.xml.XMLProducer;
-import org.apache.cocoon.PoolClient;
import org.apache.cocoon.Roles;
import org.apache.cocoon.sitemap.ErrorNotifier;
@@ -36,7 +35,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/02/19 21:57:50 $
+ * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/02/22 17:10:52 $
*/
public class ResourcePipeline implements Composer {
private Generator generator;
@@ -48,9 +47,9 @@
private String readerSource;
private String readerMimeType;
private String sitemapReaderMimeType;
- private Vector transformers = new Vector();
- private Vector transformerParams = new Vector();
- private Vector transformerSources = new Vector();
+ private ArrayList transformers = new ArrayList();
+ private ArrayList transformerParams = new ArrayList();
+ private ArrayList transformerSources = new ArrayList();
private Serializer serializer;
private Parameters serializerParam;
private String serializerSource;
@@ -146,10 +145,7 @@
reader.setOutputStream (environment.getOutputStream());
reader.generate();
- if (reader instanceof PoolClient) {
- ((PoolClient)reader).returnToPool();
- }
-
+ ((ComponentSelector)
this.manager.lookup(Roles.READERS)).release((Component) reader);
} else {
throw new ProcessingException ("Generator or Reader not
specified");
}
@@ -161,23 +157,18 @@
if (generatorException != null) {
((ErrorNotifier)this.generator).setException
(generatorException);
}
- int i = transformers.size();
- Transformer myTransformer[] = new Transformer[i];
- int num_transformers = 0;
- for (num_transformers=0; num_transformers < i;
num_transformers++) {
- myTransformer[num_transformers] = (Transformer)
transformers.elementAt (num_transformers);
- }
+ Transformer myTransformer[] = (Transformer [])
transformers.toArray(new Transformer[] {});
this.generator.setup ((EntityResolver) environment,
environment.getObjectModel(), generatorSource, generatorParam);
Transformer transformer = null;
XMLProducer producer = this.generator;
- for (int j=0; j < i; j++) {
- myTransformer[j].setup ((EntityResolver) environment,
environment.getObjectModel(),
- (String)transformerSources.elementAt (j),
- (Parameters)transformerParams.elementAt (j));
- producer.setConsumer (myTransformer[j]);
- producer = myTransformer[j];
+ for (int i = 0; i < myTransformer.length; i++) {
+ myTransformer[i].setup ((EntityResolver) environment,
environment.getObjectModel(),
+ (String)transformerSources.get (i),
+ (Parameters)transformerParams.get (i));
+ producer.setConsumer (myTransformer[i]);
+ producer = myTransformer[i];
}
mime_type = this.serializer.getMimeType();
@@ -195,19 +186,13 @@
producer.setConsumer (this.serializer);
this.generator.generate();
- if (generator instanceof PoolClient) {
- ((PoolClient)generator).returnToPool();
- }
+ ((ComponentSelector)
this.manager.lookup(Roles.GENERATORS)).release((Component) generator);
- for (int j=0; j < i; j++) {
- if (myTransformer[j] instanceof PoolClient) {
- ((PoolClient)myTransformer[j]).returnToPool();
- }
+ for (int i = 0; i < myTransformer.length; i++) {
+ ((ComponentSelector)
this.manager.lookup(Roles.TRANSFORMERS)).release((Component) myTransformer[i]);
}
- if (serializer instanceof PoolClient) {
- ((PoolClient)serializer).returnToPool();
- }
+ ((ComponentSelector)
this.manager.lookup(Roles.SERIALIZERS)).release((Component) serializer);
}
return true;
}
No revision
No revision
1.1.2.8 +2 -12
xml-cocoon/src/org/apache/cocoon/transformation/Attic/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/I18nTransformer.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- I18nTransformer.java 2001/02/19 15:58:10 1.1.2.7
+++ I18nTransformer.java 2001/02/22 17:10:54 1.1.2.8
@@ -14,13 +14,12 @@
import org.apache.cocoon.acting.LangSelect;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
import org.apache.avalon.Parameters;
import org.apache.avalon.Loggable;
-import org.apache.avalon.util.pool.Pool;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
@@ -102,8 +101,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Lassi Immonen</a>
*/
-public class I18nTransformer extends AbstractTransformer implements
Composer, PoolClient {
- private Pool pool;
+public class I18nTransformer extends AbstractTransformer implements
Composer, Poolable {
protected ComponentManager manager;
@@ -127,14 +125,6 @@
protected boolean translate = false;
protected boolean is_element = false;
protected String lang;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
/**
* Uses <code>org.apache.cocoon.acting.LangSelect.getLang()</code>
1.1.2.15 +3 -14
xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java
Index: LogTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/LogTransformer.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- LogTransformer.java 2001/02/19 15:58:11 1.1.2.14
+++ LogTransformer.java 2001/02/22 17:10:55 1.1.2.15
@@ -8,10 +8,9 @@
package org.apache.cocoon.transformation;
import org.apache.avalon.Parameters;
-import org.apache.avalon.util.pool.Pool;
+import org.apache.avalon.Poolable;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.PoolClient;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
@@ -47,12 +46,10 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/02/19 15:58:11 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/02/22 17:10:55 $
*
*/
-public class LogTransformer extends AbstractTransformer implements
PoolClient {
- private Pool pool;
-
+public class LogTransformer extends AbstractTransformer implements Poolable {
/** Wether we are forwarding XML data or not. */
private boolean canReset=true;
@@ -68,14 +65,6 @@
private boolean append = false;
/** BEGIN SitemapComponent methods **/
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
public void setup(EntityResolver resolver, Map objectModel,
String source, Parameters parameters)
1.1.2.20 +12 -20
xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/SQLTransformer.java,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- SQLTransformer.java 2001/02/19 15:58:11 1.1.2.19
+++ SQLTransformer.java 2001/02/22 17:10:55 1.1.2.20
@@ -19,23 +19,22 @@
import java.util.Map;
import java.util.Enumeration;
+import org.apache.log.Logger;
+import org.apache.avalon.Loggable;
import org.apache.avalon.Parameters;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.ComponentSelector;
import org.apache.avalon.Composer;
-import org.apache.avalon.util.pool.Pool;
+import org.apache.avalon.Poolable;
+import org.apache.avalon.util.datasource.DataSourceComponent;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Roles;
-import org.apache.cocoon.PoolClient;
-import org.apache.avalon.util.datasource.DataSourceComponent;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
import org.apache.cocoon.util.ClassUtils;
-import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
-
import org.xml.sax.ContentHandler;
import org.xml.sax.EntityResolver;
import org.xml.sax.Attributes;
@@ -49,10 +48,10 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/02/19 15:58:11 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/02/22 17:10:55 $ $Author:
bloritsch $
*/
-public class SQLTransformer extends AbstractTransformer implements Composer,
Loggable, PoolClient {
+public class SQLTransformer extends AbstractTransformer implements Composer,
Loggable, Poolable {
private Logger log;
@@ -106,16 +105,6 @@
protected ComponentSelector dbSelector = null;
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
-
public void compose(ComponentManager manager) {
try {
this.dbSelector = (ComponentSelector)
manager.lookup(Roles.DB_CONNECTION);
@@ -528,9 +517,10 @@
}
}
String query = sb.toString();
+ DataSourceComponent datasource = null;
try {
if (connection != null) {
- DataSourceComponent datasource = (DataSourceComponent)
dbSelector.select(connection);
+ datasource = (DataSourceComponent)
dbSelector.select(connection);
conn = datasource.getConnection();
} else {
if (username == null || password == null) {
@@ -549,10 +539,12 @@
}
} catch (SQLException e) {
log.error("Caught a SQLException", e);
- conn.close();
throw e;
} catch (ComponentManagerException cme) {
log.error("Could not use connection: " + connection, cme);
+ } finally {
+ conn.close();
+ if (datasource != null) dbSelector.release(datasource);
}
}
1.1.2.8 +3 -14
xml-cocoon/src/org/apache/cocoon/transformation/Attic/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/TraxTransformer.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- TraxTransformer.java 2001/02/19 15:58:11 1.1.2.7
+++ TraxTransformer.java 2001/02/22 17:10:56 1.1.2.8
@@ -25,14 +25,13 @@
import org.apache.avalon.Composer;
import org.apache.avalon.Configurable;
import org.apache.avalon.Configuration;
-import org.apache.avalon.util.pool.Pool;
+import org.apache.avalon.Poolable;
import org.apache.avalon.Recyclable;
import org.apache.avalon.Parameters;
import org.apache.avalon.Loggable;
import org.apache.cocoon.Constants;
import org.apache.cocoon.Roles;
-import org.apache.cocoon.PoolClient;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.xml.XMLConsumer;
@@ -59,10 +58,10 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/19 15:58:11 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/22 17:10:56 $
*/
public class TraxTransformer extends ContentHandlerWrapper
-implements Transformer, Composer, PoolClient, Recyclable, Configurable {
+implements Transformer, Composer, Poolable, Recyclable, Configurable {
private static String FILE = "file:/";
/** The store service instance */
@@ -76,16 +75,6 @@
/** Is the store turned on? (default is on) */
private boolean useStore = true;
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
TransformerHandler getTransformerHandler(EntityResolver resolver, String
xsluri)
throws SAXException, ProcessingException, IOException,
TransformerConfigurationException
1.1.2.19 +3 -14
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XIncludeTransformer.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- XIncludeTransformer.java 2001/02/19 15:58:11 1.1.2.18
+++ XIncludeTransformer.java 2001/02/22 17:10:56 1.1.2.19
@@ -30,8 +30,7 @@
import org.apache.avalon.Composer;
import org.apache.avalon.Loggable;
import org.apache.avalon.AbstractLoggable;
-import org.apache.avalon.util.pool.Pool;
-import org.apache.cocoon.PoolClient;
+import org.apache.avalon.Poolable;
import org.apache.cocoon.Roles;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.parser.Parser;
@@ -49,9 +48,9 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/02/19 15:58:11 $ $Author:
bloritsch $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/02/22 17:10:56 $ $Author:
bloritsch $
*/
-public class XIncludeTransformer extends AbstractTransformer implements
Composer, PoolClient {
+public class XIncludeTransformer extends AbstractTransformer implements
Composer, Poolable {
protected URLFactory urlFactory;
@@ -82,16 +81,6 @@
protected String last_xmlbase_element_name = "";
protected Stack xmlbase_element_name_stack = new Stack();
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
public void setup(EntityResolver resolver, Map objectModel,
String source, Parameters parameters)
1.1.2.13 +5 -17
xml-cocoon/src/org/apache/cocoon/transformation/Attic/XTTransformer.java
Index: XTTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/XTTransformer.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- XTTransformer.java 2001/02/19 15:58:11 1.1.2.12
+++ XTTransformer.java 2001/02/22 17:10:57 1.1.2.13
@@ -16,15 +16,17 @@
import javax.servlet.http.HttpServletRequest;
+import org.apache.log.Logger;
+import org.apache.avalon.Loggable;
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
import org.apache.avalon.Modifiable;
import org.apache.avalon.Parameters;
+import org.apache.avalon.Poolable;
import org.apache.cocoon.Constants;
import org.apache.cocoon.Roles;
-import org.apache.cocoon.PoolClient;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.DocumentHandlerAdapter;
@@ -65,18 +67,14 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.log.Logger;
-import org.apache.avalon.Loggable;
-import org.apache.avalon.util.pool.Pool;
-
/**
* This Transformer use the XT processor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Sahuc Sebastien</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/02/19 15:58:11 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/02/22 17:10:57 $
*/
public class XTTransformer extends DocumentHandlerWrapper
-implements Transformer, Composer, Loggable, PoolClient {
+implements Transformer, Composer, Loggable, Poolable {
private Logger log;
/** The component manager */
@@ -90,16 +88,6 @@
/**The DocumentHandler */
private DocumentHandler docHandler = null;
-
- private Pool pool;
-
- public void setPool(Pool pool) {
- this.pool = pool;
- }
-
- public void returnToPool() {
- this.pool.put(this);
- }
public void setLogger(Logger logger) {
if (this.log == null) {
