Author: tv
Date: Wed May 23 13:52:02 2007
New Revision: 541069
URL: http://svn.apache.org/viewvc?view=rev&rev=541069
Log:
Fixed the hsqldb helper class. It was using Java 1.5 methods (File.toURI()).
Removed the methods supporting URL, they are not used anyway. The sql file
processing was error prone, it didn't care for comments correctly.
Modified:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java
Modified:
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java?view=diff&rev=541069&r1=541068&r2=541069
==============================================================================
---
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java
(original)
+++
jakarta/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/HsqlDB.java
Wed May 23 13:52:02 2007
@@ -60,11 +60,6 @@
}
}
- public HsqlDB(String uri, URL loadFile) throws Exception
- {
- this(uri, new File(loadFile.toURI()));
- }
-
public HsqlDB(String uri, File loadFile) throws Exception
{
this(uri, loadFile.getAbsolutePath());
@@ -93,7 +88,9 @@
{
statement = connection.createStatement();
String commands = getFileContents(fileName);
+ statement.execute(commands);
+/*
for (int targetPos = commands.indexOf(';'); targetPos > -1;
targetPos = commands.indexOf(';'))
{
String cmd = commands.substring(0, targetPos + 1);
@@ -108,6 +105,7 @@
commands = commands.substring(targetPos + 2);
}
+*/
}
finally
{
@@ -141,11 +139,6 @@
{
loadSqlFile(sqlFile);
}
- }
-
- public void addSQL(URL sqlFile) throws Exception
- {
- this.addSQL(new File(sqlFile.toURI()));
}
public void addSQL(File sqlFile) throws Exception
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
