bloritsch 2003/02/04 18:28:36
Modified: component build.xml default.properties
component/examples/instrument-manager/src/java/org/apache/avalon/excalibur/component/example_im
Main.java
component/src/java/org/apache/avalon/excalibur/component
DefaultComponentFactory.java
ExcaliburComponentManager.java
ExcaliburComponentSelector.java
concurrent/src/java/org/apache/avalon/excalibur/concurrent
ThreadBarrier.java
datasource/src/test/org/apache/avalon/excalibur/datasource/test
DataSourceJdbcTestCase.java
fortress default.properties
logger default.properties
Log:
make sure no deprecated libraries are needed or used.
Revision Changes Path
1.30 +34 -8 jakarta-avalon-excalibur/component/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/component/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 29 Jan 2003 14:07:38 -0000 1.29
+++ build.xml 5 Feb 2003 02:28:35 -0000 1.30
@@ -15,12 +15,13 @@
<pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
<pathelement location="${logkit.jar}"/>
<pathelement location="${avalon-framework.jar}"/>
- <pathelement location="${excalibur-collections.jar}"/>
<pathelement location="${excalibur-logger.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${excalibur-instrument-manager.jar}"/>
<pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
<pathelement location="${excalibur-pool.jar}"/>
+ <pathelement location="${util.concurrent.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
<pathelement location="${checkstyle.jar}"/>
<!-- Optional jars -->
@@ -42,14 +43,11 @@
<pathelement location="${excalibur-util.jar}"/>
<pathelement location="${excalibur-testcase.jar}"/>
<pathelement location="${excalibur-i18n.jar}"/>
- <pathelement location="${excalibur-instrument.jar}"/>
- <pathelement location="${excalibur-instrument-manager.jar}"/>
- <pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
<path refid="project.class.path"/>
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="big-jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<!-- Checks the environment for existing resources -->
@@ -79,7 +77,6 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrument"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrumentManager"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCollections"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
</target>
@@ -91,7 +88,6 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkUtil"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrument"/>
</target>
<target name="servlet-warn" unless="servlet.present"
@@ -227,6 +223,36 @@
</jar>
</target>
+
+ <target name="big-jar" depends="jar" description="Build the big jar with all
dependencies included">
+ <copy file="${excalibur-altrmi-registry.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${excalibur-altrmi-common.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${excalibur-altrmi-server-impl.jar}"
todir="${build.dir}/tempjars"/>
+ <copy file="${excalibur-altrmi-server-interfaces.jar}"
todir="${build.dir}/tempjars"/>
+ <copy file="${excalibur-altrmi-client-impl.jar}"
todir="${build.dir}/tempjars"/>
+ <copy file="${excalibur-altrmi-client-interfaces.jar}"
todir="${build.dir}/tempjars"/>
+ <copy file="${excalibur-i18n.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${excalibur-instrument.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${excalibur-instrument-manager.jar}"
todir="${build.dir}/tempjars"/>
+ <copy file="${excalibur-instrument-manager-interfaces.jar}"
todir="${build.dir}/tempjars"/>
+ <copy file="${excalibur-logger.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${excalibur-pool.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${build.lib}/${jar.name}" todir="${build.dir}/tempjars"/>
+
+ <jar destfile="${build.lib}/${name}-complete-${version}.jar">
+ <manifest>
+ <attribute name="Extension-Name" value="${name}"/>
+ <attribute name="Specification-Vendor" value="Apache Software
Foundation"/>
+ <attribute name="Specification-Version" value="1.0"/>
+ <attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
+ <attribute name="Implementation-Version" value="${package-version}"/>
+ </manifest>
+ <zipgroupfileset dir="${build.dir}/tempjars">
+ <include name="*.jar"/>
+ </zipgroupfileset>
+ </jar>
+ </target>
+
<!-- Creates all the Javadocs -->
<target name="javadocs" depends="compile" description="Generates the javadocs"
unless="skip.javadocs">
@@ -392,7 +418,7 @@
</target>
<!-- Creates a mini jar-only distribution -->
- <target name="dist-jar" depends="jar">
+ <target name="dist-jar" depends="big-jar">
<mkdir dir="${dist.dir}"/>
<copy todir="${dist.dir}">
<fileset dir="${build.lib}">
1.20 +21 -25 jakarta-avalon-excalibur/component/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/component/default.properties,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- default.properties 29 Jan 2003 13:45:42 -0000 1.19
+++ default.properties 5 Feb 2003 02:28:35 -0000 1.20
@@ -9,8 +9,8 @@
name.servlet=excalibur-component-servlet
Name=Excalibur Component
dir-name=component
-version=1.0
-package-version=0.99
+version=1.1
+package-version=1.1
year=2000-2002
# --------------------------------------------------
@@ -28,20 +28,10 @@
avalon-framework.lib=${avalon-framework.home}/target/lib
avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
-# ----- Excalibur event, version 1.0 or later -----
-excalibur-event.home=${basedir}/../event/dist
-excalibur-event.lib=${excalibur-event.home}
-excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0a.jar
-
-# ----- Excalibur Collections, version 1.0 or later -----
-excalibur-collections.home=${basedir}/../collections/dist
-excalibur-collections.lib=${excalibur-collections.home}
-excalibur-collections.jar=${excalibur-collections.lib}/excalibur-collections-1.0.jar
-
# ----- Excalibur logger, version 1.0 or later -----
excalibur-logger.home=${basedir}/../logger/dist
excalibur-logger.lib=${excalibur-logger.home}
-excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.jar
+excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.1.jar
# ----- Excalibur pool, version 1.1 or later -----
excalibur-pool.home=${basedir}/../pool/dist
@@ -53,6 +43,12 @@
excalibur-i18n.lib=${excalibur-i18n.home}
excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.1.jar
+# ----- Doug Lea's Concurrent Utils, version 1.3 or later -----
+util.concurrent.jar=${basedir}/../event/lib/util.concurrent-1.3.1.jar
+
+# ----- Commons collections, version 2.1 or later -----
+commons-collections.jar=${basedir}/../event/lib/commons-collections-2.1.jar
+
# ----- Excalibur instrument -----
excalibur-instrument.home=${basedir}/../instrument/dist
excalibur-instrument.lib=${excalibur-instrument.home}
@@ -64,17 +60,22 @@
excalibur-instrument-manager.jar=${excalibur-instrument-manager.lib}/excalibur-instrument-manager-0.3.jar
excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.lib}/excalibur-instrument-manager-interfaces-0.3.jar
-# ----- AltRMI -----
-excalibur-altrmi.home=${basedir}/../altrmi/dist
-excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common-0.7.jar
-excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl-0.7.jar
-excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces-0.7.jar
-
# --------------------------------------------------
# OPTIONAL LIBRARIES
# --------------------------------------------------
# For optional ComponentManagerCreatorServlet support.
-servlet.jar=${lib.repo}/servletapi-2.2.jar
+lib.repo=lib/
+servlet.jar=${lib.repo}/servlet.jar
+
+# ----- AltRMI -----
+excalibur-altrmi.home=${basedir}/../altrmi/dist
+excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common-0.9.jar
+excalibur-altrmi-registry.jar=${excalibur-altrmi.home}/excalibur-altrmi-registry-0.9.jar
+excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl-0.9.jar
+excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces-0.9.jar
+excalibur-altrmi-client-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-impl-0.9.jar
+excalibur-altrmi-client-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-interfaces-0.9.jar
+excalibur-altrmi-generator.jar=${excalibur-altrmi.home}/excalibur-altrmi-generator-0.9.jar
# For unit testing:
@@ -87,11 +88,6 @@
excalibur-testcase.home=${basedir}/../testcase/dist
excalibur-testcase.lib=${excalibur-testcase.home}
excalibur-testcase.jar=${excalibur-testcase.lib}/excalibur-testcase-1.0.jar
-
-# ----- Excalibur instrument, version 0.1 or later -----
-excalibur-instrument.home=${basedir}/../instrument/dist
-excalibur-instrument.lib=${excalibur-instrument.home}
-excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.3.jar
# --------------------------------------------------
1.5 +5 -5
jakarta-avalon-excalibur/component/examples/instrument-manager/src/java/org/apache/avalon/excalibur/component/example_im/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/component/examples/instrument-manager/src/java/org/apache/avalon/excalibur/component/example_im/Main.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Main.java 7 Nov 2002 11:46:13 -0000 1.4
+++ Main.java 5 Feb 2003 02:28:35 -0000 1.5
@@ -11,7 +11,7 @@
import java.io.File;
import java.io.InputStreamReader;
import org.apache.avalon.excalibur.component.ExcaliburComponentManagerCreator;
-import org.apache.avalon.excalibur.concurrent.ThreadBarrier;
+import EDU.oswego.cs.util.concurrent.CyclicBarrier;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.service.ServiceManager;
@@ -88,7 +88,7 @@
try
{
int concurrent = 100;
- ThreadBarrier barrier = new ThreadBarrier( concurrent );
+ CyclicBarrier barrier = new CyclicBarrier( concurrent );
int cnt = Integer.parseInt( cntStr );
int average = Math.max( cnt / concurrent, 1 );
@@ -136,7 +136,7 @@
{
private final int m_numIterations;
private final ExampleInstrumentable m_instrumentable;
- private final ThreadBarrier m_barrier;
+ private final CyclicBarrier m_barrier;
protected ActionRunner( ExampleInstrumentable instrumentable, int
numIterations, ThreadBarrier barrier )
{
@@ -154,7 +154,7 @@
try
{
- m_barrier.barrierSynchronize();
+ m_barrier.barrier();
}
catch( Exception e )
{
1.17 +7 -7
jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java
Index: DefaultComponentFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultComponentFactory.java 9 Nov 2002 08:41:03 -0000 1.16
+++ DefaultComponentFactory.java 5 Feb 2003 02:28:35 -0000 1.17
@@ -9,7 +9,7 @@
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.avalon.excalibur.collections.BucketMap;
+import org.apache.commons.collections.StaticBucketMap;
import org.apache.avalon.excalibur.logger.LogKitManageable;
import org.apache.avalon.excalibur.pool.ObjectFactory;
import org.apache.avalon.framework.activity.Disposable;
@@ -76,9 +76,9 @@
* proxies, if they are Composables. These must be seperate maps in case
* a component falls into more than one category, which they often do.
*/
- private final BucketMap m_composableProxies = new BucketMap();
- private final BucketMap m_serviceableProxies = new BucketMap();
- private final BucketMap m_componentProxies = new BucketMap();
+ private final StaticBucketMap m_composableProxies = new StaticBucketMap();
+ private final StaticBucketMap m_serviceableProxies = new StaticBucketMap();
+ private final StaticBucketMap m_componentProxies = new StaticBucketMap();
/** Instrument Manager to register objects created by this factory with (May be
null). */
private InstrumentManager m_instrumentManager;
@@ -456,10 +456,10 @@
{
private final ComponentManager m_realManager;
- /** Use a BucketMap rather than an ArrayList as above because this will
+ /** Use a StaticBucketMap rather than an ArrayList as above because this
will
* contain Proxy instances. And proxy instances always return false for
* equals() making a test for inclusion in the list always fail. */
- private final BucketMap m_unreleased = new BucketMap();
+ private final StaticBucketMap m_unreleased = new StaticBucketMap();
ServiceManagerProxy( final ComponentManager manager )
{
1.22 +7 -7
jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentManager.java
Index: ExcaliburComponentManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentManager.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ExcaliburComponentManager.java 28 Nov 2002 15:54:06 -0000 1.21
+++ ExcaliburComponentManager.java 5 Feb 2003 02:28:35 -0000 1.22
@@ -10,7 +10,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.avalon.excalibur.collections.BucketMap;
+import org.apache.commons.collections.StaticBucketMap;
import org.apache.avalon.excalibur.logger.LogKitManageable;
import org.apache.avalon.excalibur.logger.LogKitManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
@@ -67,10 +67,10 @@
private Context m_context;
/** Static component mapping handlers. */
- private final BucketMap m_componentMapping = new BucketMap();
+ private final StaticBucketMap m_componentMapping = new StaticBucketMap();
/** Used to map roles to ComponentHandlers. */
- private final BucketMap m_componentHandlers = new BucketMap();
+ private final StaticBucketMap m_componentHandlers = new StaticBucketMap();
/** added component handlers before initialization to maintain
* the order of initialization
@@ -333,7 +333,7 @@
return;
}
- // The m_componentMapping BucketMap itself is threadsafe, and because the
same component
+ // The m_componentMapping StaticBucketMap itself is threadsafe, and because
the same component
// will never be released by more than one thread, this method does not
need any
// synchronization around the access to the map.
@@ -528,7 +528,7 @@
getLogger().error( "Caught an exception trying to
initialize "
+ "the component handler.", e );
}
-
+
// Rethrow the exception
throw e;
}
@@ -565,7 +565,7 @@
{
getLogger().error( "Caught an exception trying to
initialize "
+ "the component handler.", e );
-
+
// Rethrow the exception
throw e;
}
1.18 +5 -5
jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentSelector.java
Index: ExcaliburComponentSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ExcaliburComponentSelector.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ExcaliburComponentSelector.java 7 Nov 2002 06:37:53 -0000 1.17
+++ ExcaliburComponentSelector.java 5 Feb 2003 02:28:35 -0000 1.18
@@ -10,7 +10,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.avalon.excalibur.collections.BucketMap;
+import org.apache.commons.collections.StaticBucketMap;
import org.apache.avalon.excalibur.logger.LogKitManageable;
import org.apache.avalon.excalibur.logger.LogKitManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
@@ -80,11 +80,11 @@
/** Static component handlers.
*/
- private BucketMap m_componentHandlers = new BucketMap();
+ private StaticBucketMap m_componentHandlers = new StaticBucketMap();
/** Dynamic component handlers mapping.
*/
- private BucketMap m_componentMapping = new BucketMap();
+ private StaticBucketMap m_componentMapping = new StaticBucketMap();
/** Flag for if this is disposed or not.
*/
@@ -653,7 +653,7 @@
*
* @return A reference to the componentHandler Map.
*/
- protected BucketMap getComponentHandlers()
+ protected StaticBucketMap getComponentHandlers()
{
return m_componentHandlers;
}
1.7 +2 -2
jakarta-avalon-excalibur/concurrent/src/java/org/apache/avalon/excalibur/concurrent/ThreadBarrier.java
Index: ThreadBarrier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/concurrent/src/java/org/apache/avalon/excalibur/concurrent/ThreadBarrier.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ThreadBarrier.java 8 Oct 2002 03:15:14 -0000 1.6
+++ ThreadBarrier.java 5 Feb 2003 02:28:36 -0000 1.7
@@ -13,7 +13,7 @@
* consistent concurrency where you don't want to take the performance penalty
* of providing mutual exclusion to shared resources
*
- * @deprecated use EDU.oswego.cs.dl.util.concurrent.Barrier instead
+ * @deprecated use EDU.oswego.cs.dl.util.concurrent.CyclicBarrier instead
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Karthik Rangaraju</a>
* @version CVS $Revision$ $Date$
1.8 +6 -6
jakarta-avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/test/DataSourceJdbcTestCase.java
Index: DataSourceJdbcTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/test/DataSourceJdbcTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DataSourceJdbcTestCase.java 2 Sep 2002 12:49:30 -0000 1.7
+++ DataSourceJdbcTestCase.java 5 Feb 2003 02:28:36 -0000 1.8
@@ -12,7 +12,7 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Random;
-import org.apache.avalon.excalibur.concurrent.ThreadBarrier;
+import EDU.oswego.cs.util.concurrent.CyclicBarrier;
import org.apache.avalon.excalibur.datasource.DataSourceComponent;
import org.apache.avalon.excalibur.testcase.CascadingAssertionFailedError;
import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
@@ -30,7 +30,7 @@
extends ExcaliburTestCase
{
protected boolean isSuccessful;
- protected ThreadBarrier barrier;
+ protected CyclicBarrier barrier;
protected int connectionCount;
public DataSourceJdbcTestCase( String name )
@@ -111,12 +111,12 @@
( new Thread( new ConnectionThread( this, ds ) ) ).start();
}
- this.barrier = new ThreadBarrier( 11 );
+ this.barrier = new CyclicBarrier( 11 );
try
{
- this.barrier.barrierSynchronize();
+ this.barrier.barrier();
}
- catch( InterruptedException ie )
+ catch( Exception ie )
{
// Ignore
}
@@ -182,7 +182,7 @@
try
{
- this.testcase.barrier.barrierSynchronize();
+ this.testcase.barrier.barrier();
}
catch( final InterruptedException ie )
{
1.57 +1 -6 jakarta-avalon-excalibur/fortress/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- default.properties 29 Jan 2003 13:45:42 -0000 1.56
+++ default.properties 5 Feb 2003 02:28:36 -0000 1.57
@@ -67,7 +67,7 @@
# ----- Excalibur logger, version 1.0 or later -----
excalibur-logger.home=${basedir}/../logger/dist
excalibur-logger.lib=${excalibur-logger.home}
-excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.jar
+excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.1.jar
# ----- AltRMI -----
excalibur-altrmi.home=${basedir}/../altrmi/dist
@@ -88,11 +88,6 @@
logkit.home=${basedir}/../../jakarta-avalon-logkit
logkit.lib=${logkit.home}/build/lib
logkit.jar=${logkit.lib}/logkit.jar
-
-# ----- Excalibur Concurrent, version 1.0 or later -----
-#excalibur-concurrent.home=${basedir}/../concurrent/dist
-#excalibur-concurrent.lib=${excalibur-concurrent.home}
-#excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-1.0.jar
# --------------------------------------------------
# REQUIRED LIBRARIES FOR UNIT TESTS
1.17 +9 -7 jakarta-avalon-excalibur/logger/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/logger/default.properties,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- default.properties 29 Jan 2003 13:45:42 -0000 1.16
+++ default.properties 5 Feb 2003 02:28:36 -0000 1.17
@@ -9,9 +9,9 @@
name=excalibur-logger
Name=Excalibur Logger
dir-name=logger
-version=1.0
-package-version=1.0
-year=2000-2002
+version=1.0.1
+package-version=1.0.1
+year=2000-2003
# --------------------------------------------------
# REQUIRED LIBRARIES
@@ -34,11 +34,13 @@
# --------------------------------------------------
# For optional logging capabilities. See http://jakarta.apache.org/turbine/jars/
-servlet.jar=${lib.repo}/servletapi-2.2.jar
+#defaults lib.repo to a lib directory
+lib.repo=${basedir}/lib
+servlet.jar=${lib.repo}/servlet.jar
jdbc.jar=${lib.repo}/jdbc2_0-stdext.jar
-mail.jar=${lib.repo}/javamail-1.2.jar
-jms.jar=${lib.repo}/jms-1.0.2b.jar
-log4j.jar=${avalon-framework.home}/lib/log4j-1.2.4.jar
+mail.jar=${lib.repo}/mail.jar
+jms.jar=${lib.repo}/jms.jar
+log4j.jar=${avalon-framework.home}/lib/log4j-1.2.7.jar
# For unit testing:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
