[prev in list] [next in list] [prev in thread] [next in thread]
List: jakarta-commons-dev
Subject: cvs commit: jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/dynabean TestAxionDynaSql.ja
From: jstrachan () apache ! org
Date: 2003-04-30 11:27:31
[Download RAW message or body]
jstrachan 2003/04/30 04:27:31
Modified: sql/src/java/org/apache/commons/sql/io JdbcModelReader.java
DatabaseWriter.java DatabaseReader.java
sql/src/test/org/apache/commons/sql/io
AbstractTestJdbcModelReader.java
TestHsqlDbJdbcModelReader.java
TestAxionJdbcModelReader.java
sql/src/java/org/apache/commons/sql/ddl
AbstractDatabaseMapper.java ModelHelper.java
ProvidersReader.java DDLBuilderFactory.java
DDLBuilder.java DefaultDatabaseMapper.java
sql/src/java/org/apache/commons/sql/util DDL.java
DataSourceWrapper.java JdbcSupport.java
DDLExecutor.java
sql/src/java/org/apache/commons/sql/builder
OracleBuilder.java SybaseBuilder.java
SqlBuilder.java SapDbBuilder.java
MckoiSqlBuilder.java SqlBuilderFactory.java
Db2Builder.java MSSqlBuilder.java
HsqlDbBuilder.java PostgreSqlBuilder.java
MySqlBuilder.java AxionBuilder.java
sql/src/java/org/apache/commons/sql/task
JDBCTransformTask.java JdbcToSchemaTask.java
DDLTask.java
sql/src/java/org/apache/commons/sql/model Table.java
Index.java Column.java Database.java
ForeignKey.java TypeMap.java
sql/src/test/org/apache/commons/sql/task
TestJdbcToSchemaTask.java
sql/src/java/org/apache/commons/sql/dynabean
SqlDynaClass.java SqlDynaBean.java
SqlDynaProperty.java DynaSql.java
sql/src/test/org/apache/commons/sql/model TestColumn.java
TestTypeMap.java
sql/src/test/org/apache/commons/sql/builder TestBuilder.java
sql/src/java/org/apache/commons/sql/type TypesReader.java
TypesWriter.java
sql/src/test/org/apache/commons/sql
TestDataModelRoundTrip.java
sql/src/test/org/apache/commons/sql/dynabean
TestAxionDynaSql.java AbstractTestDynaSql.java
TestHsqlDbDynaSql.java
Log:
organised imports and removed all eclipse warnings
Revision Changes Path
1.3 +8 -5 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/io/JdbcModelReader.java
Index: JdbcModelReader.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/io/JdbcModelReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JdbcModelReader.java 28 Oct 2002 19:42:31 -0000 1.2
+++ JdbcModelReader.java 30 Apr 2003 11:27:26 -0000 1.3
@@ -63,18 +63,21 @@
package org.apache.commons.sql.io;
import java.sql.Connection;
-import java.sql.ResultSet;
import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
+import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.Iterator;
import java.util.List;
import java.util.Vector;
-import java.util.Iterator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.apache.commons.sql.model.*;
+import org.apache.commons.sql.model.Column;
+import org.apache.commons.sql.model.Database;
+import org.apache.commons.sql.model.ForeignKey;
+import org.apache.commons.sql.model.Reference;
+import org.apache.commons.sql.model.Table;
/**
* A tool to read a JDBC database and create a Commons-Sql Database model
1.2 +0 -3 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/io/DatabaseWriter.java
Index: DatabaseWriter.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/io/DatabaseWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DatabaseWriter.java 10 Sep 2002 13:49:42 -0000 1.1
+++ DatabaseWriter.java 30 Apr 2003 11:27:26 -0000 1.2
@@ -65,10 +65,7 @@
import java.io.OutputStream;
import java.io.Writer;
-import org.apache.commons.betwixt.XMLIntrospector;
import org.apache.commons.betwixt.io.BeanWriter;
-
-import org.apache.commons.sql.model.Database;
/**
* This class outputs a fully populated Database bean as XML.
1.2 +0 -3 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/io/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/io/DatabaseReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DatabaseReader.java 10 Sep 2002 13:49:42 -0000 1.1
+++ DatabaseReader.java 30 Apr 2003 11:27:26 -0000 1.2
@@ -63,13 +63,10 @@
package org.apache.commons.sql.io;
import java.beans.IntrospectionException;
-import java.io.IOException;
-import java.io.Writer;
import org.apache.commons.betwixt.XMLIntrospector;
import org.apache.commons.betwixt.io.BeanReader;
import org.apache.commons.betwixt.strategy.HyphenatedNameMapper;
-
import org.apache.commons.sql.model.Database;
/**
1.4 +6 -14 \
jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/io/AbstractTestJdbcModelReader.java
Index: AbstractTestJdbcModelReader.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/io/AbstractTestJdbcModelReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractTestJdbcModelReader.java 4 Nov 2002 11:33:31 -0000 1.3
+++ AbstractTestJdbcModelReader.java 30 Apr 2003 11:27:26 -0000 1.4
@@ -61,14 +61,9 @@
*/
package org.apache.commons.sql.io;
-import java.io.InputStream;
-import java.io.IOException;
import java.io.FileInputStream;
-import java.io.FileWriter;
import java.sql.Connection;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
import javax.sql.DataSource;
@@ -77,18 +72,15 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.beanutils.DynaBean;
-import org.apache.commons.beanutils.DynaClass;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.apache.commons.sql.builder.*;
-
-import org.apache.commons.sql.io.DatabaseReader;
-import org.apache.commons.sql.model.*;
-import org.apache.commons.sql.util.DataSourceWrapper;
+import org.apache.commons.sql.builder.SqlBuilder;
+import org.apache.commons.sql.builder.SqlBuilderFactory;
+import org.apache.commons.sql.model.Column;
+import org.apache.commons.sql.model.Database;
+import org.apache.commons.sql.model.Table;
import org.apache.commons.sql.util.DDLExecutor;
+import org.apache.commons.sql.util.DataSourceWrapper;
/**
* Abstract base class for testing the JdbcModelReader against a number of
1.3 +0 -2 \
jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/io/TestHsqlDbJdbcModelReader.java
Index: TestHsqlDbJdbcModelReader.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/io/TestHsqlDbJdbcModelReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestHsqlDbJdbcModelReader.java 4 Nov 2002 11:33:31 -0000 1.2
+++ TestHsqlDbJdbcModelReader.java 30 Apr 2003 11:27:26 -0000 1.3
@@ -64,13 +64,11 @@
import javax.sql.DataSource;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.commons.sql.model.Table;
/**
1.2 +0 -2 \
jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/io/TestAxionJdbcModelReader.java
Index: TestAxionJdbcModelReader.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/io/TestAxionJdbcModelReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestAxionJdbcModelReader.java 28 Oct 2002 19:42:31 -0000 1.1
+++ TestAxionJdbcModelReader.java 30 Apr 2003 11:27:26 -0000 1.2
@@ -64,13 +64,11 @@
import javax.sql.DataSource;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.commons.sql.model.Table;
/**
1.2 +1 -2 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/ddl/AbstractDatabaseMapper.java
Index: AbstractDatabaseMapper.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/ddl/AbstractDatabaseMapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractDatabaseMapper.java 5 Feb 2003 08:08:36 -0000 1.1
+++ AbstractDatabaseMapper.java 30 Apr 2003 11:27:26 -0000 1.2
@@ -8,7 +8,6 @@
import org.apache.commons.sql.model.ForeignKey;
import org.apache.commons.sql.model.Reference;
import org.apache.commons.sql.model.Table;
-
import org.apache.commons.sql.type.Types;
@@ -16,7 +15,7 @@
* Helper to adapt a database schema to that supported by a particular
* database provider
*
- * @version $Revision$ $Date$
+ * @version 1.1 2003/02/05 08:08:36
* @author <a href="mailto:tima@intalio.com">Tim Anderson</a>
*/
public abstract class AbstractDatabaseMapper implements DatabaseMapper {
1.2 +1 -3 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/ddl/ModelHelper.java
Index: ModelHelper.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/ddl/ModelHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelHelper.java 5 Feb 2003 08:08:36 -0000 1.1
+++ ModelHelper.java 30 Apr 2003 11:27:26 -0000 1.2
@@ -10,13 +10,11 @@
import org.apache.commons.sql.model.Reference;
import org.apache.commons.sql.model.Table;
-import org.apache.commons.sql.type.Types;
-
/**
* Helper routines for operating on a database model
*
- * @version $Revision$ $Date$
+ * @version 1.1 2003/02/05 08:08:36
* @author <a href="mailto:tima@intalio.com">Tim Anderson</a>
*/
public class ModelHelper {
1.2 +1 -2 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/ddl/ProvidersReader.java \
Index: ProvidersReader.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/ddl/ProvidersReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProvidersReader.java 5 Feb 2003 08:08:36 -0000 1.1
+++ ProvidersReader.java 30 Apr 2003 11:27:26 -0000 1.2
@@ -1,7 +1,6 @@
package org.apache.commons.sql.ddl;
import java.beans.IntrospectionException;
-import java.io.IOException;
import org.apache.commons.betwixt.XMLIntrospector;
import org.apache.commons.betwixt.io.BeanReader;
@@ -13,7 +12,7 @@
* This class is-a Digester and so can support configuration via custom rules.
*
* @author <a href="mailto:tima@intalio.com">Tim Anderson</a>
- * @version $Revision$
+ * @version 1.1
*/
public class ProvidersReader extends BeanReader {
1.2 +1 -2 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/ddl/DDLBuilderFactory.java
Index: DDLBuilderFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/ddl/DDLBuilderFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DDLBuilderFactory.java 5 Feb 2003 08:08:36 -0000 1.1
+++ DDLBuilderFactory.java 30 Apr 2003 11:27:26 -0000 1.2
@@ -6,7 +6,6 @@
import java.util.List;
import org.apache.commons.betwixt.io.BeanReader;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -16,7 +15,7 @@
* optionally, provider version
*
* @author <a href="mailto:tima@intalio.com">Tim Anderson</a>
- * @version $Revision$
+ * @version 1.1
*/
public class DDLBuilderFactory {
1.2 +2 -5 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/ddl/DDLBuilder.java
Index: DDLBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/ddl/DDLBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DDLBuilder.java 5 Feb 2003 08:08:36 -0000 1.1
+++ DDLBuilder.java 30 Apr 2003 11:27:26 -0000 1.2
@@ -6,12 +6,9 @@
import java.sql.SQLException;
import org.apache.commons.jelly.JellyContext;
-import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.type.Types;
import org.apache.commons.sql.type.TypesReader;
@@ -21,7 +18,7 @@
* Generates the DDL required to create and drop databases and tables.
*
* @author <a href="mailto:tima@intalio.com">Tim Anderson</a>
- * @version $Revision$
+ * @version 1.1
*/
public class DDLBuilder {
@@ -38,7 +35,7 @@
/**
* The URL of the core taglib
*/
- private static URL taglibPath;
+ private URL taglibPath;
/**
* The path to locate provider resources (types, jelly scripts)
1.2 +1 -3 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/ddl/DefaultDatabaseMapper.java
Index: DefaultDatabaseMapper.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/ddl/DefaultDatabaseMapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultDatabaseMapper.java 5 Feb 2003 08:08:36 -0000 1.1
+++ DefaultDatabaseMapper.java 30 Apr 2003 11:27:26 -0000 1.2
@@ -8,9 +8,7 @@
import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.model.Reference;
import org.apache.commons.sql.model.Table;
-
import org.apache.commons.sql.type.Mapping;
-import org.apache.commons.sql.type.Type;
import org.apache.commons.sql.type.TypeMapping;
import org.apache.commons.sql.type.Types;
@@ -20,7 +18,7 @@
* This version does not transform the database, but verifies
* that the columns are supported by the target database provider.
*
- * @version $Revision$ $Date$
+ * @version 1.1 2003/02/05 08:08:36
* @author <a href="mailto:tima@intalio.com">Tim Anderson</a>
*/
public class DefaultDatabaseMapper extends AbstractDatabaseMapper {
1.2 +3 -10 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/util/DDL.java
Index: DDL.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/util/DDL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DDL.java 5 Feb 2003 08:08:40 -0000 1.1
+++ DDL.java 30 Apr 2003 11:27:27 -0000 1.2
@@ -1,35 +1,28 @@
package org.apache.commons.sql.util;
import java.io.FileInputStream;
-import java.io.IOException;
import java.io.StringWriter;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
-import java.util.List;
import java.util.Iterator;
+import java.util.List;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Parser;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
+import org.apache.commons.cli.Parser;
import org.apache.commons.sql.ddl.DDLBuilder;
import org.apache.commons.sql.ddl.DDLBuilderFactory;
import org.apache.commons.sql.ddl.Provider;
import org.apache.commons.sql.ddl.ProviderVersion;
-import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.io.DatabaseReader;
+import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.type.Types;
import org.apache.commons.sql.type.TypesFactory;
import org.apache.commons.sql.type.TypesWriter;
-
-import org.xml.sax.SAXException;
/**
1.2 +5 -3 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/util/DataSourceWrapper.java
Index: DataSourceWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/util/DataSourceWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DataSourceWrapper.java 12 Sep 2002 17:56:50 -0000 1.1
+++ DataSourceWrapper.java 30 Apr 2003 11:27:27 -0000 1.2
@@ -55,9 +55,11 @@
package org.apache.commons.sql.util;
-import java.io.*;
-import java.sql.*;
-import java.util.*;
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
import javax.sql.DataSource;
import org.apache.commons.logging.Log;
1.3 +1 -2 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/util/JdbcSupport.java
Index: JdbcSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/util/JdbcSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JdbcSupport.java 13 Sep 2002 12:14:16 -0000 1.2
+++ JdbcSupport.java 30 Apr 2003 11:27:27 -0000 1.3
@@ -62,10 +62,9 @@
package org.apache.commons.sql.util;
import java.sql.Connection;
-import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.Statement;
import java.sql.SQLException;
+import java.sql.Statement;
import javax.sql.DataSource;
1.2 +1 -7 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/util/DDLExecutor.java
Index: DDLExecutor.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/util/DDLExecutor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DDLExecutor.java 12 Sep 2002 17:56:50 -0000 1.1
+++ DDLExecutor.java 30 Apr 2003 11:27:27 -0000 1.2
@@ -64,23 +64,17 @@
import java.io.IOException;
import java.io.StringWriter;
import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.Statement;
import java.sql.SQLException;
import java.sql.SQLWarning;
+import java.sql.Statement;
import java.util.StringTokenizer;
import javax.sql.DataSource;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.commons.sql.builder.SqlBuilder;
import org.apache.commons.sql.model.Database;
-import org.apache.commons.sql.model.Table;
-import org.apache.commons.sql.util.JdbcSupport;
/**
* DDLExecutor is a utility class which is capable of performing DDL
1.5 +0 -4 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/OracleBuilder.java
Index: OracleBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/OracleBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OracleBuilder.java 16 Sep 2002 15:18:29 -0000 1.4
+++ OracleBuilder.java 30 Apr 2003 11:27:27 -0000 1.5
@@ -63,12 +63,8 @@
package org.apache.commons.sql.builder;
import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
import org.apache.commons.sql.model.Column;
-import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.model.Table;
/**
1.4 +0 -4 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/SybaseBuilder.java
Index: SybaseBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/SybaseBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SybaseBuilder.java 12 Sep 2002 15:03:59 -0000 1.3
+++ SybaseBuilder.java 30 Apr 2003 11:27:27 -0000 1.4
@@ -63,12 +63,8 @@
package org.apache.commons.sql.builder;
import java.io.IOException;
-import java.io.Writer;
import java.util.Iterator;
-import java.util.List;
-import org.apache.commons.sql.model.Column;
-import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.model.ForeignKey;
import org.apache.commons.sql.model.Table;
1.12 +2 -3 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/SqlBuilder.java
Index: SqlBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/SqlBuilder.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SqlBuilder.java 4 Nov 2002 11:33:31 -0000 1.11
+++ SqlBuilder.java 30 Apr 2003 11:27:27 -0000 1.12
@@ -68,12 +68,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.apache.commons.sql.model.Index;
-import org.apache.commons.sql.model.IndexColumn;
import org.apache.commons.sql.model.Column;
import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.model.ForeignKey;
+import org.apache.commons.sql.model.Index;
+import org.apache.commons.sql.model.IndexColumn;
import org.apache.commons.sql.model.Reference;
import org.apache.commons.sql.model.Table;
import org.apache.commons.sql.model.TypeMap;
1.2 +0 -8 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/SapDbBuilder.java \
Index: SapDbBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/SapDbBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SapDbBuilder.java 28 Oct 2002 16:15:59 -0000 1.1
+++ SapDbBuilder.java 30 Apr 2003 11:27:27 -0000 1.2
@@ -62,14 +62,6 @@
package org.apache.commons.sql.builder;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.sql.model.Column;
-import org.apache.commons.sql.model.Database;
-import org.apache.commons.sql.model.Table;
/**
* An SQL Builder for Oracle
1.3 +0 -5 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/MckoiSqlBuilder.java
Index: MckoiSqlBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/MckoiSqlBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MckoiSqlBuilder.java 16 Sep 2002 14:50:19 -0000 1.2
+++ MckoiSqlBuilder.java 30 Apr 2003 11:27:27 -0000 1.3
@@ -63,12 +63,7 @@
package org.apache.commons.sql.builder;
import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.commons.sql.model.Column;
-import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.model.Table;
/**
1.6 +0 -9 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/SqlBuilderFactory.java
Index: SqlBuilderFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/SqlBuilderFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SqlBuilderFactory.java 23 Sep 2002 15:09:49 -0000 1.5
+++ SqlBuilderFactory.java 30 Apr 2003 11:27:27 -0000 1.6
@@ -61,22 +61,13 @@
*/
package org.apache.commons.sql.builder;
-import java.io.IOException;
-import java.io.Writer;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.apache.commons.sql.model.Column;
-import org.apache.commons.sql.model.Database;
-import org.apache.commons.sql.model.ForeignKey;
-import org.apache.commons.sql.model.Reference;
-import org.apache.commons.sql.model.Table;
/**
* A factory of SqlBuilder instances based on a case insensitive database name.
1.2 +0 -5 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/Db2Builder.java
Index: Db2Builder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/Db2Builder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Db2Builder.java 12 Sep 2002 15:03:59 -0000 1.1
+++ Db2Builder.java 30 Apr 2003 11:27:27 -0000 1.2
@@ -63,12 +63,7 @@
package org.apache.commons.sql.builder;
import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.commons.sql.model.Column;
-import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.model.Table;
/**
1.4 +0 -4 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/MSSqlBuilder.java \
Index: MSSqlBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/MSSqlBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MSSqlBuilder.java 12 Sep 2002 15:03:59 -0000 1.3
+++ MSSqlBuilder.java 30 Apr 2003 11:27:27 -0000 1.4
@@ -63,12 +63,8 @@
package org.apache.commons.sql.builder;
import java.io.IOException;
-import java.io.Writer;
import java.util.Iterator;
-import java.util.List;
-import org.apache.commons.sql.model.Column;
-import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.model.ForeignKey;
import org.apache.commons.sql.model.Table;
1.2 +0 -8 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/HsqlDbBuilder.java
Index: HsqlDbBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/HsqlDbBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HsqlDbBuilder.java 12 Sep 2002 15:03:59 -0000 1.1
+++ HsqlDbBuilder.java 30 Apr 2003 11:27:27 -0000 1.2
@@ -62,14 +62,6 @@
package org.apache.commons.sql.builder;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.commons.sql.model.Column;
-import org.apache.commons.sql.model.Database;
-import org.apache.commons.sql.model.Table;
/**
* An SQL Builder for the <a href="http://hsqldb.sourceforge.net/">HsqlDb</a> JDBC \
database.
1.4 +4 -3 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/PostgreSqlBuilder.java
Index: PostgreSqlBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/PostgreSqlBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PostgreSqlBuilder.java 28 Oct 2002 16:17:11 -0000 1.3
+++ PostgreSqlBuilder.java 30 Apr 2003 11:27:27 -0000 1.4
@@ -58,8 +58,9 @@
package org.apache.commons.sql.builder;
-import org.apache.commons.sql.model.Column;
import java.io.IOException;
+
+import org.apache.commons.sql.model.Column;
/**
* An SQL Builder for PostgresSqlL
1.4 +0 -5 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/MySqlBuilder.java \
Index: MySqlBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/MySqlBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MySqlBuilder.java 12 Sep 2002 15:03:59 -0000 1.3
+++ MySqlBuilder.java 30 Apr 2003 11:27:27 -0000 1.4
@@ -63,12 +63,7 @@
package org.apache.commons.sql.builder;
import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.commons.sql.model.Column;
-import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.model.Table;
/**
1.7 +0 -5 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/AxionBuilder.java \
Index: AxionBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/AxionBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AxionBuilder.java 4 Nov 2002 11:33:31 -0000 1.6
+++ AxionBuilder.java 30 Apr 2003 11:27:27 -0000 1.7
@@ -63,14 +63,9 @@
package org.apache.commons.sql.builder;
import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
import org.apache.commons.sql.model.Column;
-import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.model.Table;
-import org.apache.commons.sql.model.TypeMap;
/**
* An SQL Builder for the <a href="http://axion.tigris.org/">Axion</a> JDBC \
database.
1.3 +5 -4 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/task/JDBCTransformTask.java
Index: JDBCTransformTask.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/task/JDBCTransformTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JDBCTransformTask.java 11 Sep 2002 14:08:40 -0000 1.2
+++ JDBCTransformTask.java 30 Apr 2003 11:27:28 -0000 1.3
@@ -60,19 +60,20 @@
import java.sql.DatabaseMetaData;
import java.sql.DriverManager;
import java.sql.ResultSet;
-import java.sql.Types;
import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Collection;
import java.util.Hashtable;
+import java.util.Iterator;
import java.util.List;
import java.util.Vector;
-import java.util.Collection;
-import java.util.Iterator;
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.xerces.dom.DocumentImpl;
import org.apache.xerces.dom.DocumentTypeImpl;
-import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.Method;
+import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
1.2 +4 -13 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/task/JdbcToSchemaTask.java
Index: JdbcToSchemaTask.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/task/JdbcToSchemaTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JdbcToSchemaTask.java 28 Oct 2002 16:16:47 -0000 1.1
+++ JdbcToSchemaTask.java 30 Apr 2003 11:27:28 -0000 1.2
@@ -61,25 +61,16 @@
package org.apache.commons.sql.task;
-import java.io.FileOutputStream;
-import java.io.PrintWriter;
-import java.io.IOException;
import java.io.FileWriter;
import java.sql.Connection;
-import java.sql.DatabaseMetaData;
import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-import java.util.Iterator;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
+
import org.apache.commons.sql.io.DatabaseWriter;
import org.apache.commons.sql.io.JdbcModelReader;
-
-import org.apache.commons.sql.model.*;
+import org.apache.commons.sql.model.Database;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
/**
* This class generates an XML schema of an existing database from
1.2 +1 -3 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/task/DDLTask.java
Index: DDLTask.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/task/DDLTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DDLTask.java 10 Sep 2002 15:56:23 -0000 1.1
+++ DDLTask.java 30 Apr 2003 11:27:28 -0000 1.2
@@ -57,13 +57,11 @@
import java.io.File;
import java.io.FileWriter;
import java.io.Writer;
-import java.util.Iterator;
import org.apache.commons.sql.builder.SqlBuilder;
import org.apache.commons.sql.builder.SqlBuilderFactory;
-import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.io.DatabaseReader;
-
+import org.apache.commons.sql.model.Database;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
1.9 +1 -1 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/Table.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Table.java 28 Oct 2002 19:42:32 -0000 1.8
+++ Table.java 30 Apr 2003 11:27:28 -0000 1.9
@@ -61,8 +61,8 @@
*/
package org.apache.commons.sql.model;
-import java.util.Iterator;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
public class Table
1.2 +1 -2 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/Index.java
Index: Index.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/Index.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Index.java 20 Sep 2002 20:50:52 -0000 1.1
+++ Index.java 30 Apr 2003 11:27:28 -0000 1.2
@@ -57,7 +57,6 @@
*/
package org.apache.commons.sql.model;
-import java.util.Iterator;
import java.util.ArrayList;
import java.util.List;
1.8 +0 -3 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/Column.java
Index: Column.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/Column.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Column.java 28 Oct 2002 16:13:28 -0000 1.7
+++ Column.java 30 Apr 2003 11:27:28 -0000 1.8
@@ -61,9 +61,6 @@
*/
package org.apache.commons.sql.model;
-import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.List;
public class Column
{
1.4 +1 -1 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/Database.java
Index: Database.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/Database.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Database.java 16 Sep 2002 14:51:08 -0000 1.3
+++ Database.java 30 Apr 2003 11:27:28 -0000 1.4
@@ -61,8 +61,8 @@
*/
package org.apache.commons.sql.model;
-import java.util.Iterator;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
public class Database
1.3 +0 -1 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/ForeignKey.java
Index: ForeignKey.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/ForeignKey.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ForeignKey.java 16 Sep 2002 14:51:08 -0000 1.2
+++ ForeignKey.java 30 Apr 2003 11:27:28 -0000 1.3
@@ -61,7 +61,6 @@
*/
package org.apache.commons.sql.model;
-import java.util.Iterator;
import java.util.ArrayList;
import java.util.List;
1.4 +1 -1 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/TypeMap.java
Index: TypeMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/model/TypeMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TypeMap.java 28 Oct 2002 16:13:51 -0000 1.3
+++ TypeMap.java 30 Apr 2003 11:27:28 -0000 1.4
@@ -62,8 +62,8 @@
package org.apache.commons.sql.model;
-import java.util.Hashtable;
import java.sql.Types;
+import java.util.Hashtable;
// I don't know if the peer system deals
// with the recommended mappings.
1.2 +3 -23 \
jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/task/TestJdbcToSchemaTask.java
Index: TestJdbcToSchemaTask.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/task/TestJdbcToSchemaTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestJdbcToSchemaTask.java 28 Oct 2002 19:42:31 -0000 1.1
+++ TestJdbcToSchemaTask.java 30 Apr 2003 11:27:30 -0000 1.2
@@ -61,29 +61,9 @@
package org.apache.commons.sql.task;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.Types;
-import java.sql.SQLException;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-import java.util.Collection;
-import java.util.Iterator;
-
-import junit.framework.*;
-
-import org.apache.commons.sql.io.DatabaseWriter;
-import org.apache.commons.sql.io.JdbcModelReader;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
/**
1.2 +0 -2 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean/SqlDynaClass.java
Index: SqlDynaClass.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean/SqlDynaClass.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SqlDynaClass.java 11 Sep 2002 22:39:15 -0000 1.1
+++ SqlDynaClass.java 30 Apr 2003 11:27:30 -0000 1.2
@@ -67,10 +67,8 @@
import org.apache.commons.beanutils.BasicDynaClass;
import org.apache.commons.beanutils.DynaProperty;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.commons.sql.model.Column;
import org.apache.commons.sql.model.Table;
1.3 +0 -1 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean/SqlDynaBean.java \
Index: SqlDynaBean.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean/SqlDynaBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SqlDynaBean.java 12 Sep 2002 17:56:49 -0000 1.2
+++ SqlDynaBean.java 30 Apr 2003 11:27:30 -0000 1.3
@@ -63,7 +63,6 @@
import org.apache.commons.beanutils.BasicDynaBean;
import org.apache.commons.beanutils.DynaClass;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.2 +0 -4 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean/SqlDynaProperty.java
Index: SqlDynaProperty.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean/SqlDynaProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SqlDynaProperty.java 11 Sep 2002 22:39:15 -0000 1.1
+++ SqlDynaProperty.java 30 Apr 2003 11:27:30 -0000 1.2
@@ -61,13 +61,9 @@
*/
package org.apache.commons.sql.dynabean;
-import java.sql.Types;
-
import org.apache.commons.beanutils.DynaProperty;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.commons.sql.model.Column;
/**
1.9 +1 -7 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean/DynaSql.java
Index: DynaSql.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean/DynaSql.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DynaSql.java 28 Oct 2002 16:17:12 -0000 1.8
+++ DynaSql.java 30 Apr 2003 11:27:30 -0000 1.9
@@ -62,14 +62,11 @@
package org.apache.commons.sql.dynabean;
import java.lang.reflect.InvocationTargetException;
-
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.Statement;
import java.sql.SQLException;
-
-import java.util.ArrayList;
+import java.sql.Statement;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -81,11 +78,8 @@
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.beanutils.DynaClass;
import org.apache.commons.beanutils.ResultSetDynaClass;
-import org.apache.commons.beanutils.ResultSetIterator;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.model.Table;
import org.apache.commons.sql.util.JdbcSupport;
1.4 +5 -12 \
jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/model/TestColumn.java
Index: TestColumn.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/model/TestColumn.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestColumn.java 28 Oct 2002 16:17:36 -0000 1.3
+++ TestColumn.java 30 Apr 2003 11:27:30 -0000 1.4
@@ -67,13 +67,6 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.SimpleLog;
-
-import org.apache.commons.sql.model.Column;
/**
* Test harness for Column Class
1.2 +2 -7 \
jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/model/TestTypeMap.java
Index: TestTypeMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/model/TestTypeMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestTypeMap.java 20 Sep 2002 21:28:00 -0000 1.1
+++ TestTypeMap.java 30 Apr 2003 11:27:30 -0000 1.2
@@ -13,11 +13,6 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.SimpleLog;
/**
* Test harness for TypeMap Class
1.6 +1 -9 \
jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/builder/TestBuilder.java \
Index: TestBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/builder/TestBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestBuilder.java 20 Sep 2002 20:34:38 -0000 1.5
+++ TestBuilder.java 30 Apr 2003 11:27:31 -0000 1.6
@@ -9,8 +9,6 @@
*
* $Id$
*/
-import java.io.InputStream;
-import java.io.IOException;
import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.StringWriter;
@@ -19,15 +17,9 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.SimpleLog;
-
-import org.apache.commons.sql.builder.*;
-import org.apache.commons.sql.model.*;
import org.apache.commons.sql.io.DatabaseReader;
+import org.apache.commons.sql.model.Database;
/**
* Test harness for the SqlBuilder for various databases.
1.2 +2 -8 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/type/TypesReader.java
Index: TypesReader.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/type/TypesReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypesReader.java 5 Feb 2003 08:08:37 -0000 1.1
+++ TypesReader.java 30 Apr 2003 11:27:31 -0000 1.2
@@ -1,20 +1,14 @@
package org.apache.commons.sql.type;
import java.beans.IntrospectionException;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import org.xml.sax.SAXException;
-
import org.apache.commons.betwixt.XMLIntrospector;
import org.apache.commons.betwixt.io.BeanReader;
import org.apache.commons.betwixt.strategy.HyphenatedNameMapper;
-
-import org.apache.commons.sql.type.Mapping;
-import org.apache.commons.sql.type.Type;
-import org.apache.commons.sql.type.Types;
+import org.xml.sax.SAXException;
/**
@@ -23,7 +17,7 @@
*
* @author <a href="mailto:tima@intalio.com">Tim Anderson</a>
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
- * @version $Revision$
+ * @version 1.1
*/
public class TypesReader extends BeanReader {
1.2 +1 -2 \
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/type/TypesWriter.java
Index: TypesWriter.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/type/TypesWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypesWriter.java 5 Feb 2003 08:08:37 -0000 1.1
+++ TypesWriter.java 30 Apr 2003 11:27:31 -0000 1.2
@@ -3,7 +3,6 @@
import java.io.OutputStream;
import java.io.Writer;
-import org.apache.commons.betwixt.XMLIntrospector;
import org.apache.commons.betwixt.io.BeanWriter;
@@ -12,7 +11,7 @@
*
* @author <a href="mailto:tima@intalio.com">Tim Anderson</a>
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
- * @version $Revision$
+ * @version 1.1
*/
public class TypesWriter extends BeanWriter {
1.5 +11 -9 \
jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/TestDataModelRoundTrip.java
Index: TestDataModelRoundTrip.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/TestDataModelRoundTrip.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestDataModelRoundTrip.java 20 Sep 2002 20:34:38 -0000 1.4
+++ TestDataModelRoundTrip.java 30 Apr 2003 11:27:31 -0000 1.5
@@ -9,23 +9,25 @@
*
* $Id$
*/
-import java.io.InputStream;
-import java.io.IOException;
import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.io.StringWriter;
import java.util.List;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.commons.sql.model.*;
-import org.apache.commons.sql.io.*;
+import org.apache.commons.sql.io.DatabaseReader;
+import org.apache.commons.sql.io.DatabaseWriter;
+import org.apache.commons.sql.model.Column;
+import org.apache.commons.sql.model.Database;
+import org.apache.commons.sql.model.ForeignKey;
+import org.apache.commons.sql.model.Index;
+import org.apache.commons.sql.model.IndexColumn;
+import org.apache.commons.sql.model.Reference;
+import org.apache.commons.sql.model.Table;
/**
* Test harness for the IO package
1.2 +0 -4 \
jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/dynabean/TestAxionDynaSql.java
Index: TestAxionDynaSql.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/dynabean/TestAxionDynaSql.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestAxionDynaSql.java 13 Sep 2002 12:14:16 -0000 1.1
+++ TestAxionDynaSql.java 30 Apr 2003 11:27:31 -0000 1.2
@@ -64,12 +64,8 @@
import javax.sql.DataSource;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* DynaSql test harness for the Axion database
1.3 +4 -10 \
jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/dynabean/AbstractTestDynaSql.java
Index: AbstractTestDynaSql.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/dynabean/AbstractTestDynaSql.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractTestDynaSql.java 17 Sep 2002 19:56:25 -0000 1.2
+++ AbstractTestDynaSql.java 30 Apr 2003 11:27:31 -0000 1.3
@@ -61,10 +61,7 @@
*/
package org.apache.commons.sql.dynabean;
-import java.io.InputStream;
-import java.io.IOException;
import java.io.FileInputStream;
-import java.io.FileWriter;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -77,17 +74,14 @@
import junit.textui.TestRunner;
import org.apache.commons.beanutils.DynaBean;
-import org.apache.commons.beanutils.DynaClass;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import org.apache.commons.sql.builder.*;
-import org.apache.commons.sql.dynabean.DynaSql;
+import org.apache.commons.sql.builder.SqlBuilder;
+import org.apache.commons.sql.builder.SqlBuilderFactory;
import org.apache.commons.sql.io.DatabaseReader;
-import org.apache.commons.sql.model.*;
-import org.apache.commons.sql.util.DataSourceWrapper;
+import org.apache.commons.sql.model.Database;
import org.apache.commons.sql.util.DDLExecutor;
+import org.apache.commons.sql.util.DataSourceWrapper;
/**
* Abstract base class for testing the DynaSql against a number of
1.2 +0 -4 \
jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/dynabean/TestHsqlDbDynaSql.java
Index: TestHsqlDbDynaSql.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/dynabean/TestHsqlDbDynaSql.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestHsqlDbDynaSql.java 13 Sep 2002 12:14:16 -0000 1.1
+++ TestHsqlDbDynaSql.java 30 Apr 2003 11:27:31 -0000 1.2
@@ -64,12 +64,8 @@
import javax.sql.DataSource;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* DynaSql test harness for the HsqlDb database
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic