Changes to prepare for version 1.4.x beta

h2/src/test/org/h2/test/jaqu/AnnotationsTest.java

@@ -10,7 +10,8 @@ import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
-import org.h2.constant.ErrorCode;
+
+import org.h2.api.ErrorCode;
 import org.h2.jaqu.Db;
 import org.h2.test.TestBase;
 import org.h2.util.JdbcUtils;

h2/src/test/org/h2/test/jdbc/TestCallableStatement.java

@@ -23,7 +23,7 @@ import java.sql.Timestamp;
 import java.sql.Types;
 import java.util.Collections;
 
-import org.h2.constant.ErrorCode;
+import org.h2.api.ErrorCode;
 import org.h2.test.TestBase;
 import org.h2.tools.SimpleResultSet;
 import org.h2.util.IOUtils;

h2/src/test/org/h2/test/jdbc/TestCancel.java

@@ -12,7 +12,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Savepoint;
 import java.sql.Statement;
-import org.h2.constant.ErrorCode;
+
+import org.h2.api.ErrorCode;
 import org.h2.test.TestBase;
 
 /**

h2/src/test/org/h2/test/jdbc/TestDatabaseEventListener.java

@@ -14,7 +14,7 @@ import java.util.Properties;
 
 import org.h2.Driver;
 import org.h2.api.DatabaseEventListener;
-import org.h2.constant.ErrorCode;
+import org.h2.api.ErrorCode;
 import org.h2.test.TestBase;
 
 /**

h2/src/test/org/h2/test/jdbc/TestJavaObject.java

@@ -15,7 +15,8 @@ import java.sql.Statement;
 import java.sql.Types;
 import java.util.Arrays;
 import java.util.UUID;
-import org.h2.constant.SysProperties;
+
+import org.h2.engine.SysProperties;
 import org.h2.test.TestBase;
 
 /**

h2/src/test/org/h2/test/jdbc/TestLobApi.java

@@ -21,7 +21,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.Random;
-import org.h2.constant.ErrorCode;
+
+import org.h2.api.ErrorCode;
 import org.h2.jdbc.JdbcConnection;
 import org.h2.test.TestBase;
 import org.h2.util.IOUtils;

h2/src/test/org/h2/test/jdbc/TestMetaData.java

@@ -16,7 +16,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Types;
 
-import org.h2.constant.ErrorCode;
+import org.h2.api.ErrorCode;
 import org.h2.engine.Constants;
 import org.h2.test.TestBase;
 import org.h2.value.DataType;

h2/src/test/org/h2/test/jdbc/TestNativeSQL.java

@@ -12,7 +12,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Random;
 
-import org.h2.constant.ErrorCode;
+import org.h2.api.ErrorCode;
 import org.h2.test.TestBase;
 
 /**

h2/src/test/org/h2/test/jdbc/TestPreparedStatement.java

@@ -31,8 +31,8 @@ import java.util.SimpleTimeZone;
 import java.util.TimeZone;
 import java.util.UUID;
 
+import org.h2.api.ErrorCode;
 import org.h2.api.Trigger;
-import org.h2.constant.ErrorCode;
 import org.h2.test.TestBase;
 import org.h2.util.DateTimeUtils;
 import org.h2.util.Task;

h2/src/test/org/h2/test/jdbc/TestResultSet.java

@@ -36,7 +36,7 @@ import java.util.Collections;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.h2.constant.ErrorCode;
+import org.h2.api.ErrorCode;
 import org.h2.test.TestBase;
 import org.h2.util.IOUtils;
 

h2/src/test/org/h2/test/jdbc/TestStatement.java

@@ -15,8 +15,8 @@ import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Properties;
 
-import org.h2.constant.ErrorCode;
-import org.h2.constant.SysProperties;
+import org.h2.api.ErrorCode;
+import org.h2.engine.SysProperties;
 import org.h2.jdbc.JdbcStatement;
 import org.h2.store.fs.FileUtils;
 import org.h2.test.TestBase;

h2/src/test/org/h2/test/jdbc/TestTransactionIsolation.java

@@ -9,7 +9,7 @@ package org.h2.test.jdbc;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import org.h2.constant.ErrorCode;
+import org.h2.api.ErrorCode;
 import org.h2.test.TestBase;
 
 /**

h2/src/test/org/h2/test/jdbc/TestUpdatableResultSet.java

@@ -21,7 +21,8 @@ import java.sql.Statement;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
-import org.h2.constant.ErrorCode;
+
+import org.h2.api.ErrorCode;
 import org.h2.test.TestBase;
 
 /**

h2/src/test/org/h2/test/jdbc/TestZloty.java

@@ -12,7 +12,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.h2.constant.ErrorCode;
+import org.h2.api.ErrorCode;
 import org.h2.test.TestBase;
 
 /**

h2/src/test/org/h2/test/mvcc/TestMvcc1.java

@@ -13,7 +13,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Random;
 
-import org.h2.constant.ErrorCode;
+import org.h2.api.ErrorCode;
 import org.h2.test.TestBase;
 
 /**

h2/src/test/org/h2/test/mvcc/TestMvcc2.java

@@ -11,7 +11,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.h2.constant.ErrorCode;
+
+import org.h2.api.ErrorCode;
 import org.h2.test.TestBase;
 import org.h2.util.Task;
 

h2/src/test/org/h2/test/mvcc/TestMvccMultiThreaded.java

@@ -11,7 +11,7 @@ import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.concurrent.CountDownLatch;
 
-import org.h2.constant.ErrorCode;
+import org.h2.api.ErrorCode;
 import org.h2.test.TestBase;
 import org.h2.util.Task;