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 20:30:31 UTC
cvs commit: avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/ids/test TableIdGeneratorJdbcTestCase.java TableIdGeneratorMultithreadedJdbcTestCase.java
bloritsch 2003/03/25 11:30:31
Modified: datasource build.xml default.properties
datasource/src/test/org/apache/avalon/excalibur/datasource/ids/test
TableIdGeneratorJdbcTestCase.java
TableIdGeneratorMultithreadedJdbcTestCase.java
Log:
make classpath work
Revision Changes Path
1.39 +3 -0 avalon-excalibur/datasource/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/build.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- build.xml 25 Mar 2003 18:38:19 -0000 1.38
+++ build.xml 25 Mar 2003 19:30:31 -0000 1.39
@@ -21,7 +21,9 @@
<pathelement location="${logkit.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${excalibur-pool.jar}"/>
+ <pathelement location="${comons-collections.jar}"/>
<pathelement location="${util.concurrent.jar}"/>
+ <pathelement location="${excalibur-i18n.jar}"/>
<pathelement path="${java.class.path}"/>
</path>
@@ -52,6 +54,7 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkI18n"/>
</target>
<target name="dependencies-test" depends="dist-jar, dependencies"
1.21 +11 -0 avalon-excalibur/datasource/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/default.properties,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- default.properties 25 Mar 2003 18:38:20 -0000 1.20
+++ default.properties 25 Mar 2003 19:30:31 -0000 1.21
@@ -36,6 +36,15 @@
excalibur-instrument.lib=${excalibur-instrument.home}
excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-1.0.jar
+# ----- Excalibur i18n, version 1.0 or later -----
+excalibur-i18n.home=${basedir}/../i18n/dist
+excalibur-i18n.lib=${excalibur-i18n.home}
+excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
+
+
+# ----- Commons Collections, version 2.1 or later -----
+comons-collections.jar=../lib/commons-collections-2.1.jar
+
# ----- Doug Lea's Concurrent Utils, version 1.3 or later -----
util.concurrent.jar=../lib/util.concurrent-1.3.1.jar
@@ -55,6 +64,8 @@
excalibur-logger.home=${basedir}/../logger/dist
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
# --------------------------------------------------
1.8 +2 -3 avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/ids/test/TableIdGeneratorJdbcTestCase.java
Index: TableIdGeneratorJdbcTestCase.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/ids/test/TableIdGeneratorJdbcTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TableIdGeneratorJdbcTestCase.java 22 Mar 2003 12:46:26 -0000 1.7
+++ TableIdGeneratorJdbcTestCase.java 25 Mar 2003 19:30:31 -0000 1.8
@@ -73,7 +73,6 @@
private DataSourceComponent m_dataSource;
private ComponentSelector m_idGeneratorSelector;
- private IdGenerator m_idGenerator;
/*---------------------------------------------------------------
* Constructors
@@ -203,7 +202,7 @@
{
try
{
- int id = idGenerator.getNextIntegerId();
+ idGenerator.getNextIntegerId();
fail( "Should not have gotten an id" );
}
catch( IdException e )
@@ -510,7 +509,7 @@
"WHERE table_name = '" + tableName + "'" );
if( rs.next() )
{
- BigDecimal id = rs.getBigDecimal( 1 );
+ rs.getBigDecimal( 1 );
}
else
{
1.8 +4 -3 avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/ids/test/TableIdGeneratorMultithreadedJdbcTestCase.java
Index: TableIdGeneratorMultithreadedJdbcTestCase.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/src/test/org/apache/avalon/excalibur/datasource/ids/test/TableIdGeneratorMultithreadedJdbcTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TableIdGeneratorMultithreadedJdbcTestCase.java 22 Mar 2003 12:46:26 -0000 1.7
+++ TableIdGeneratorMultithreadedJdbcTestCase.java 25 Mar 2003 19:30:31 -0000 1.8
@@ -49,7 +49,6 @@
*/
package org.apache.avalon.excalibur.datasource.ids.test;
-import java.math.BigDecimal;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -467,6 +466,7 @@
}
}
+/* Never used code
private void initializeNextBigDecimalId( String tableName, BigDecimal nextId )
{
try
@@ -490,7 +490,7 @@
fail( "Unable to initialize next_id. " + e );
}
}
-
+*/
private void initializeNextLongId( String tableName, long nextId )
{
try
@@ -515,6 +515,7 @@
}
}
+/* Never used code
private BigDecimal peekNextBigDecimalId( String tableName )
{
try
@@ -548,7 +549,7 @@
return null; // for compiler
}
}
-
+*/
private long peekNextLongId( String tableName )
{
try
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org