You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/03/25 19:38:20 UTC
cvs commit: avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource JdbcConnectionPool.java
bloritsch 2003/03/25 10:38:20
Modified: datasource build.xml default.properties
datasource/src/java/org/apache/avalon/excalibur/datasource
JdbcConnectionPool.java
Log:
update build so that test scripts compile
Revision Changes Path
1.38 +1 -1 avalon-excalibur/datasource/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/build.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build.xml 24 Mar 2003 20:23:36 -0000 1.37
+++ build.xml 25 Mar 2003 18:38:19 -0000 1.38
@@ -21,6 +21,7 @@
<pathelement location="${logkit.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${excalibur-pool.jar}"/>
+ <pathelement location="${util.concurrent.jar}"/>
<pathelement path="${java.class.path}"/>
</path>
@@ -58,7 +59,6 @@
<!-- Need the jar to prevent recursive deps. -->
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
</target>
1.20 +6 -7 avalon-excalibur/datasource/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/default.properties,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- default.properties 5 Mar 2003 04:14:57 -0000 1.19
+++ default.properties 25 Mar 2003 18:38:20 -0000 1.20
@@ -36,26 +36,25 @@
excalibur-instrument.lib=${excalibur-instrument.home}
excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-1.0.jar
+# ----- Doug Lea's Concurrent Utils, version 1.3 or later -----
+util.concurrent.jar=../lib/util.concurrent-1.3.1.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-component.jar=${excalibur-component.lib}/excalibur-component-1.1.jar
+excalibur-testcase.jar=${excalibur-component.lib}/excalibur-testcase-1.1.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
# --------------------------------------------------
1.21 +3 -4 avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/JdbcConnectionPool.java
Index: JdbcConnectionPool.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/JdbcConnectionPool.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JdbcConnectionPool.java 5 Mar 2003 18:59:02 -0000 1.20
+++ JdbcConnectionPool.java 25 Mar 2003 18:38:20 -0000 1.21
@@ -127,15 +127,14 @@
long endTime = curMillis + m_wait;
while( ( null == conn ) && ( curMillis < endTime ) )
{
- Object thread = Thread.currentThread();
- m_waitingThreads.add( thread );
+ m_waitingThreads.add( Thread.currentThread() );
try
{
curMillis = System.currentTimeMillis();
unlock();
- thread.wait( endTime - curMillis );
+ Thread.sleep( endTime - curMillis );
}
finally
{
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org