mcconnell 2004/03/30 06:15:23
Modified: component-examples/instrument-manager project.xml
component project.xml
component/src/java/org/apache/avalon/excalibur/component
PoolableComponentHandler.java
Log:
bump component to use pool 2.0 (implementation change)
Revision Changes Path
1.5 +9 -3
avalon-excalibur/component-examples/instrument-manager/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon-excalibur/component-examples/instrument-manager/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 30 Mar 2004 12:15:14 -0000 1.4
+++ project.xml 30 Mar 2004 14:15:23 -0000 1.5
@@ -34,7 +34,7 @@
</dependency>
<dependency>
<id>avalon-framework</id>
- <version>4.1.4</version>
+ <version>4.1.5</version>
<groupId>framework</groupId>
</dependency>
<dependency>
@@ -56,8 +56,14 @@
<version>1.2</version>
</dependency>
<dependency>
- <id>excalibur-pool</id>
- <version>1.3</version>
+ <groupId>excalibur-pool</groupId>
+ <groupId>excalibur-pool-api</groupId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>excalibur-pool</groupId>
+ <groupId>excalibur-pool-impl</groupId>
+ <version>2.0</version>
</dependency>
<dependency>
<id>concurrent</id>
1.13 +7 -2 avalon-excalibur/component/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/component/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 30 Mar 2004 12:51:44 -0000 1.12
+++ project.xml 30 Mar 2004 14:15:23 -0000 1.13
@@ -66,12 +66,17 @@
<dependency>
<groupId>excalibur-pool</groupId>
<artifactId>excalibur-pool-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>excalibur-pool</groupId>
<artifactId>excalibur-pool-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>excalibur-pool</groupId>
+ <artifactId>excalibur-pool-instrumented</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
<id>commons-collections</id>
1.5 +6 -6
avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/PoolableComponentHandler.java
Index: PoolableComponentHandler.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/PoolableComponentHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PoolableComponentHandler.java 28 Feb 2004 11:47:14 -0000 1.4
+++ PoolableComponentHandler.java 30 Mar 2004 14:15:23 -0000 1.5
@@ -17,7 +17,7 @@
package org.apache.avalon.excalibur.component;
import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.avalon.excalibur.pool.ResourceLimitingPool;
+import org.apache.avalon.excalibur.pool.InstrumentedResourceLimitingPool;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
@@ -73,12 +73,12 @@
* specify, in milliseconds, how long idle Poolables will be
* maintained in the pool before being closed. For a complete
* explanation on how this works, see [EMAIL PROTECTED]
- * org.apache.avalon.excalibur.pool.ResourceLimitingPool#trim()}
+ * org.apache.avalon.excalibur.pool.InstrumentedResourceLimitingPool#trim()}
* (Defaults to "0", trimming disabled)</li>
*
* <li>The <code>pool-min</code> and <code>pool-grow</code> attributes
* were deprecated as the underlying Pool ([EMAIL PROTECTED]
- * org.apache.avalon.excalibur.pool.ResourceLimitingPool}) does not
+ * org.apache.avalon.excalibur.pool.InstrumentedResourceLimitingPool}) does
not
* make use of them. Configurations which still use these attributes
* will continue to function however, a minimum pool size is no longer
* applicable.
@@ -101,7 +101,7 @@
private final DefaultComponentFactory m_factory;
/** The pool of components for <code>Poolable</code> Components */
- private final ResourceLimitingPool m_pool;
+ private final InstrumentedResourceLimitingPool m_pool;
/** State management boolean stating whether the Handler is initialized
or not */
private boolean m_initialized = false;
@@ -148,7 +148,7 @@
long poolTimeout = config.getAttributeAsLong( "pool-timeout", 0 );
long poolTrimInterval = config.getAttributeAsLong(
"pool-trim-interval", 0 );
- m_pool = new ResourceLimitingPool( m_factory, poolMax,
poolMaxStrict, poolBlocking,
+ m_pool = new InstrumentedResourceLimitingPool( m_factory, poolMax,
poolMaxStrict, poolBlocking,
poolTimeout, poolTrimInterval );
// Initialize the Instrumentable elements.
addChildInstrumentable( m_pool );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
