donaldp 01/04/01 21:06:33 Modified: proposal/4.0 build.xml changes.txt proposal/4.0/src/java/org/apache/avalon/pool AbstractPool.java DefaultObjectFactory.java DefaultPool.java ThreadSafePool.java Added: proposal/4.0/src/java/org/apache/avalon Modifiable.java proposal/4.0/src/java/org/apache/avalon/pool ObjectFactory.java Pool.java PoolController.java Poolable.java Recyclable.java proposal/4.0/src/java/org/apache/avalon/processor Matcher.java Pipeline.java ProcessorPipeline.java ProcessorTree.java Stage.java proposal/4.0/src/java/org/apache/framework/thread SingleThreaded.java ThreadSafe.java Removed: proposal/4.0/src/java/org/apache/framework Modifiable.java Recyclable.java SingleThreaded.java ThreadSafe.java proposal/4.0/src/java/org/apache/framework/pool ObjectFactory.java Pool.java PoolController.java Poolable.java proposal/4.0/src/java/org/apache/framework/processor Matcher.java Pipeline.java ProcessorPipeline.java ProcessorTree.java Stage.java Log: Hacked a little more on proposal trying to separate the concept of framework and components in framework Revision Changes Path 1.4 +3 -2 jakarta-avalon/proposal/4.0/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-avalon/proposal/4.0/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 2001/02/26 06:09:15 1.3 +++ build.xml 2001/04/02 04:06:30 1.4 @@ -49,7 +49,7 @@ Set the properties for intermediate directory =================================================================== --> - <property name="build.dir" value="build"/> + <property name="build.dir" value="build/proposal"/> <property name="build.lib" value="${build.dir}/lib"/> <property name="build.src" value="${build.dir}/src"/> <property name="build.classes" value="${build.dir}/classes"/> @@ -91,7 +91,8 @@ Main target =================================================================== --> - <target name="main" depends="jars" /> + <target name="main" depends="compile" /> + <target name="install" depends="compile" /> <!-- =================================================================== 1.3 +6 -1 jakarta-avalon/proposal/4.0/changes.txt Index: changes.txt =================================================================== RCS file: /home/cvs/jakarta-avalon/proposal/4.0/changes.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- changes.txt 2001/03/15 04:35:29 1.2 +++ changes.txt 2001/04/02 04:06:30 1.3 @@ -38,4 +38,9 @@ -Removed ComponentNot*Exceptions -Moved *Loggable to org.apache.avalon.logger -Made the ComponentManager throw ComponentException again --moved interfaces to org.apache/framework while implementations remain in org.apache.avalon \ No newline at end of file +-moved interfaces to org.apache/framework while implementations remain in org.apache.avalon +-moved Recyclable to org.apache.avalon.pool +-moved interfaces for pool to org.apache.avalon.pool +-moved Modifiable to org.apache.avalon +-moved SingleThreaded/ThreadSafe to org.apache.framework.thread +-removed ObjectUtil \ No newline at end of file 1.3 +0 -0 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/Modifiable.java 1.4 +0 -5 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/AbstractPool.java Index: AbstractPool.java =================================================================== RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/AbstractPool.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AbstractPool.java 2001/03/15 04:34:56 1.3 +++ AbstractPool.java 2001/04/02 04:06:30 1.4 @@ -7,12 +7,7 @@ */ package org.apache.avalon.pool; -import org.apache.framework.Recyclable; import org.apache.framework.lifecycle.Initializable; -import org.apache.framework.pool.ObjectFactory; -import org.apache.framework.pool.Pool; -import org.apache.framework.pool.PoolController; -import org.apache.framework.pool.Poolable; /** * This is an <code>Pool</code> that caches Poolable objects for reuse. 1.3 +0 -2 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/DefaultObjectFactory.java Index: DefaultObjectFactory.java =================================================================== RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/DefaultObjectFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DefaultObjectFactory.java 2001/03/15 04:34:56 1.2 +++ DefaultObjectFactory.java 2001/04/02 04:06:30 1.3 @@ -8,8 +8,6 @@ package org.apache.avalon.pool; import java.lang.reflect.Constructor; -import org.apache.framework.pool.ObjectFactory; -import org.apache.framework.pool.Poolable; /** * This is the default for factory that is used to create objects for Pool. 1.3 +0 -3 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/DefaultPool.java Index: DefaultPool.java =================================================================== RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/DefaultPool.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- DefaultPool.java 2001/03/15 04:34:56 1.2 +++ DefaultPool.java 2001/04/02 04:06:30 1.3 @@ -7,9 +7,6 @@ */ package org.apache.avalon.pool; -import org.apache.framework.pool.PoolController; -import org.apache.framework.pool.ObjectFactory; - /** * This is an <code>Pool</code> that caches Poolable objects for reuse. * 1.3 +0 -3 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/ThreadSafePool.java Index: ThreadSafePool.java =================================================================== RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/ThreadSafePool.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ThreadSafePool.java 2001/03/15 04:34:58 1.2 +++ ThreadSafePool.java 2001/04/02 04:06:30 1.3 @@ -8,9 +8,6 @@ package org.apache.avalon.pool; import org.apache.framework.ThreadSafe; -import org.apache.framework.pool.ObjectFactory; -import org.apache.framework.pool.PoolController; -import org.apache.framework.pool.Poolable; /** * This is a implementation of <code>Pool</code> that is thread safe. 1.4 +0 -0 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/ObjectFactory.java 1.4 +0 -0 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/Pool.java 1.3 +0 -0 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/PoolController.java 1.3 +0 -0 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/Poolable.java 1.1 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/pool/Recyclable.java Index: Recyclable.java =================================================================== /* * Copyright (C) The Apache Software Foundation. All rights reserved. * * This software is published under the terms of the Apache Software License * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ package org.apache.avalon.pool; /** * This interface standardizes the behaviour of a recyclable object. * A recyclable object is defined as an object that can be used to * encapsulate another object without being altered by its content. * Therefore, a recyclable object may be recycled and reused many times. * * This is helpful in cases where recyclable objects are continously * created and destroied, causing a much greater amount of garbage to * be collected by the JVM garbage collector. By making it recyclable, * it is possible to reduce the GC execution time thus incrementing the * overall performance of a process and decrementing the chance of * memory overflow. * * Every implementation must provide their own method to allow this * recyclable object to be reused by setting its content. * * @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a> * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a> */ public interface Recyclable { /** * This method should be implemented to remove all costly resources * in object. These resources can be object references, database connections, * threads etc. What is categorised as "costly" resources is determined on * a case by case analysis. */ void recycle(); } 1.3 +0 -0 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/processor/Matcher.java 1.3 +0 -0 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/processor/Pipeline.java 1.3 +2 -2 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/processor/ProcessorPipeline.java 1.3 +0 -0 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/processor/ProcessorTree.java 1.3 +0 -0 jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/processor/Stage.java 1.1 jakarta-avalon/proposal/4.0/src/java/org/apache/framework/thread/SingleThreaded.java Index: SingleThreaded.java =================================================================== /* * Copyright (C) The Apache Software Foundation. All rights reserved. * * This software is published under the terms of the Apache Software License * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ package org.apache.framework.thread; /** * A interface to mark a component as not ThreadSafe. * * NB: It was a deliberat e choice not to extend Component. This will have to * be reassed once we see it in action. * * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a> */ public interface SingleThreaded { } 1.1 jakarta-avalon/proposal/4.0/src/java/org/apache/framework/thread/ThreadSafe.java Index: ThreadSafe.java =================================================================== /* * Copyright (C) The Apache Software Foundation. All rights reserved. * * This software is published under the terms of the Apache Software License * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ package org.apache.framework.thread; /** * A interface to mark a component as ThreadSafe or reentrant. * * NB: It was a deliberat e choice not to extend Component. This will have to * be reassed once we see it in action. * * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a> */ public interface ThreadSafe { } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]