bloritsch 2002/10/02 20:36:07
Modified: concurrent/src/java/org/apache/avalon/excalibur/concurrent
DjikstraSemaphore.java Lock.java Mutex.java
ReadWriteLock.java
datasource default.properties
datasource/examples/src/java/org/apache/avalon/examples/jdbcdatasource
DefaultHelloDBService.java HelloDBService.java
Main.java
datasource/src/java/org/apache/avalon/excalibur/datasource
DataSourceComponent.java
fortress build.xml default.properties
monitor/src/java/org/apache/avalon/excalibur/monitor
Resource.java
Log:
Make fortress compile
Revision Changes Path
1.7 +2 -2
jakarta-avalon-excalibur/concurrent/src/java/org/apache/avalon/excalibur/concurrent/DjikstraSemaphore.java
Index: DjikstraSemaphore.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/concurrent/src/java/org/apache/avalon/excalibur/concurrent/DjikstraSemaphore.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DjikstraSemaphore.java 2 Mar 2002 10:12:33 -0000 1.6
+++ DjikstraSemaphore.java 3 Oct 2002 03:36:06 -0000 1.7
@@ -25,7 +25,7 @@
/**
* Creates a Djikstra semaphore with the specified max count and initial
* count set to the max count (all resources released)
- * @param pMaxCount is the max semaphores that can be acquired
+ * @param maxCount is the max semaphores that can be acquired
*/
public DjikstraSemaphore( int maxCount )
{
1.5 +3 -1
jakarta-avalon-excalibur/concurrent/src/java/org/apache/avalon/excalibur/concurrent/Lock.java
Index: Lock.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/concurrent/src/java/org/apache/avalon/excalibur/concurrent/Lock.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Lock.java 14 Dec 2001 03:30:47 -0000 1.4
+++ Lock.java 3 Oct 2002 03:36:06 -0000 1.5
@@ -25,6 +25,8 @@
/**
* Locks.
+ *
+ * @throws InterruptedException if the thread is interrupted while waiting on a
lock
*/
public final void lock()
throws InterruptedException
1.5 +2 -1
jakarta-avalon-excalibur/concurrent/src/java/org/apache/avalon/excalibur/concurrent/Mutex.java
Index: Mutex.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/concurrent/src/java/org/apache/avalon/excalibur/concurrent/Mutex.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Mutex.java 21 Mar 2002 04:44:11 -0000 1.4
+++ Mutex.java 3 Oct 2002 03:36:06 -0000 1.5
@@ -17,6 +17,7 @@
public class Mutex
extends Semaphore
{
+ /** Initialize the Mutex */
public Mutex()
{
super( 1 );
1.11 +11 -1
jakarta-avalon-excalibur/concurrent/src/java/org/apache/avalon/excalibur/concurrent/ReadWriteLock.java
Index: ReadWriteLock.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/concurrent/src/java/org/apache/avalon/excalibur/concurrent/ReadWriteLock.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ReadWriteLock.java 14 May 2002 16:06:07 -0000 1.10
+++ ReadWriteLock.java 3 Oct 2002 03:36:06 -0000 1.11
@@ -68,6 +68,9 @@
/**
* @deprecated It's spelled <code>a<b>c</b>quire</code>...
+ *
+ * @throws InterruptedException if the thread is interrupted while waiting
+ * for a lock.
*/
public void aquireRead()
throws InterruptedException
@@ -106,6 +109,9 @@
/**
* @deprecated It's spelled <code>a<b>c</b>quire</code>...
+ *
+ * @throws InterruptedException if the thread is interrupted while waiting
+ * for a lock.
*/
public void aquireWrite()
throws InterruptedException
@@ -164,6 +170,8 @@
/**
* @deprecated It's spelled <code>a<b>c</b>quire</code>...
+ *
+ * @return <code>true</code> iff the lock was successfully obtained.
*/
public boolean tryAquireRead()
{
@@ -193,6 +201,8 @@
/**
* @deprecated It's spelled <code>a<b>c</b>quire</code>...
+ *
+ * @return <code>true</code> iff the lock was successfully obtained.
*/
public boolean tryAquireWrite()
{
1.14 +124 -124 jakarta-avalon-excalibur/datasource/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/datasource/default.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- default.properties 7 Aug 2002 16:33:22 -0000 1.13
+++ default.properties 3 Oct 2002 03:36:06 -0000 1.14
@@ -1,124 +1,124 @@
-# -------------------------------------------------------------------
-# B U I L D P R O P E R T I E S
-# -------------------------------------------------------------------
-# Specifies default property values
-# Overridden by ../default.properties and all ant.properties
-# Not user-editable; use ant.properties files instead
-
-name=excalibur-datasource
-Name=Excalibur Datasource
-dir-name=datasource
-version=1.0
-package-version=0.99
-year=2000-2002
-
-# --------------------------------------------------
-# REQUIRED LIBRARIES
-# --------------------------------------------------
-
-# ----- Avalon Framework -----
-avalon-framework.home=${basedir}/../../jakarta-avalon
-avalon-framework.lib=${avalon-framework.home}/build/lib
-avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
-
-# ----- Logkit -----
-logkit.home=${basedir}/../../jakarta-avalon-logkit
-logkit.lib=${logkit.home}/build/lib
-logkit.jar=${logkit.lib}/logkit.jar
-
-# ----- Excalibur pool, version 1.1 or later -----
-excalibur-pool.home=${basedir}/../pool/dist
-excalibur-pool.lib=${excalibur-pool.home}
-excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
-
-# ----- Excalibur instrument, version 1.0 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
-
-# --------------------------------------------------
-# OPTIONAL LIBRARIES
-# --------------------------------------------------
-
-# For unit testing
-
-# ----- Excalibur testcase, version 1.0 or later -----
-excalibur-testcase.home=${basedir}/../testcase/dist
-excalibur-testcase.lib=${excalibur-testcase.home}
-excalibur-testcase.jar=${excalibur-testcase.lib}/excalibur-testcase-1.0.jar
-
-# ----- Excalibur component, version 1.0 or later -----
-excalibur-component.home=${basedir}/../component/dist
-excalibur-component.lib=${excalibur-component.home}
-excalibur-component.jar=${excalibur-component.lib}/excalibur-component-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 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
-
-# ----- 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
-
-# --------------------------------------------------
-
-# Settings used to configure compile environment
-build.debug = on
-build.optimize = off
-build.deprecation = off
-build.compress = false
-junit.failonerror = false
-
-# location of intermediate products
-build.dir = build
-build.testsrc = ${build.dir}/testsrc
-build.testclasses = ${build.dir}/testclasses
-build.src = ${build.dir}/src
-build.testsrc = ${build.dir}/testsrc
-build.testclasses = ${build.dir}/testclasses
-build.lib = ${build.dir}/lib
-build.conf = ${build.dir}/conf
-build.classes = ${build.dir}/classes
-build.tests = ${build.dir}/tests
-build.reports = ${build.dir}/reports
-
-# Set the properties for source directories
-src.dir = src
-java.dir = ${src.dir}/java
-conf.dir = ${src.dir}/conf
-test.dir = ${src.dir}/test
-
-# needed by Cocoon
-build.context = ${build.dir}/documentation
-build.docs = ${build.dir}/docs
-build.xdocs = ${build.dir}/xdocs
-context.dir = ../../jakarta-avalon/src/documentation
-tools.dir = ../../jakarta-avalon/tools
-tools.jar = ${java.home}/../lib/tools.jar
-docs.dir = docs
-xdocs.dir = ${src.dir}/xdocs
-
-# Set the properties for distribution directories
-dist.dir = dist
-dist.javadocs = ${docs.dir}/api
-
-# name of .zip/.tar.gz/.bz2 files and their top-level directory
-dist.name = ${name}-${version}
-
-# name of jar file
-jar.name = ${name}-${version}.jar
-jar.cluster.name = ${name}-cluster-${version}a.jar
-jar.ids.name = ${name}-ids-${version}a.jar
-
-# property indicating directory where all distribution archives are placed
-dist.base = distributions
-
-depchecker.prefix=.
-
+# -------------------------------------------------------------------
+# B U I L D P R O P E R T I E S
+# -------------------------------------------------------------------
+# Specifies default property values
+# Overridden by ../default.properties and all ant.properties
+# Not user-editable; use ant.properties files instead
+
+name=excalibur-datasource
+Name=Excalibur Datasource
+dir-name=datasource
+version=1.0
+package-version=0.99
+year=2000-2002
+
+# --------------------------------------------------
+# REQUIRED LIBRARIES
+# --------------------------------------------------
+
+# ----- Avalon Framework -----
+avalon-framework.home=${basedir}/../../jakarta-avalon
+avalon-framework.lib=${avalon-framework.home}/build/lib
+avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
+
+# ----- Logkit -----
+logkit.home=${basedir}/../../jakarta-avalon-logkit
+logkit.lib=${logkit.home}/build/lib
+logkit.jar=${logkit.lib}/logkit.jar
+
+# ----- Excalibur pool, version 1.1 or later -----
+excalibur-pool.home=${basedir}/../pool/dist
+excalibur-pool.lib=${excalibur-pool.home}
+excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
+
+# ----- Excalibur instrument, version 1.0 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
+
+# --------------------------------------------------
+# OPTIONAL LIBRARIES
+# --------------------------------------------------
+
+# For unit testing
+
+# ----- Excalibur testcase, version 1.0 or later -----
+excalibur-testcase.home=${basedir}/../testcase/dist
+excalibur-testcase.lib=${excalibur-testcase.home}
+excalibur-testcase.jar=${excalibur-testcase.lib}/excalibur-testcase-1.0.jar
+
+# ----- Excalibur component, version 1.0 or later -----
+excalibur-component.home=${basedir}/../component/dist
+excalibur-component.lib=${excalibur-component.home}
+excalibur-component.jar=${excalibur-component.lib}/excalibur-component-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 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
+
+# ----- 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
+
+# --------------------------------------------------
+
+# Settings used to configure compile environment
+build.debug = on
+build.optimize = off
+build.deprecation = off
+build.compress = false
+junit.failonerror = false
+
+# location of intermediate products
+build.dir = build
+build.testsrc = ${build.dir}/testsrc
+build.testclasses = ${build.dir}/testclasses
+build.src = ${build.dir}/src
+build.testsrc = ${build.dir}/testsrc
+build.testclasses = ${build.dir}/testclasses
+build.lib = ${build.dir}/lib
+build.conf = ${build.dir}/conf
+build.classes = ${build.dir}/classes
+build.tests = ${build.dir}/tests
+build.reports = ${build.dir}/reports
+
+# Set the properties for source directories
+src.dir = src
+java.dir = ${src.dir}/java
+conf.dir = ${src.dir}/conf
+test.dir = ${src.dir}/test
+
+# needed by Cocoon
+build.context = ${build.dir}/documentation
+build.docs = ${build.dir}/docs
+build.xdocs = ${build.dir}/xdocs
+context.dir = ../../jakarta-avalon/src/documentation
+tools.dir = ../../jakarta-avalon/tools
+tools.jar = ${java.home}/../lib/tools.jar
+docs.dir = docs
+xdocs.dir = ${src.dir}/xdocs
+
+# Set the properties for distribution directories
+dist.dir = dist
+dist.javadocs = ${docs.dir}/api
+
+# name of .zip/.tar.gz/.bz2 files and their top-level directory
+dist.name = ${name}-${version}
+
+# name of jar file
+jar.name = ${name}-${version}.jar
+jar.cluster.name = ${name}-cluster-${version}a.jar
+jar.ids.name = ${name}-ids-${version}a.jar
+
+# property indicating directory where all distribution archives are placed
+dist.base = distributions
+
+depchecker.prefix=.
+
1.2 +7 -3
jakarta-avalon-excalibur/datasource/examples/src/java/org/apache/avalon/examples/jdbcdatasource/DefaultHelloDBService.java
Index: DefaultHelloDBService.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/datasource/examples/src/java/org/apache/avalon/examples/jdbcdatasource/DefaultHelloDBService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultHelloDBService.java 18 Jun 2002 13:15:54 -0000 1.1
+++ DefaultHelloDBService.java 3 Oct 2002 03:36:06 -0000 1.2
@@ -17,7 +17,6 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.component.Composable;
@@ -51,6 +50,7 @@
/*---------------------------------------------------------------
* Constructors
*-------------------------------------------------------------*/
+ /** Instantiate a DefaultHelloDBService */
public DefaultHelloDBService()
{
}
@@ -76,6 +76,8 @@
* Initializes the database by creating the required table. Normally
* this would not be needed. But doing this with HSQLDB makes it easier
* to run the example.
+ *
+ * @throws SQLException if there is a problem setting the database up.
*/
private void initializeDatabase()
throws SQLException
@@ -116,6 +118,8 @@
*-------------------------------------------------------------*/
/**
* Adds a single row to the database.
+ *
+ * @param title The row title
*/
public void addRow( String title )
{
@@ -235,7 +239,7 @@
* Called by the Container to tell the component which ComponentManager
* is controlling it.
*
- * @param ComponentManager which curently owns the component.
+ * @param manager which curently owns the component.
*/
public void compose( ComponentManager manager )
{
1.2 +4 -1
jakarta-avalon-excalibur/datasource/examples/src/java/org/apache/avalon/examples/jdbcdatasource/HelloDBService.java
Index: HelloDBService.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/datasource/examples/src/java/org/apache/avalon/examples/jdbcdatasource/HelloDBService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloDBService.java 18 Jun 2002 13:15:54 -0000 1.1
+++ HelloDBService.java 3 Oct 2002 03:36:06 -0000 1.2
@@ -23,10 +23,13 @@
public interface HelloDBService
extends Component
{
+ /** The lookup key for the HelloDBService */
String ROLE = "org.apache.avalon.examples.jdbcdatasource.HelloDBService";
/**
* Adds a single row to the database.
+ *
+ * @param title The title for the row.
*/
void addRow( String title );
1.2 +11 -3
jakarta-avalon-excalibur/datasource/examples/src/java/org/apache/avalon/examples/jdbcdatasource/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/datasource/examples/src/java/org/apache/avalon/examples/jdbcdatasource/Main.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Main.java 18 Jun 2002 13:15:54 -0000 1.1
+++ Main.java 3 Oct 2002 03:36:06 -0000 1.2
@@ -8,7 +8,6 @@
package org.apache.avalon.examples.jdbcdatasource;
import java.io.BufferedReader;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -17,7 +16,6 @@
import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.context.DefaultContext;
@@ -48,6 +46,10 @@
*-------------------------------------------------------------*/
/**
* Creates and initializes the component manager using config files.
+ *
+ * @return the ECM for use.
+ *
+ * @throws Exception if we cannot build the ECM
*/
private static ExcaliburComponentManager createComponentManager()
throws Exception
@@ -95,6 +97,8 @@
/**
* Loop and handle requests from the user.
+ *
+ * @param helloDB The HelloDBService we are using to handle our requests
*/
private static void handleRequests( HelloDBService helloDB )
{
@@ -150,6 +154,10 @@
*-------------------------------------------------------------*/
/**
* All of the guts of this example exist in the main method.
+ *
+ * @param args The command line arguments
+ *
+ * @throws Exception if there is any problem running this example
*/
public static void main( String[] args )
throws Exception
1.7 +3 -1
jakarta-avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/DataSourceComponent.java
Index: DataSourceComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/DataSourceComponent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DataSourceComponent.java 16 Mar 2002 00:05:40 -0000 1.6
+++ DataSourceComponent.java 3 Oct 2002 03:36:06 -0000 1.7
@@ -31,6 +31,8 @@
/**
* Gets the Connection to the database
*
+ * @return Connection a valid connection for you to use
+ *
* @throws NoValidConnectionException when there is no valid Connection wrapper
* available in the classloader.
*
1.55 +3 -4 jakarta-avalon-excalibur/fortress/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- build.xml 25 Sep 2002 15:13:42 -0000 1.54
+++ build.xml 3 Oct 2002 03:36:06 -0000 1.55
@@ -15,7 +15,7 @@
<pathelement location="${avalon-framework.jar}"/>
<pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
<pathelement location="${logkit.jar}"/>
- <pathelement location="${excalibur-collections.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${excalibur-instrument-manager.jar}"/>
<pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
@@ -70,7 +70,7 @@
</target>
<target name="big-jar" depends="jar,copy-optional-libs" description="Build the
big jar with all dependencies included">
- <copy file="${excalibur-collections.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${commons-collections.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"/>
@@ -82,7 +82,7 @@
<copy file="${excalibur-event.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-logger.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-sourceresolve.jar}" todir="${build.dir}/tempjars"/>
- <copy file="${excalibur-concurrent.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${util.concurrent.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-container.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-threadcontext.jar}" todir="${build.dir}/tempjars"/>
<copy file="${build.lib}/${jar.name}" todir="${build.dir}/tempjars"/>
@@ -112,7 +112,6 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkAltrmi"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCollections"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrument"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrumentManager"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkSourceResolve"/>
1.38 +5 -6 jakarta-avalon-excalibur/fortress/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- default.properties 25 Sep 2002 15:10:53 -0000 1.37
+++ default.properties 3 Oct 2002 03:36:06 -0000 1.38
@@ -32,11 +32,6 @@
excalibur-meta.lib=${excalibur-meta.home}/build/lib
excalibur-meta.jar=${excalibur-meta.lib}/excalibur-meta-1.0.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 instrument, version 1.0 or later -----
excalibur-instrument.home=${basedir}/../instrument/dist
excalibur-instrument.lib=${excalibur-instrument.home}
@@ -51,7 +46,11 @@
# ----- 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-event.jar=${excalibur-event.lib}/excalibur-event-1.0.jar
+
+# ----- Commons collections, version 1.0 or later -----
+commons-collections.jar=${basedir}/../event/lib/commons-collections-20021002.jar
+util.concurrent.jar=${basedir}/../event/lib/util.concurrent-1.3.1.jar
# ----- Excalibur Source Resolver, version 1.0 or later -----
excalibur-sourceresolve.home=${basedir}/../sourceresolve/dist
1.17 +6 -1
jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/Resource.java
Index: Resource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/Resource.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Resource.java 9 Sep 2002 21:24:19 -0000 1.16
+++ Resource.java 3 Oct 2002 03:36:07 -0000 1.17
@@ -217,4 +217,9 @@
{
return m_eventSupport;
}
+
+ public String toString()
+ {
+ return m_resourceKey;
+ }
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
