You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by pr...@apache.org on 2002/08/07 18:31:39 UTC
cvs commit: jakarta-avalon-excalibur/pool/src/java/org/apache/avalon/excalibur/pool AbstractPool.java
proyal 2002/08/07 09:31:38
Modified: pool default.properties build.xml ant.properties.sample
pool/src/test/org/apache/avalon/excalibur/pool/test
PoolProfile.java
pool/src/java/org/apache/avalon/excalibur/pool
AbstractPool.java
Log:
* Remove support for Loggable in AbstractPool
* Bump version to 1.1 to reflect change
Revision Changes Path
1.12 +6 -6 jakarta-avalon-excalibur/pool/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/pool/default.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- default.properties 3 Aug 2002 15:27:09 -0000 1.11
+++ default.properties 7 Aug 2002 16:31:38 -0000 1.12
@@ -8,7 +8,7 @@
name=excalibur-pool
Name=Excalibur Pool
dir-name=pool
-version=1.0
+version=1.1
package-version=0.99
year=2000-2002
@@ -26,11 +26,6 @@
excalibur-collections.lib=${excalibur-collections.home}
excalibur-collections.jar=${excalibur-collections.lib}/excalibur-collections-1.0.jar
-# ----- Logkit -----
-logkit.home=${basedir}/../../jakarta-avalon-logkit
-logkit.lib=${logkit.home}/build/lib
-logkit.jar=${logkit.lib}/logkit.jar
-
# --------------------------------------------------
# OPTIONAL LIBRARIES
# --------------------------------------------------
@@ -42,6 +37,11 @@
excalibur-testcase.home=${basedir}/../testcase/dist
excalibur-testcase.lib=${excalibur-testcase.home}
excalibur-testcase.jar=${excalibur-testcase.lib}/excalibur-testcase-1.0.jar
+
+# ----- Logkit -----
+logkit.home=${basedir}/../../jakarta-avalon-logkit
+logkit.lib=${logkit.home}/build/lib
+logkit.jar=${logkit.lib}/logkit.jar
# ----- Excalibur instrument, version 0.1 or later -----
excalibur-instrument.home=${basedir}/../instrument/dist
1.25 +2 -5 jakarta-avalon-excalibur/pool/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/pool/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.xml 30 Jul 2002 22:38:23 -0000 1.24
+++ build.xml 7 Aug 2002 16:31:38 -0000 1.25
@@ -12,8 +12,6 @@
<!-- Classpath for product -->
<path id="project.class.path">
<pathelement location="${build.classes}"/>
- <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
- <pathelement location="${logkit.jar}"/>
<pathelement location="${avalon-framework.jar}"/>
<pathelement location="${excalibur-collections.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
@@ -33,6 +31,7 @@
<pathelement location="${junit.jar}"/>
<pathelement location="${junitperf.jar}"/>
<pathelement location="${excalibur-testcase.jar}"/>
+ <pathelement location="${logkit.jar}"/>
<path refid="project.class.path"/>
</path>
<property name="cp" refid="test.class.path"/>
@@ -43,7 +42,6 @@
<target name="dependencies" description="Check dependencies" unless="skip.dependencies">
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
</target>
@@ -55,6 +53,7 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnitPerf"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
</target>
@@ -330,7 +329,6 @@
<property name="framework.base" value="http://jakarta.apache.org/avalon/framework"/>
<property name="phoenix.base" value="http://jakarta.apache.org/avalon/phoenix"/>
<property name="cornerstone.base" value="http://jakarta.apache.org/avalon/cornerstone"/>
- <property name="logkit.base" value="http://jakarta.apache.org/avalon/logkit"/>
<property name="testlet.base" value="http://jakarta.apache.org/avalon/testlet"/>
<filter token="year" value="${year}"/>
@@ -338,7 +336,6 @@
<filter token="FRAMEWORK_BASE" value="${framework.base}"/>
<filter token="PHOENIX_BASE" value="${phoenix.base}"/>
<filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
- <filter token="LOGKIT_BASE" value="${logkit.base}"/>
<filter token="TESTLET_BASE" value="${testlet.base}"/>
</target>
1.7 +1 -5 jakarta-avalon-excalibur/pool/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/pool/ant.properties.sample,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ant.properties.sample 4 Aug 2002 01:07:39 -0000 1.6
+++ ant.properties.sample 7 Aug 2002 16:31:38 -0000 1.7
@@ -26,10 +26,6 @@
# REQUIRED LIBRARIES
# --------------------------------------------------
-# ----- Logkit -----
-logkit.home=../../jakarta-avalon-logkit/build/lib
-logkit.jar=${logkit.home}/logkit.jar
-
# ----- Avalon Framework -----
avalon-framework.home=../../jakarta-avalon/build/lib
avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
1.2 +29 -16 jakarta-avalon-excalibur/pool/src/test/org/apache/avalon/excalibur/pool/test/PoolProfile.java
Index: PoolProfile.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/pool/src/test/org/apache/avalon/excalibur/pool/test/PoolProfile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PoolProfile.java 4 Apr 2002 05:09:04 -0000 1.1
+++ PoolProfile.java 7 Aug 2002 16:31:38 -0000 1.2
@@ -11,6 +11,8 @@
import org.apache.avalon.excalibur.pool.DefaultPool;
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.excalibur.pool.SingleThreadedPool;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.LogKitLogger;
/**
* This is used to profile the Pool implementation.
@@ -20,18 +22,29 @@
public final class PoolProfile
extends TestCase
{
- org.apache.log.Logger logger = org.apache.log.Hierarchy.getDefaultHierarchy().getLoggerFor( "test" );
- org.apache.log.Logger poolLogger = org.apache.log.Hierarchy.getDefaultHierarchy().getLoggerFor( "pool" );
+ Logger logger;
+ Logger poolLogger;
+
public PoolProfile( String name )
{
super( name );
// Set to debug to see more useful information.
- logger.setPriority( org.apache.log.Priority.INFO );
+ logger = getLogger( "test", org.apache.log.Priority.INFO );
// The output from the pools is too much data to be useful, so use a different logger.
- poolLogger.setPriority( org.apache.log.Priority.INFO );
+ poolLogger = getLogger( "pool", org.apache.log.Priority.INFO );
+ }
+
+ private Logger getLogger( final String name, final org.apache.log.Priority priority)
+ {
+ final org.apache.log.Logger l =
+ org.apache.log.Hierarchy.getDefaultHierarchy().getLoggerFor( name );
+
+ l.setPriority( priority );
+
+ return new LogKitLogger( l );
}
public static class A
@@ -663,7 +676,7 @@
logger.info( "SMALL Sized Objects with thread safe pools" );
final DefaultPool pool1 = new DefaultPool( A.class, 5, 10 );
- pool1.setLogger( poolLogger );
+ pool1.enableLogging( poolLogger );
final long pool1Start = System.currentTimeMillis();
final int pool1Factor = 1;
final int pool1Loops = TEST_SIZE / pool1Factor;
@@ -683,7 +696,7 @@
if( logger.isDebugEnabled() ) logger.debug( "FreeMem post 1: " + Runtime.getRuntime().freeMemory() );
final DefaultPool pool2 = new DefaultPool( A.class, 5, 10 );
- pool2.setLogger( poolLogger );
+ pool2.enableLogging( poolLogger );
final long pool2Start = System.currentTimeMillis();
final int pool2Factor = 10;
final int pool2Loops = TEST_SIZE / pool2Factor;
@@ -721,7 +734,7 @@
if( logger.isDebugEnabled() ) logger.debug( "FreeMem post 2: " + Runtime.getRuntime().freeMemory() );
final DefaultPool pool3 = new DefaultPool( A.class, 5, 10 );
- pool3.setLogger( poolLogger );
+ pool3.enableLogging( poolLogger );
final long pool3Start = System.currentTimeMillis();
final int pool3Factor = 15;
final int pool3Loops = TEST_SIZE / pool3Factor;
@@ -769,7 +782,7 @@
if( logger.isDebugEnabled() ) logger.debug( "FreeMem post 3: " + Runtime.getRuntime().freeMemory() );
final DefaultPool pool4 = new DefaultPool( A.class, 5, 10 );
- pool4.setLogger( poolLogger );
+ pool4.enableLogging( poolLogger );
final long pool4Start = System.currentTimeMillis();
final int pool4Factor = 20;
final int pool4Loops = TEST_SIZE / pool4Factor;
@@ -861,7 +874,7 @@
Thread.currentThread().sleep( 2 );
final DefaultPool pool1 = new DefaultPool( B.class, 5, 10 );
- pool1.setLogger( poolLogger );
+ pool1.enableLogging( poolLogger );
final long pool1Start = System.currentTimeMillis();
final int pool1Factor = 1;
final int pool1Loops = TEST_SIZE / pool1Factor;
@@ -881,7 +894,7 @@
if( logger.isDebugEnabled() ) logger.debug( "FreeMem post 1: " + Runtime.getRuntime().freeMemory() );
final DefaultPool pool2 = new DefaultPool( B.class, 5, 10 );
- pool2.setLogger( poolLogger );
+ pool2.enableLogging( poolLogger );
final long pool2Start = System.currentTimeMillis();
final int pool2Factor = 10;
final int pool2Loops = TEST_SIZE / pool2Factor;
@@ -931,7 +944,7 @@
if( logger.isDebugEnabled() ) logger.debug( "FreeMem post 2: " + Runtime.getRuntime().freeMemory() );
final DefaultPool pool3 = new DefaultPool( B.class, 5, 10 );
- pool3.setLogger( poolLogger );
+ pool3.enableLogging( poolLogger );
final long pool3Start = System.currentTimeMillis();
final int pool3Factor = 15;
final int pool3Loops = TEST_SIZE / pool3Factor;
@@ -996,7 +1009,7 @@
if( logger.isDebugEnabled() ) logger.debug( "FreeMem post 3: " + Runtime.getRuntime().freeMemory() );
final DefaultPool pool4 = new DefaultPool( B.class, 5, 10 );
- pool4.setLogger( poolLogger );
+ pool4.enableLogging( poolLogger );
final long pool4Start = System.currentTimeMillis();
final int pool4Factor = 20;
final int pool4Loops = TEST_SIZE / pool4Factor;
@@ -1108,7 +1121,7 @@
Thread.currentThread().sleep( 2 );
final DefaultPool pool1 = new DefaultPool( C.class, 5, 10 );
- pool1.setLogger( poolLogger );
+ pool1.enableLogging( poolLogger );
final long pool1Start = System.currentTimeMillis();
final int pool1Factor = 1;
final int pool1Loops = TEST_SIZE / pool1Factor;
@@ -1129,7 +1142,7 @@
if( logger.isDebugEnabled() ) logger.debug( "FreeMem post 1: " + Runtime.getRuntime().freeMemory() );
final DefaultPool pool2 = new DefaultPool( C.class, 5, 10 );
- pool2.setLogger( poolLogger );
+ pool2.enableLogging( poolLogger );
final long pool2Start = System.currentTimeMillis();
final int pool2Factor = 10;
final int pool2Loops = TEST_SIZE / pool2Factor;
@@ -1179,7 +1192,7 @@
if( logger.isDebugEnabled() ) logger.debug( "FreeMem post 2: " + Runtime.getRuntime().freeMemory() );
final DefaultPool pool3 = new DefaultPool( C.class, 5, 10 );
- pool3.setLogger( poolLogger );
+ pool3.enableLogging( poolLogger );
final long pool3Start = System.currentTimeMillis();
final int pool3Factor = 15;
final int pool3Loops = TEST_SIZE / pool3Factor;
@@ -1244,7 +1257,7 @@
if( logger.isDebugEnabled() ) logger.debug( "FreeMem post 3: " + Runtime.getRuntime().freeMemory() );
final DefaultPool pool4 = new DefaultPool( C.class, 5, 10 );
- pool4.setLogger( poolLogger );
+ pool4.enableLogging( poolLogger );
final long pool4Start = System.currentTimeMillis();
final int pool4Factor = 20;
final int pool4Loops = TEST_SIZE / pool4Factor;
1.5 +2 -9 jakarta-avalon-excalibur/pool/src/java/org/apache/avalon/excalibur/pool/AbstractPool.java
Index: AbstractPool.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/pool/src/java/org/apache/avalon/excalibur/pool/AbstractPool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractPool.java 7 Apr 2002 06:28:06 -0000 1.4
+++ AbstractPool.java 7 Aug 2002 16:31:38 -0000 1.5
@@ -13,8 +13,6 @@
import org.apache.avalon.excalibur.collections.VariableSizeBuffer;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.thread.ThreadSafe;
/**
@@ -26,7 +24,7 @@
*/
public abstract class AbstractPool
extends AbstractLogEnabled
- implements Pool, Loggable, ThreadSafe
+ implements Pool, ThreadSafe
{
public static final int DEFAULT_POOL_SIZE = 8;
protected final ObjectFactory m_factory;
@@ -48,11 +46,6 @@
{
initialize();
}
- }
-
- public void setLogger( final org.apache.log.Logger logger )
- {
- enableLogging( new LogKitLogger( logger ) );
}
protected void initialize()
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>