Author: cziegeler
Date: Thu Feb 10 07:00:57 2005
New Revision: 153227
URL: http://svn.apache.org/viewcvs?view=rev&rev=153227
Log:
pool-min and pool-grow have been removed from pooling long time ago in excalibur
Modified:
cocoon/trunk/src/blocks/deli/conf/deli.xmap
cocoon/trunk/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java
cocoon/trunk/src/blocks/html/java/org/apache/cocoon/generation/NekoHTMLGenerator.java
cocoon/trunk/src/blocks/linotype/samples/sitemap.xmap
cocoon/trunk/src/blocks/mail/samples/sendmail/sitemap.xmap
cocoon/trunk/src/blocks/portal/samples/sitemap.xmap
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/transformation/IncludeTransformer.java
cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/sitemap.xmap
cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/aggr.xml
cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/op2aggr.xml
cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/smaggr.xml
cocoon/trunk/src/blocks/session-fw/WEB-INF/xconf/cocoon-session-fw.xconf
cocoon/trunk/src/blocks/session-fw/conf/session-tran.xmap
cocoon/trunk/src/blocks/taglib/samples/sitemap.xmap
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
cocoon/trunk/src/blocks/webdav/samples/davmap/sitemap.xmap
cocoon/trunk/src/blocks/xsp/conf/xsp-action.xmap
cocoon/trunk/src/blocks/xsp/conf/xsp-generator.xmap
cocoon/trunk/src/documentation/sitemap-localdocs.xmap
cocoon/trunk/src/documentation/sitemap.xmap
cocoon/trunk/src/documentation/xdocs/developing/avalon.xml
cocoon/trunk/src/documentation/xdocs/faq/faq-serializers.xml
cocoon/trunk/src/documentation/xdocs/snippet/snippet-xslt-options.xml
cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-generator.xml
cocoon/trunk/src/documentation/xdocs/userdocs/matchers/wildcarduri-matcher.xml
cocoon/trunk/src/documentation/xdocs/userdocs/readers/database-reader.xml
cocoon/trunk/src/documentation/xdocs/userdocs/readers/image-reader.xml
cocoon/trunk/src/documentation/xdocs/userdocs/readers/readers.template
cocoon/trunk/src/documentation/xdocs/userdocs/readers/resource-reader.xml
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/html-serializer.xml
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/svgxml-serializer.xml
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/xhtml-serializer.xml
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/xml-serializer.xml
cocoon/trunk/src/java/org/apache/cocoon/generation/DirectoryGenerator.java
cocoon/trunk/src/java/org/apache/cocoon/generation/FileGenerator.java
cocoon/trunk/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
cocoon/trunk/src/java/org/apache/cocoon/generation/RequestGenerator.java
cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java
cocoon/trunk/src/java/org/apache/cocoon/generation/StreamGenerator.java
cocoon/trunk/src/java/org/apache/cocoon/serialization/HTMLSerializer.java
cocoon/trunk/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
cocoon/trunk/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
cocoon/trunk/src/java/org/apache/cocoon/transformation/LogTransformer.java
cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java
cocoon/trunk/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf
cocoon/trunk/src/webapp/sitemap.xmap
cocoon/trunk/tools/src/anttasks/PoolSetterTask.java
cocoon/trunk/tools/src/anttasks/SitemapTask.java
Modified: cocoon/trunk/src/blocks/deli/conf/deli.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/deli/conf/deli.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/deli/conf/deli.xmap (original)
+++ cocoon/trunk/src/blocks/deli/conf/deli.xmap Thu Feb 10 07:00:57 2005
@@ -16,7 +16,7 @@
-->
<xmap xpath="/sitemap/components/transformers" unless="[EMAIL
PROTECTED]'deli']">
- <map:transformer name="deli" logger="sitemap.transformer.deli"
pool-grow="2" pool-max="32" pool-min="8"
src="org.apache.cocoon.transformation.DeliTransformer">
+ <map:transformer name="deli" logger="sitemap.transformer.deli"
pool-max="32" src="org.apache.cocoon.transformation.DeliTransformer">
<use-request-parameters>false</use-request-parameters>
<use-session-parameters>false</use-session-parameters>
<use-cookie-parameters>false</use-cookie-parameters>
Modified:
cocoon/trunk/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java
(original)
+++
cocoon/trunk/src/blocks/html/java/org/apache/cocoon/generation/HTMLGenerator.java
Thu Feb 10 07:00:57 2005
@@ -62,16 +62,14 @@
* @cocoon.sitemap.component.documentation.caching
* Uses the last modification date of the xml document for
validation
*
- * @cocoon.sitemap.component.pooling.min 4
* @cocoon.sitemap.component.pooling.max 32
- * @cocoon.sitemap.component.pooling.grow 4
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Gianugo Rabellino</a>
*
- * @version CVS $Id: HTMLGenerator.java,v 1.14 2004/06/24 11:31:38 cziegeler
Exp $
+ * @version CVS $Id$
*/
public class HTMLGenerator extends ServiceableGenerator
implements Configurable, CacheableProcessingComponent, Disposable {
Modified:
cocoon/trunk/src/blocks/html/java/org/apache/cocoon/generation/NekoHTMLGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/html/java/org/apache/cocoon/generation/NekoHTMLGenerator.java?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/blocks/html/java/org/apache/cocoon/generation/NekoHTMLGenerator.java
(original)
+++
cocoon/trunk/src/blocks/html/java/org/apache/cocoon/generation/NekoHTMLGenerator.java
Thu Feb 10 07:00:57 2005
@@ -64,16 +64,14 @@
* @cocoon.sitemap.component.documentation.caching
* Uses the last modification date of the xml document for
validation
*
- * @cocoon.sitemap.component.pooling.min 4
* @cocoon.sitemap.component.pooling.max 32
- * @cocoon.sitemap.component.pooling.grow 4
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Gianugo Rabellino</a>
*
- * @version CVS $Id: NekoHTMLGenerator.java,v 1.2 2004/07/08 12:04:08
upayavira Exp $
+ * @version CVS $Id$
*/
public class NekoHTMLGenerator extends ServiceableGenerator
implements Configurable, CacheableProcessingComponent, Disposable {
Modified: cocoon/trunk/src/blocks/linotype/samples/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/linotype/samples/sitemap.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/linotype/samples/sitemap.xmap (original)
+++ cocoon/trunk/src/blocks/linotype/samples/sitemap.xmap Thu Feb 10 07:00:57
2005
@@ -25,22 +25,22 @@
<map:generator name="file"
src="org.apache.cocoon.generation.FileGenerator"
label="content" logger="sitemap.generator.file"
- pool-min="1" pool-grow="1" pool-max="8"
+ pool-max="8"
/>
<map:generator name="directory"
src="org.apache.cocoon.generation.DirectoryGenerator"
label="content" logger="sitemap.generator.file"
- pool-min="1" pool-grow="1" pool-max="8"
+ pool-max="8"
/>
<map:generator name="request"
src="org.apache.cocoon.generation.RequestGenerator"
label="content" logger="sitemap.generator.request"
- pool-min="1" pool-grow="1" pool-max="4"
+ pool-max="4"
/>
<map:generator name="jx"
src="org.apache.cocoon.generation.JXTemplateGenerator"
label="content" logger="sitemap.generator.jx"
- pool-min="1" pool-grow="1" pool-max="8"
+ pool-max="8"
/>
<map:generator name="notifying"
src="org.apache.cocoon.sitemap.NotifyingGenerator"/>
</map:generators>
@@ -49,7 +49,7 @@
<map:transformer name="xslt"
src="org.apache.cocoon.transformation.TraxTransformer"
logger="sitemap.transformer.xslt"
- pool-min="2" pool-grow="2" pool-max="8"
+ pool-max="8"
>
<use-request-parameters>false</use-request-parameters>
<use-session-parameters>false</use-session-parameters>
@@ -66,12 +66,12 @@
<map:transformer name="cinclude"
src="org.apache.cocoon.transformation.CIncludeTransformer"
logger="sitemap.transformer.cinclude"
- pool-min="2" pool-grow="2" pool-max="8"
+ pool-max="8"
/>
<map:transformer name="jx"
src="org.apache.cocoon.transformation.JXTemplateTransformer"
logger="sitemap.transformer.jx"
- pool-min="2" pool-grow="2" pool-max="8"
+ pool-max="8"
/>
</map:transformers>
@@ -87,7 +87,7 @@
<map:serializer name="html" mime-type="text/html"
src="org.apache.cocoon.serialization.HTMLSerializer"
logger="sitemap.serializer.html"
- pool-min="1" pool-grow="1" pool-max="8"
+ pool-max="8"
>
<buffer-size>1024</buffer-size>
<encoding>ISO-8859-1</encoding>
@@ -95,14 +95,14 @@
<map:serializer name="xhtml" mime-type="text/html"
src="org.apache.cocoon.serialization.XMLSerializer"
logger="sitemap.serializer.xhtml"
- pool-min="1" pool-grow="1" pool-max="8"
+ pool-max="8"
>
<doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
<doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
<buffer-size>1024</buffer-size>
<encoding>ISO-8859-1</encoding>
</map:serializer>
- <map:serializer logger="sitemap.serializer.rss" mime-type="text/rss"
name="rss" pool-grow="2" pool-max="10" pool-min="2"
src="org.apache.cocoon.serialization.XMLSerializer">
+ <map:serializer logger="sitemap.serializer.rss" mime-type="text/rss"
name="rss" pool-max="10" src="org.apache.cocoon.serialization.XMLSerializer">
<doctype-system>http://my.netscape.com/publish/formats/rss-0.91.dtd</doctype-system>
<encoding>ISO-8859-1</encoding>
</map:serializer>
@@ -112,12 +112,12 @@
<map:reader name="resource"
src="org.apache.cocoon.reading.ResourceReader"
logger="sitemap.reader.resource"
- pool-min="1" pool-grow="1" pool-max="8"
+ pool-max="8"
/>
<map:reader name="image"
src="org.apache.cocoon.reading.ImageReader"
logger="sitemap.reader.image"
- pool-min="1" pool-grow="1" pool-max="8"
+ pool-max="8"
/>
</map:readers>
Modified: cocoon/trunk/src/blocks/mail/samples/sendmail/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/mail/samples/sendmail/sitemap.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/mail/samples/sendmail/sitemap.xmap (original)
+++ cocoon/trunk/src/blocks/mail/samples/sendmail/sitemap.xmap Thu Feb 10
07:00:57 2005
@@ -52,7 +52,7 @@
<map:transformers default="xslt">
<map:transformer logger="sitemap.transformer.simpleform"
name="simpleform"
- pool-grow="2" pool-max="32" pool-min="8"
+ pool-max="32"
src="org.apache.cocoon.transformation.SimpleFormTransformer"/>
</map:transformers>
</map:components>
Modified: cocoon/trunk/src/blocks/portal/samples/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/samples/sitemap.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/portal/samples/sitemap.xmap (original)
+++ cocoon/trunk/src/blocks/portal/samples/sitemap.xmap Thu Feb 10 07:00:57 2005
@@ -50,7 +50,7 @@
<map:serializer name="html-include"
logger="sitemap.serializer.html"
mime-type="text/html"
- pool-grow="4" pool-max="32" pool-min="4"
+ pool-max="32"
src="org.apache.cocoon.portal.serialization.IncludingHTMLSerializer">
<doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
<doctype-system>http://www.w3.org/TR/html4/loose.dtd</doctype-system>
Modified:
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/transformation/IncludeTransformer.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/transformation/IncludeTransformer.java?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/transformation/IncludeTransformer.java
(original)
+++
cocoon/trunk/src/blocks/scratchpad/java/org/apache/cocoon/transformation/IncludeTransformer.java
Thu Feb 10 07:00:57 2005
@@ -111,9 +111,7 @@
* @cocoon.sitemap.component.name include
* @cocoon.sitemap.component.logger sitemap.transformer.include
*
- * @cocoon.sitemap.component.pooling.min 2
* @cocoon.sitemap.component.pooling.max 16
- * @cocoon.sitemap.component.pooling.grow 2
*/
public class IncludeTransformer extends AbstractTransformer
implements Serviceable, Configurable,
Modified: cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/sitemap.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/sitemap.xmap
(original)
+++ cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/sitemap.xmap Thu
Feb 10 07:00:57 2005
@@ -22,7 +22,7 @@
<map:serializers default="html">
<map:serializer name="xhtml-transitional"
src="org.apache.cocoon.serialization.XMLSerializer" mime-type="text/html"
logger="sitemap.serializer.xhtml"
- pool-grow="2" pool-max="64" pool-min="2">
+ pool-max="64">
<doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
<doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
<encoding>UTF-8</encoding>
Modified: cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/aggr.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/aggr.xml?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/aggr.xml
(original)
+++ cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/aggr.xml Thu
Feb 10 07:00:57 2005
@@ -43,8 +43,8 @@
<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<map:generators default="file">
<map:generator label="content,data" name="xsp"
src="org.apache.cocoon.generation.ServerPagesGenerator"/>
- <map:generator label="content,data"
logger="sitemap.generator.file" name="file" pool-grow="4" pool-max="32"
pool-min="8" src="org.apache.cocoon.generation.FileGenerator"/>
- <map:generator label="content,data"
logger="sitemap.generator.serverpages" name="serverpages" pool-grow="2"
pool-max="32" pool-min="4"
src="org.apache.cocoon.generation.ServerPagesGenerator"/>
+ <map:generator label="content,data"
logger="sitemap.generator.file" name="file" pool-max="32"
src="org.apache.cocoon.generation.FileGenerator"/>
+ <map:generator label="content,data"
logger="sitemap.generator.serverpages" name="serverpages" pool-max="32"
src="org.apache.cocoon.generation.ServerPagesGenerator"/>
</map:generators>
<map:transformers default="xslt"/>
<map:readers default="resource"/>
Modified:
cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/op2aggr.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/op2aggr.xml?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/op2aggr.xml
(original)
+++ cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/op2aggr.xml
Thu Feb 10 07:00:57 2005
@@ -27,8 +27,8 @@
<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<map:generators default="file">
<map:generator label="content,data" name="xsp"
src="org.apache.cocoon.generation.ServerPagesGenerator"/>
- <map:generator label="content,data"
logger="sitemap.generator.file" name="file" pool-grow="4" pool-max="32"
pool-min="8" src="org.apache.cocoon.generation.FileGenerator"/>
- <map:generator label="content,data"
logger="sitemap.generator.serverpages" name="serverpages" pool-grow="2"
pool-max="32" pool-min="4"
src="org.apache.cocoon.generation.ServerPagesGenerator"/>
+ <map:generator label="content,data"
logger="sitemap.generator.file" name="file" pool-max="32"
src="org.apache.cocoon.generation.FileGenerator"/>
+ <map:generator label="content,data"
logger="sitemap.generator.serverpages" name="serverpages" pool-max="32"
src="org.apache.cocoon.generation.ServerPagesGenerator"/>
</map:generators>
<map:transformers default="xslt"/>
<map:readers default="resource"/>
Modified:
cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/smaggr.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/smaggr.xml?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/smaggr.xml
(original)
+++ cocoon/trunk/src/blocks/scratchpad/samples/sitemap-viewer/xml/smaggr.xml
Thu Feb 10 07:00:57 2005
@@ -21,8 +21,8 @@
<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<map:generators default="file">
<map:generator label="content,data" name="xsp"
src="org.apache.cocoon.generation.ServerPagesGenerator"/>
- <map:generator label="content,data"
logger="sitemap.generator.file" name="file" pool-grow="4" pool-max="32"
pool-min="8" src="org.apache.cocoon.generation.FileGenerator"/>
- <map:generator label="content,data"
logger="sitemap.generator.serverpages" name="serverpages" pool-grow="2"
pool-max="32" pool-min="4"
src="org.apache.cocoon.generation.ServerPagesGenerator"/>
+ <map:generator label="content,data"
logger="sitemap.generator.file" name="file" pool-max="32"
src="org.apache.cocoon.generation.FileGenerator"/>
+ <map:generator label="content,data"
logger="sitemap.generator.serverpages" name="serverpages" pool-max="32"
src="org.apache.cocoon.generation.ServerPagesGenerator"/>
</map:generators>
<map:transformers default="xslt"/>
<map:readers default="resource"/>
Modified:
cocoon/trunk/src/blocks/session-fw/WEB-INF/xconf/cocoon-session-fw.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/session-fw/WEB-INF/xconf/cocoon-session-fw.xconf?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/session-fw/WEB-INF/xconf/cocoon-session-fw.xconf
(original)
+++ cocoon/trunk/src/blocks/session-fw/WEB-INF/xconf/cocoon-session-fw.xconf
Thu Feb 10 07:00:57 2005
@@ -37,7 +37,7 @@
<session-context-manager logger="core.session-manager"/>
<session-media-manager logger="core.media-manager"
- pool-max="32" pool-min="8" pool-grow="4">
+ pool-max="32">
<mediatypes default="html">
<media name="wap" useragent="Nokia"/>
<media name="wap" useragent="UP"/>
Modified: cocoon/trunk/src/blocks/session-fw/conf/session-tran.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/session-fw/conf/session-tran.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/session-fw/conf/session-tran.xmap (original)
+++ cocoon/trunk/src/blocks/session-fw/conf/session-tran.xmap Thu Feb 10
07:00:57 2005
@@ -20,11 +20,11 @@
<map:transformer name="session"
src="org.apache.cocoon.webapps.session.transformation.SessionTransformer"
- pool-max="32" pool-min="8" pool-grow="4"/>
+ pool-max="32"/>
<map:transformer name="session-pre"
src="org.apache.cocoon.webapps.session.transformation.SessionPreTransformer"
- pool-max="32" pool-min="8" pool-grow="4"/>
+ pool-max="32"/>
<map:transformer name="session-post"
src="org.apache.cocoon.webapps.session.transformation.SessionPostTransformer"
- pool-max="32" pool-min="8" pool-grow="4"/>
+ pool-max="32"/>
</xmap>
Modified: cocoon/trunk/src/blocks/taglib/samples/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/taglib/samples/sitemap.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/taglib/samples/sitemap.xmap (original)
+++ cocoon/trunk/src/blocks/taglib/samples/sitemap.xmap Thu Feb 10 07:00:57 2005
@@ -19,8 +19,7 @@
<map:components>
<map:transformers default="xslt">
- <!-- FIXME: pool-min="0" because of recursive lookup & some problem in
Avalon -->
- <map:transformer name="tag"
src="org.apache.cocoon.transformation.TagTransformer" pool-max="64"
pool-min="0" pool-grow="2" logger="sitemap.transformer.newtag">
+ <map:transformer name="tag"
src="org.apache.cocoon.transformation.TagTransformer" pool-max="64"
logger="sitemap.transformer.newtag">
<transformer-hint>tag</transformer-hint>
</map:transformer>
</map:transformers>
Modified:
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
(original)
+++
cocoon/trunk/src/blocks/template/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
Thu Feb 10 07:00:57 2005
@@ -52,9 +52,7 @@
* @cocoon.sitemap.component.label content
* @cocoon.sitemap.component.logger sitemap.generator.jx
*
- * @cocoon.sitemap.component.pooling.min 2
* @cocoon.sitemap.component.pooling.max 16
- * @cocoon.sitemap.component.pooling.grow 2
*
*
* @version CVS $Id: JXTemplateGenerator.java 111658 2004-12-12 17:28:46Z
Modified: cocoon/trunk/src/blocks/webdav/samples/davmap/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/webdav/samples/davmap/sitemap.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/webdav/samples/davmap/sitemap.xmap (original)
+++ cocoon/trunk/src/blocks/webdav/samples/davmap/sitemap.xmap Thu Feb 10
07:00:57 2005
@@ -26,13 +26,12 @@
src="org.apache.cocoon.generation.TraversableSourceDescriptionGenerator"
logger="generator.traverse"
label="content"
- pool-min="2" pool-grow="2" pool-max="16"
+ pool-max="16"
/>
<map:generator name="jx"
src="org.apache.cocoon.generation.JXTemplateGenerator"
logger="generator.jx"
- label="content"
- pool-min="2" pool-grow="2" pool-max="16"
+ pool-max="16"
/>
</map:generators>
@@ -41,7 +40,7 @@
name="spw"
src="org.apache.cocoon.transformation.SourcePropsWritingTransformer"
logger="transformer.spw"
- pool-min="2" pool-grow="2" pool-max="16"
+ pool-max="16"
/>
</map:transformers>
Modified: cocoon/trunk/src/blocks/xsp/conf/xsp-action.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/conf/xsp-action.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/xsp/conf/xsp-action.xmap (original)
+++ cocoon/trunk/src/blocks/xsp/conf/xsp-action.xmap Thu Feb 10 07:00:57 2005
@@ -18,6 +18,6 @@
<xmap xpath="/sitemap/components/actions"
unless="[EMAIL PROTECTED]'serverpages']">
<map:action logger="sitemap.action.serverpages" name="serverpages"
- pool-grow="2" pool-max="32" pool-min="4"
+ pool-max="32"
src="org.apache.cocoon.acting.ServerPagesAction"/>
</xmap>
Modified: cocoon/trunk/src/blocks/xsp/conf/xsp-generator.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/conf/xsp-generator.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/blocks/xsp/conf/xsp-generator.xmap (original)
+++ cocoon/trunk/src/blocks/xsp/conf/xsp-generator.xmap Thu Feb 10 07:00:57 2005
@@ -16,6 +16,6 @@
-->
<xmap xpath="/sitemap/components/generators" unless="[EMAIL
PROTECTED]'serverpages']">
<map:generator label="content" logger="sitemap.generator.serverpages"
name="serverpages"
- pool-grow="2" pool-max="32" pool-min="4"
+ pool-max="32"
src="org.apache.cocoon.generation.ServerPagesGenerator"/>
</xmap>
Modified: cocoon/trunk/src/documentation/sitemap-localdocs.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/sitemap-localdocs.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/documentation/sitemap-localdocs.xmap (original)
+++ cocoon/trunk/src/documentation/sitemap-localdocs.xmap Thu Feb 10 07:00:57
2005
@@ -20,7 +20,7 @@
| Ant 'docs' target is invoked, it will be renamed to sitemap.xmap in a
temporary
| context. The sitemap.xmap file here is an override of Forrest's.
|
- | CVS $Id: sitemap-localdocs.xmap,v 1.4 2004/03/06 02:25:50 antonio Exp $
+ | CVS $Id$
+-->
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
@@ -60,7 +60,7 @@
<map:pipes default="caching">
<map:pipe name="caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"
- logger="core.processing-pipeline" pool-max="32"
pool-min="8" pool-grow="4"/>
+ logger="core.processing-pipeline" pool-max="32"/>
</map:pipes>
</map:components>
Modified: cocoon/trunk/src/documentation/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/sitemap.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/documentation/sitemap.xmap (original)
+++ cocoon/trunk/src/documentation/sitemap.xmap Thu Feb 10 07:00:57 2005
@@ -56,7 +56,7 @@
</map:transformer>
<map:transformer name="xpath" logger="sitemap.transformer.xpath"
src="org.apache.cocoon.transformation.XPathTransformer" />
- <map:transformer name="xslt"
src="org.apache.cocoon.transformation.TraxTransformer"
logger="sitemap.transformer.xslt" pool-max="32" pool-min="8" pool-grow="2">
+ <map:transformer name="xslt"
src="org.apache.cocoon.transformation.TraxTransformer"
logger="sitemap.transformer.xslt" pool-max="32">
<use-request-parameters>false</use-request-parameters>
<use-browser-capabilities-db>false</use-browser-capabilities-db>
<use-deli>false</use-deli>
@@ -65,7 +65,7 @@
<!--<transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory>-->
</map:transformer>
- <map:transformer name="xinclude"
src="org.apache.cocoon.transformation.XIncludeTransformer"
logger="sitemap.transformer.xinclude" pool-grow="2" pool-max="16" pool-min="2"
/>
+ <map:transformer name="xinclude"
src="org.apache.cocoon.transformation.XIncludeTransformer"
logger="sitemap.transformer.xinclude" pool-max="16"/>
</map:transformers>
<map:readers default="resource">
Modified: cocoon/trunk/src/documentation/xdocs/developing/avalon.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/developing/avalon.xml?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/developing/avalon.xml (original)
+++ cocoon/trunk/src/documentation/xdocs/developing/avalon.xml Thu Feb 10
07:00:57 2005
@@ -122,27 +122,20 @@
<s2 title="Pooling configuration">
<p>Avalon now incorporates a couple of modifiers for a Component
definition that allows you to control the number of Components in a
- pool, and how quickly it grows. This is especially helpful in Cocoon
+ pool. This is especially helpful in Cocoon
where the defaults don't always work well.</p>
- <p>The magic attributes are "pool-min", "pool-max", and "pool-grow".
+ <p>The magic attribute is "pool-max".
The defaults are:</p>
<ol>
<li>pool-max: 8</li>
- <li>pool-min: 2</li>
- <li>pool-grow: pool-min (2)</li>
</ol>
<p>What this means is that the pool for the default component initially
- contains 2 instances. If demand exceeds this then the pool will
- increase, two components at a time, up to 8 instances. Beyond that
the
+ contains zero instances. If demand exceeds this then the pool will
+ increase, one component at a time, up to 8 instances. Beyond that the
pool turns into a factory. That is, new <code>Component</code>
instances are created, but destroyed when they are returned. This is
a
performance issue - but it does manage the number of instances
available at one time.</p>
- <p>Please note that if not specified, "pool-grow" always matches
- "pool-min". If not specified "pool-min" always equals "2". If you
- specify the minimum to be higher than the maximum, then the maximum
- will match the minimum, and the pool will be completely filled on
- initialization.</p>
</s2>
</s1>
</body>
Modified: cocoon/trunk/src/documentation/xdocs/faq/faq-serializers.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/faq/faq-serializers.xml?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/faq/faq-serializers.xml (original)
+++ cocoon/trunk/src/documentation/xdocs/faq/faq-serializers.xml Thu Feb 10
07:00:57 2005
@@ -54,7 +54,7 @@
<map:serializer name="xhtml" mime-type="text/html"
logger="sitemap.serializer.xhtml"
src="org.apache.cocoon.serialization.XMLSerializer"
- pool-max="64" pool-min="2" pool-grow="2">
+ pool-max="64">
<doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
<doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
<encoding>UTF-8</encoding>
Modified: cocoon/trunk/src/documentation/xdocs/snippet/snippet-xslt-options.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/snippet/snippet-xslt-options.xml?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/snippet/snippet-xslt-options.xml
(original)
+++ cocoon/trunk/src/documentation/xdocs/snippet/snippet-xslt-options.xml Thu
Feb 10 07:00:57 2005
@@ -87,7 +87,7 @@
name="xslt-notinc"
src="org.apache.cocoon.transformation.TraxTransformer"
logger="sitemap.transformer.xslt"
- pool-max="32" pool-min="8" pool-grow="2">
+ pool-max="32">
<use-request-parameters>false</use-request-parameters>
<use-browser-capabilities-db>false</use-browser-capabilities-db>
<use-deli>false</use-deli>
Modified: cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-generator.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-generator.xml?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-generator.xml
(original)
+++ cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-generator.xml Thu
Feb 10 07:00:57 2005
@@ -756,8 +756,7 @@
clean up any resources we held on to between invocations. Note that
components can be pooled by the container. If we thought that our
employee
generator was going to see a lot of traffic, we might change its
definition
- at the top of sitemap.xmap to include attributes like <code>pool-grow="2"
- pool-max="16" pool-min="2"</code> so that multiple overlapping requests
+ at the top of sitemap.xmap to include attributes like
<code>pool-max="16"</code> so that multiple overlapping requests
could be serviced without a log jam.</p>
</s4>
<s4 title="Datasource">
Modified:
cocoon/trunk/src/documentation/xdocs/userdocs/matchers/wildcarduri-matcher.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/userdocs/matchers/wildcarduri-matcher.xml?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/documentation/xdocs/userdocs/matchers/wildcarduri-matcher.xml
(original)
+++
cocoon/trunk/src/documentation/xdocs/userdocs/matchers/wildcarduri-matcher.xml
Thu Feb 10 07:00:57 2005
@@ -113,7 +113,7 @@
<map:matcher name="template"
src="org.apache.cocoon.matching.WildcardURIMatcher"
logger="sitemap.matcher.template"
- pool-max="32" pool-min="1" pool-grow="4"/>
+ pool-max="32"/>
</map:matcher>
...
]]></source>
Modified:
cocoon/trunk/src/documentation/xdocs/userdocs/readers/database-reader.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/userdocs/readers/database-reader.xml?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/userdocs/readers/database-reader.xml
(original)
+++ cocoon/trunk/src/documentation/xdocs/userdocs/readers/database-reader.xml
Thu Feb 10 07:00:57 2005
@@ -116,7 +116,7 @@
<map:reader name="databasereader"
src="org.apache.cocoon.reading.DatabaseReader"
logger="sitemap.reader.databasereader"
- pool-max="32" pool-min="1" pool-grow="4"/>
+ pool-max="32"/>
<!-- optional reader configuration -->
...
</map:readers>
Modified: cocoon/trunk/src/documentation/xdocs/userdocs/readers/image-reader.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/userdocs/readers/image-reader.xml?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/userdocs/readers/image-reader.xml
(original)
+++ cocoon/trunk/src/documentation/xdocs/userdocs/readers/image-reader.xml Thu
Feb 10 07:00:57 2005
@@ -98,7 +98,7 @@
<map:reader name="image"
src="org.apache.cocoon.reading.ImageReader"
logger="sitemap.reader.image"
- pool-max="32" pool-min="1" pool-grow="4"/>
+ pool-max="32"/>
<!-- optional reader configuration -->
...
</map:readers>
Modified: cocoon/trunk/src/documentation/xdocs/userdocs/readers/readers.template
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/userdocs/readers/readers.template?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/userdocs/readers/readers.template
(original)
+++ cocoon/trunk/src/documentation/xdocs/userdocs/readers/readers.template Thu
Feb 10 07:00:57 2005
@@ -90,7 +90,7 @@
<map:reader name="template"
src="org.apache.cocoon.reading.TemplateReader"
logger="sitemap.reader.template"
- pool-max="32" pool-min="1" pool-grow="4"/>
+ pool-max="32"/>
<!-- optional reader configuration -->
...
</map:readers>
Modified:
cocoon/trunk/src/documentation/xdocs/userdocs/readers/resource-reader.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/userdocs/readers/resource-reader.xml?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/userdocs/readers/resource-reader.xml
(original)
+++ cocoon/trunk/src/documentation/xdocs/userdocs/readers/resource-reader.xml
Thu Feb 10 07:00:57 2005
@@ -97,7 +97,7 @@
<map:reader name="resource"
src="org.apache.cocoon.reading.ResourceReader"
logger="sitemap.reader.resource"
- pool-max="32" pool-min="1" pool-grow="4"/>
+ pool-max="32"/>
<!-- optional reader configuration -->
...
</map:readers>
@@ -150,7 +150,7 @@
<map:reader name="resource"
src="org.apache.cocoon.reading.ResourceReader"
logger="sitemap.reader.resource"
- pool-max="32" pool-min="1" pool-grow="4"/>
+ pool-max="32"/>
<!-- optional reader configuration -->
<parameter name="expires" value="86400000"/>
</map:readers>
Modified:
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/html-serializer.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/userdocs/serializers/html-serializer.xml?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/html-serializer.xml
(original)
+++
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/html-serializer.xml
Thu Feb 10 07:00:57 2005
@@ -49,7 +49,7 @@
src="org.apache.cocoon.serialization.HTMLSerializer"
mime-type="text/html"
logger="sitemap.serializer.html"
- pool-grow="4" pool-max="32" pool-min="4">
+ pool-max="32">
<!-- serializer configurations -->
...
</map:serializer>
Modified:
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/svgxml-serializer.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/userdocs/serializers/svgxml-serializer.xml?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/svgxml-serializer.xml
(original)
+++
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/svgxml-serializer.xml
Thu Feb 10 07:00:57 2005
@@ -52,7 +52,7 @@
doctype-public="-//W3C//DTD SVG 1.0//EN"
doctype-system="http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd";;
logger="sitemap.serializer.xml"
- pool-grow="4" pool-max="32" pool-min="4">
+ pool-max="32">
<!-- serializer configurations -->
...
</map:serializer>
Modified:
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/xhtml-serializer.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/userdocs/serializers/xhtml-serializer.xml?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/xhtml-serializer.xml
(original)
+++
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/xhtml-serializer.xml
Thu Feb 10 07:00:57 2005
@@ -49,7 +49,7 @@
src="org.apache.cocoon.serialization.XMLSerializer"
mime-type="text/html"
logger="sitemap.serializer.xhtml"
- pool-grow="2" pool-max="64" pool-min="2"
+ pool-max="64"
>
<doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
<doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
Modified:
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/xml-serializer.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/userdocs/serializers/xml-serializer.xml?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/xml-serializer.xml
(original)
+++
cocoon/trunk/src/documentation/xdocs/userdocs/serializers/xml-serializer.xml
Thu Feb 10 07:00:57 2005
@@ -51,7 +51,7 @@
src="org.apache.cocoon.serialization.XMLSerializer"
mime-type="text/xml"
logger="sitemap.serializer.xml"
- pool-grow="4" pool-max="32" pool-min="4">
+ pool-max="32">
<!-- serializer configurations -->
...
</map:serializer>
Modified:
cocoon/trunk/src/java/org/apache/cocoon/generation/DirectoryGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/DirectoryGenerator.java?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/generation/DirectoryGenerator.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/generation/DirectoryGenerator.java
Thu Feb 10 07:00:57 2005
@@ -52,9 +52,7 @@
* @cocoon.sitemap.component.documentation.caching
* Uses the last modification date of the directory and the
contained files
*
- * @cocoon.sitemap.component.pooling.min 2
* @cocoon.sitemap.component.pooling.max 16
- * @cocoon.sitemap.component.pooling.grow 2
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation)
Modified: cocoon/trunk/src/java/org/apache/cocoon/generation/FileGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/FileGenerator.java?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/generation/FileGenerator.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/generation/FileGenerator.java Thu
Feb 10 07:00:57 2005
@@ -41,14 +41,12 @@
* @cocoon.sitemap.component.documentation.caching
* Uses the last modification date of the xml document for
validation
*
- * @cocoon.sitemap.component.pooling.min 8
* @cocoon.sitemap.component.pooling.max 32
- * @cocoon.sitemap.component.pooling.grow 4
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation)
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Id: FileGenerator.java,v 1.10 2004/07/02 08:33:42 antonio Exp
$
+ * @version CVS $Id$
*/
public class FileGenerator extends ServiceableGenerator
implements CacheableProcessingComponent {
Modified:
cocoon/trunk/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
Thu Feb 10 07:00:57 2005
@@ -37,14 +37,12 @@
* @cocoon.sitemap.component.documentation.caching
* Uses the last modification date of the directory and the
contained files
*
- * @cocoon.sitemap.component.pooling.min 2
* @cocoon.sitemap.component.pooling.max 16
- * @cocoon.sitemap.component.pooling.grow 2
*
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald A. Ball Jr.</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
- * @version CVS $Id: ImageDirectoryGenerator.java,v 1.3 2004/05/26 11:37:05
cziegeler Exp $
+ * @version CVS $Id$
*/
final public class ImageDirectoryGenerator extends DirectoryGenerator {
Modified:
cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Thu Feb 10 07:00:57 2005
@@ -112,9 +112,7 @@
* @cocoon.sitemap.component.label content
* @cocoon.sitemap.component.logger sitemap.generator.jx
*
- * @cocoon.sitemap.component.pooling.min 2
* @cocoon.sitemap.component.pooling.max 16
- * @cocoon.sitemap.component.pooling.grow 2
*
*
* @version CVS $Id$
Modified:
cocoon/trunk/src/java/org/apache/cocoon/generation/RequestGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/RequestGenerator.java?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/generation/RequestGenerator.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/generation/RequestGenerator.java
Thu Feb 10 07:00:57 2005
@@ -44,9 +44,7 @@
* @cocoon.sitemap.component.label content
* @cocoon.sitemap.component.logger sitemap.generator.request
*
- * @cocoon.sitemap.component.pooling.min 2
* @cocoon.sitemap.component.pooling.max 16
- * @cocoon.sitemap.component.pooling.grow 2
*
* <p>
* <b>Configuration options:</b>
@@ -65,7 +63,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Id: RequestGenerator.java,v 1.10 2004/05/26 14:11:34
cziegeler Exp $
+ * @version CVS $Id$
*/
public class RequestGenerator extends ServiceableGenerator implements
Parameterizable {
Modified:
cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java Thu
Feb 10 07:00:57 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -44,9 +44,7 @@
* @cocoon.sitemap.component.label content
* @cocoon.sitemap.component.logger sitemap.generator.status
*
- * @cocoon.sitemap.component.pooling.min 2
* @cocoon.sitemap.component.pooling.max 16
- * @cocoon.sitemap.component.pooling.grow 2
*
* Potted DTD:
*
Modified:
cocoon/trunk/src/java/org/apache/cocoon/generation/StreamGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/StreamGenerator.java?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/generation/StreamGenerator.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/generation/StreamGenerator.java Thu
Feb 10 07:00:57 2005
@@ -42,9 +42,7 @@
* @cocoon.sitemap.component.label content
* @cocoon.sitemap.component.logger sitemap.generator.stream
*
- * @cocoon.sitemap.component.pooling.min 1
* @cocoon.sitemap.component.pooling.max 16
- * @cocoon.sitemap.component.pooling.grow 2
*
* For the POST requests with a mimetype of application/x-www-form-urlencoded,
* or multipart/form-data the xml data is expected to be associated with the
@@ -63,7 +61,7 @@
* number of bytes read is equal to the getContentLength() value.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Kinga Dziembowski</a>
- * @version CVS $Id: StreamGenerator.java,v 1.10 2004/05/26 14:11:34 cziegeler
Exp $
+ * @version CVS $Id$
*/
public class StreamGenerator extends ServiceableGenerator
{
Modified:
cocoon/trunk/src/java/org/apache/cocoon/serialization/HTMLSerializer.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/serialization/HTMLSerializer.java?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/serialization/HTMLSerializer.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/serialization/HTMLSerializer.java
Thu Feb 10 07:00:57 2005
@@ -32,16 +32,14 @@
* @cocoon.sitemap.component.mimetype text/html
* @cocoon.sitemap.component.logger sitemap.serializer.html
*
- * @cocoon.sitemap.component.pooling.min 4
* @cocoon.sitemap.component.pooling.max 32
- * @cocoon.sitemap.component.pooling.grow 4
* @cocoon.sitemap.component.configuration
* <doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
* <doctype-system>http://www.w3.org/TR/html4/loose.dtd</doctype-system>
*
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Id: HTMLSerializer.java,v 1.3 2004/05/03 09:14:01 cziegeler
Exp $
+ * @version CVS $Id$
*/
public class HTMLSerializer extends AbstractTextSerializer {
Modified:
cocoon/trunk/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
Thu Feb 10 07:00:57 2005
@@ -65,9 +65,7 @@
* @cocoon.sitemap.component.documentation.caching
* See documentation for further information.
*
- * @cocoon.sitemap.component.pooling.min 2
* @cocoon.sitemap.component.pooling.max 16
- * @cocoon.sitemap.component.pooling.grow 2
*
* This transformer also supports a more verbose but flexible version:
* <cinclude:includexml xmlns:cinclude="http://apache.org/cocoon/include/1.0";
ignoreErrors="false">
Modified:
cocoon/trunk/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
Thu Feb 10 07:00:57 2005
@@ -46,9 +46,7 @@
* @cocoon.sitemap.component.documentation.caching
* TBD
*
- * @cocoon.sitemap.component.pooling.min 8
* @cocoon.sitemap.component.pooling.max 32
- * @cocoon.sitemap.component.pooling.grow 4
*
* The encodeURL transformer emits encoded URLs.
* <p>
Modified:
cocoon/trunk/src/java/org/apache/cocoon/transformation/LogTransformer.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/LogTransformer.java?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/transformation/LogTransformer.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/transformation/LogTransformer.java
Thu Feb 10 07:00:57 2005
@@ -39,10 +39,7 @@
* @cocoon.sitemap.component.name log
* @cocoon.sitemap.component.logger sitemap.transformer.log
*
- * @cocoon.sitemap.component.pooling.min 2
* @cocoon.sitemap.component.pooling.max 16
- * @cocoon.sitemap.component.pooling.grow 2
- *
*
* The <code>LogTransformer</code> is a class that can be plugged into a
pipeline
* to print the SAX events which passes thru this transformer in a readable
form
@@ -67,7 +64,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* (PWR Organisation & Entwicklung)
- * @version CVS $Id: LogTransformer.java,v 1.5 2004/06/17 14:55:24 cziegeler
Exp $
+ * @version CVS $Id$
*
*/
public class LogTransformer
Modified:
cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java
(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/transformation/TraxTransformer.java
Thu Feb 10 07:00:57 2005
@@ -66,9 +66,7 @@
* @cocoon.sitemap.component.documentation.caching
* Uses the last modification date of the xslt document for
validation
*
- * @cocoon.sitemap.component.pooling.min 8
* @cocoon.sitemap.component.pooling.max 32
- * @cocoon.sitemap.component.pooling.grow 4
*
* This Transformer is used to transform the incoming SAX stream using
* a TrAXProcessor. Use the following sitemap declarations to define, configure
@@ -145,7 +143,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Mark H. Butler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Id: TraxTransformer.java,v 1.13 2004/07/02 08:33:42 antonio
Exp $
+ * @version CVS $Id$
*/
public class TraxTransformer extends AbstractTransformer
implements Transformer, Serviceable, Configurable,
CacheableProcessingComponent, Disposable {
Modified:
cocoon/trunk/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java?view=diff&r1=153226&r2=153227
==============================================================================
---
cocoon/trunk/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
Thu Feb 10 07:00:57 2005
@@ -56,9 +56,7 @@
* @cocoon.sitemap.component.name xinclude
* @cocoon.sitemap.component.logger sitemap.transformer.xinclude
*
- * @cocoon.sitemap.component.pooling.min 2
* @cocoon.sitemap.component.pooling.max 16
- * @cocoon.sitemap.component.pooling.grow 2
*
* Implementation of an XInclude transformer. It supports xml:base attributes,
* XPointer fragment identifiers (see the xpointer package to see what exactly
is
@@ -66,7 +64,7 @@
* and on the content of fallback elements (with loop inclusion detection).
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a> (wrote the
original version)
- * @version CVS $Id: XIncludeTransformer.java,v 1.21 2004/06/17 14:55:24
cziegeler Exp $
+ * @version CVS $Id$
*/
public class XIncludeTransformer extends AbstractTransformer implements
Serviceable {
protected SourceResolver resolver;
Modified: cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf (original)
+++ cocoon/trunk/src/webapp/WEB-INF/xconf/cocoon-core.xconf Thu Feb 10 07:00:57
2005
@@ -365,7 +365,7 @@
| would appear in the serialized output again.
+-->
<xml-parser class="org.apache.excalibur.xml.impl.JaxpParser"
- logger="core.xml-parser" pool-grow="4" pool-max="32" pool-min="8">
+ logger="core.xml-parser" pool-max="32">
<parameter name="validate" value="false"/>
<parameter name="namespace-prefixes" value="false"/>
<parameter name="stop-on-warning" value="true"/>
@@ -547,8 +547,8 @@
| the intermediate results of the pipeline stages reducing the overhead
| of xml parsing/serialization.
+-->
- <xml-serializer
class="org.apache.cocoon.components.sax.XMLByteStreamCompiler"
logger="core.xml-serializer" pool-grow="4" pool-max="32" pool-min="8"/>
- <xml-deserializer
class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"
logger="core.xml-deserializer" pool-grow="4" pool-max="32" pool-min="8"/>
+ <xml-serializer
class="org.apache.cocoon.components.sax.XMLByteStreamCompiler"
logger="core.xml-serializer" pool-max="32"/>
+ <xml-deserializer
class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"
logger="core.xml-deserializer" pool-max="32"/>
<!--+
| The Cache Manager is a component that can be used to cache content.
Modified: cocoon/trunk/src/webapp/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/sitemap.xmap?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/src/webapp/sitemap.xmap (original)
+++ cocoon/trunk/src/webapp/sitemap.xmap Thu Feb 10 07:00:57 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -65,14 +65,14 @@
| All components follow this scheme.
+-->
<map:generators default="file">
- <map:generator label="content" logger="sitemap.generator.file" name="file"
pool-grow="4" pool-max="32" pool-min="8"
src="org.apache.cocoon.generation.FileGenerator"/>
- <map:generator label="content" logger="sitemap.generator.directory"
name="directory" pool-grow="2" pool-max="16" pool-min="2"
src="org.apache.cocoon.generation.DirectoryGenerator"/>
+ <map:generator label="content" logger="sitemap.generator.file" name="file"
pool-max="32" src="org.apache.cocoon.generation.FileGenerator"/>
+ <map:generator label="content" logger="sitemap.generator.directory"
name="directory" pool-max="16"
src="org.apache.cocoon.generation.DirectoryGenerator"/>
<map:generator label="content" logger="sitemap.generator.xpathdirectory"
name="xpathdirectory"
src="org.apache.cocoon.generation.XPathDirectoryGenerator"/>
<map:generator label="content" logger="sitemap.generator.imagedirectory"
name="imagedirectory"
src="org.apache.cocoon.generation.ImageDirectoryGenerator"/>
- <map:generator label="content" logger="sitemap.generator.request"
name="request" pool-grow="2" pool-max="16" pool-min="2"
src="org.apache.cocoon.generation.RequestGenerator"/>
- <map:generator label="content" logger="sitemap.generator.stream"
name="stream" pool-grow="2" pool-max="16" pool-min="1"
src="org.apache.cocoon.generation.StreamGenerator"/>
- <map:generator label="content" logger="sitemap.generator.status"
name="status" pool-grow="2" pool-max="16" pool-min="2"
src="org.apache.cocoon.generation.StatusGenerator"/>
- <map:generator label="content" logger="sitemap.generator.jx" name="jx"
pool-grow="2" pool-max="16" pool-min="2"
src="org.apache.cocoon.generation.JXTemplateGenerator"/>
+ <map:generator label="content" logger="sitemap.generator.request"
name="request" pool-max="16"
src="org.apache.cocoon.generation.RequestGenerator"/>
+ <map:generator label="content" logger="sitemap.generator.stream"
name="stream" pool-max="16" src="org.apache.cocoon.generation.StreamGenerator"/>
+ <map:generator label="content" logger="sitemap.generator.status"
name="status" pool-max="16" src="org.apache.cocoon.generation.StatusGenerator"/>
+ <map:generator label="content" logger="sitemap.generator.jx" name="jx"
pool-max="16" src="org.apache.cocoon.generation.JXTemplateGenerator"/>
<!-- The notifying generator can only be used in a <handle-errors> section
: it produces an XML
representation of the exception that caused the error handler to be
executed -->
<map:generator name="notifying"
src="org.apache.cocoon.sitemap.NotifyingGenerator"/>
@@ -100,7 +100,7 @@
<map:transformers default="xslt">
<!-- NOTE: This is the default XSLT processor. -->
- <map:transformer logger="sitemap.transformer.xslt" name="xslt"
pool-grow="2" pool-max="32" pool-min="8"
src="org.apache.cocoon.transformation.TraxTransformer">
+ <map:transformer logger="sitemap.transformer.xslt" name="xslt"
pool-max="32" src="org.apache.cocoon.transformation.TraxTransformer">
<use-request-parameters>false</use-request-parameters>
<use-session-parameters>false</use-session-parameters>
<use-cookie-parameters>false</use-cookie-parameters>
@@ -109,7 +109,7 @@
</map:transformer>
<!-- NOTE: This is the same as the default processor but with a different
name (for compatibility) -->
- <map:transformer logger="sitemap.transformer.xalan" name="xalan"
pool-grow="2" pool-max="32" pool-min="8"
src="org.apache.cocoon.transformation.TraxTransformer">
+ <map:transformer logger="sitemap.transformer.xalan" name="xalan"
pool-max="32" src="org.apache.cocoon.transformation.TraxTransformer">
<use-request-parameters>false</use-request-parameters>
<use-session-parameters>false</use-session-parameters>
<use-cookie-parameters>false</use-cookie-parameters>
@@ -118,7 +118,7 @@
</map:transformer>
<!-- NOTE: You can also try XSLTC as the default processor. If you use
Xalan extensions, use the "xalan" transformer. -->
- <map:transformer logger="sitemap.transformer.xsltc" name="xsltc"
pool-grow="2" pool-max="32" pool-min="8"
src="org.apache.cocoon.transformation.TraxTransformer">
+ <map:transformer logger="sitemap.transformer.xsltc" name="xsltc"
pool-max="32" src="org.apache.cocoon.transformation.TraxTransformer">
<use-request-parameters>false</use-request-parameters>
<use-session-parameters>false</use-session-parameters>
<use-cookie-parameters>false</use-cookie-parameters>
@@ -126,14 +126,14 @@
<check-includes>true</check-includes>
</map:transformer>
- <map:transformer logger="sitemap.transformer.xinclude" name="xinclude"
pool-grow="2" pool-max="16" pool-min="2"
src="org.apache.cocoon.transformation.XIncludeTransformer"/>
- <map:transformer logger="sitemap.transformer.cinclude" name="cinclude"
pool-grow="2" pool-max="16" pool-min="2"
src="org.apache.cocoon.transformation.CIncludeTransformer"/>
+ <map:transformer logger="sitemap.transformer.xinclude" name="xinclude"
pool-max="16" src="org.apache.cocoon.transformation.XIncludeTransformer"/>
+ <map:transformer logger="sitemap.transformer.cinclude" name="cinclude"
pool-max="16" src="org.apache.cocoon.transformation.CIncludeTransformer"/>
<map:transformer logger="sitemap.transformer.encodeURL" name="encodeURL"
src="org.apache.cocoon.transformation.EncodeURLTransformer"/>
<map:transformer logger="sitemap.transformer.write-source"
name="write-source"
src="org.apache.cocoon.transformation.SourceWritingTransformer"/>
<map:transformer logger="sitemap.transformer.writeDOMsession"
name="writeDOMsession"
src="org.apache.cocoon.transformation.WriteDOMSessionTransformer"/>
<map:transformer logger="sitemap.transformer.readDOMsession"
name="readDOMsession"
src="org.apache.cocoon.transformation.ReadDOMSessionTransformer"/>
- <map:transformer logger="sitemap.transformer.log" name="log" pool-grow="2"
pool-max="16" pool-min="2"
src="org.apache.cocoon.transformation.LogTransformer"/>
- <map:transformer logger="sitemap.transformer.jx" name="jx" pool-grow="2"
pool-max="16" pool-min="2"
src="org.apache.cocoon.transformation.JXTemplateTransformer"/>
+ <map:transformer logger="sitemap.transformer.log" name="log" pool-max="16"
src="org.apache.cocoon.transformation.LogTransformer"/>
+ <map:transformer logger="sitemap.transformer.jx" name="jx" pool-max="16"
src="org.apache.cocoon.transformation.JXTemplateTransformer"/>
<map:transformer logger="sitemap.transformer.paginate" name="paginate"
src="org.apache.cocoon.transformation.pagination.Paginator"/>
</map:transformers>
@@ -146,7 +146,7 @@
<map:serializer logger="sitemap.serializer.links" name="links"
src="org.apache.cocoon.serialization.LinkSerializer"/>
<map:serializer logger="sitemap.serializer.xml" mime-type="text/xml"
name="xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
- <map:serializer logger="sitemap.serializer.html" mime-type="text/html"
name="html" pool-grow="4" pool-max="32" pool-min="4"
src="org.apache.cocoon.serialization.HTMLSerializer">
+ <map:serializer logger="sitemap.serializer.html" mime-type="text/html"
name="html" pool-max="32" src="org.apache.cocoon.serialization.HTMLSerializer">
<doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
<doctype-system>http://www.w3.org/TR/html4/loose.dtd</doctype-system>
</map:serializer>
@@ -171,7 +171,7 @@
<doctype-system>http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd</doctype-system>
</map:serializer>
- <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html"
name="xhtml" pool-grow="2" pool-max="64" pool-min="2"
src="org.apache.cocoon.serialization.XMLSerializer">
+ <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html"
name="xhtml" pool-max="64" src="org.apache.cocoon.serialization.XMLSerializer">
<!--+
| You can choose from Strict, Transitional, or Frameset XHTML.
| For Strict XHTML set doctype to:
@@ -192,7 +192,7 @@
<encoding>UTF-8</encoding>
</map:serializer>
- <map:serializer logger="sitemap.serializer.xhtml"
mime-type="application/xhtml+xml" name="xhtml11" pool-grow="2" pool-max="64"
pool-min="2" src="org.apache.cocoon.serialization.XMLSerializer">
+ <map:serializer logger="sitemap.serializer.xhtml"
mime-type="application/xhtml+xml" name="xhtml11" pool-max="64"
src="org.apache.cocoon.serialization.XMLSerializer">
<doctype-public>-//W3C//DTD XHTML 1.1//EN</doctype-public>
<doctype-system>http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</doctype-system>
<encoding>UTF-8</encoding>
Modified: cocoon/trunk/tools/src/anttasks/PoolSetterTask.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/src/anttasks/PoolSetterTask.java?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/tools/src/anttasks/PoolSetterTask.java (original)
+++ cocoon/trunk/tools/src/anttasks/PoolSetterTask.java Thu Feb 10 07:00:57 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,8 +41,6 @@
private String element;
private boolean isSitemap = true;
private String poolMax = "32";
- private String poolMin = "16";
- private String poolGrow = "4";
public void setFile(File file) {
this.file = file;
@@ -60,14 +58,6 @@
this.poolMax = String.valueOf(value);
}
- public void setPoolMin(int value) {
- this.poolMin = String.valueOf(value);
- }
-
- public void setPoolGrow(int value) {
- this.poolGrow = String.valueOf(value);
- }
-
public void execute() throws BuildException {
if (this.file == null) {
@@ -97,8 +87,6 @@
for(int i=0; i < nodes.getLength(); i++) {
final Element e = (Element)nodes.item(i);
e.setAttributeNS(null, "pool-max", this.poolMax);
- e.setAttributeNS(null, "pool-min", this.poolMin);
- e.setAttributeNS(null, "pool-grow", this.poolGrow);
changed = true;
}
} else {
Modified: cocoon/trunk/tools/src/anttasks/SitemapTask.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/src/anttasks/SitemapTask.java?view=diff&r1=153226&r2=153227
==============================================================================
--- cocoon/trunk/tools/src/anttasks/SitemapTask.java (original)
+++ cocoon/trunk/tools/src/anttasks/SitemapTask.java Thu Feb 10 07:00:57 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -72,12 +72,8 @@
/** Caching info (optional) */
public static final String CACHING_INFO_TAG =
"cocoon.sitemap.component.documentation.caching";
- /** Pooling min (optional) */
- public static final String POOL_MIN_TAG =
"cocoon.sitemap.component.pooling.min";
/** Pooling max (optional) */
public static final String POOL_MAX_TAG =
"cocoon.sitemap.component.pooling.max";
- /** Pooling grow (optional) */
- public static final String POOL_GROW_TAG =
"cocoon.sitemap.component.pooling.grow";
private static final String LINE_SEPARATOR = "\n";
@@ -536,9 +532,7 @@
// pooling?
if ( this.javaClass.isA(POOLABLE) ) {
// TODO - Think about default values
- this.addAttribute(node, POOL_MIN_TAG, "pool-min", null);
this.addAttribute(node, POOL_MAX_TAG, "pool-max", null);
- this.addAttribute(node, POOL_GROW_TAG, "pool-grow", null);
}
// mime-type
