bloritsch 2003/03/25 12:01:48
Modified: datasource build.xml default.properties
datasource/src/java/org/apache/avalon/excalibur/datasource
JdbcConnectionPool.java
Added: datasource/lib LICENSE.hsqldb hsqldb-1.7.1.jar
Log:
changes to make the hsql work
Revision Changes Path
1.40 +4 -0 avalon-excalibur/datasource/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/build.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- build.xml 25 Mar 2003 19:30:31 -0000 1.39
+++ build.xml 25 Mar 2003 20:01:47 -0000 1.40
@@ -278,6 +278,10 @@
<mkdir dir="${build.tests}"/>
+ <java fork="true" classname="org.hsql.Server">
+ <classpath refid="test.class.path"/>
+ </java>
+
<junit fork="true"
haltonfailure="${junit.failonerror}"
printsummary="yes"
1.22 +6 -2 avalon-excalibur/datasource/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/default.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- default.properties 25 Mar 2003 19:30:31 -0000 1.21
+++ default.properties 25 Mar 2003 20:01:47 -0000 1.22
@@ -65,8 +65,12 @@
excalibur-logger.lib=${excalibur-logger.home}
excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.1.jar
-hsqldb.jar=lib/hsqldb-1.7.1
-
+test.jdbc.driver.jar=lib/hsqldb-1.7.1.jar
+test.jdbc.driver=org.hsqldb.jdbcDriver
+test.jdbc.url=jdbc:hsqldb://localhost
+test.jdbc.user=SA
+test.jdbc.password=
+test.jdbc=true
# --------------------------------------------------
1.1 avalon-excalibur/datasource/lib/LICENSE.hsqldb
Index: LICENSE.hsqldb
===================================================================
* Copyright (c) 2001, The HSQL Development Group
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
*
* Neither the name of the HSQL Development Group nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This package is based on HypersonicSQL, originally developed by Thomas Mueller.
1.1 avalon-excalibur/datasource/lib/hsqldb-1.7.1.jar
<<Binary file>>
1.22 +4 -3
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JdbcConnectionPool.java 25 Mar 2003 18:38:20 -0000 1.21
+++ JdbcConnectionPool.java 25 Mar 2003 20:01:48 -0000 1.22
@@ -127,14 +127,15 @@
long endTime = curMillis + m_wait;
while( ( null == conn ) && ( curMillis < endTime ) )
{
- m_waitingThreads.add( Thread.currentThread() );
+ Thread thread = Thread.currentThread();
+ m_waitingThreads.add( thread );
try
{
curMillis = System.currentTimeMillis();
unlock();
- Thread.sleep( endTime - curMillis );
+ thread.wait( endTime - curMillis );
}
finally
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
