dbunit-commit

[dbunit-commit] dbunit/src/java/org/dbunit/dataset CachedDataSet.java,1.5,1.6 CachedTable.java,1.3,1.4 DefaultTable.java,1.9,1.10

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11935/src/java/org/dbunit/dataset

Modified Files:
	CachedDataSet.java CachedTable.java DefaultTable.java 
Log Message:
* DefaultTable(ITableMetaData metaData) constructor is now public.
* Added javadoc comments to DefaultTable class.
* Deprecated DefaultTable constructors taking List as argument and do not use them anymore.

Index: CachedDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/CachedDataSet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CachedDataSet.java	22 Jan 2004 02:54:18 -0000	1.5
--- CachedDataSet.java	7 May 2004 01:55:50 -0000	1.6
***************
*** 40,45 ****
  
      private List _tableList;
!     private ITableMetaData _activeMetaData;
!     private List _activeRowList;
  
      /**
--- 40,44 ----
  
      private List _tableList;
!     private DefaultTable _activeTable;
  
      /**
***************
*** 99,104 ****
      public void startTable(ITableMetaData metaData) throws DataSetException
      {
!         _activeMetaData = metaData;
!         _activeRowList = new ArrayList();
  //        System.out.println("START " + _activeMetaData.getTableName());
      }
--- 98,102 ----
      public void startTable(ITableMetaData metaData) throws DataSetException
      {
!         _activeTable = new DefaultTable(metaData);
  //        System.out.println("START " + _activeMetaData.getTableName());
      }
***************
*** 107,118 ****
      {
  //         System.out.println("END " + _activeMetaData.getTableName());
!         _tableList.add(new DefaultTable(_activeMetaData, _activeRowList));
!         _activeRowList = null;
!         _activeMetaData = null;
      }
  
      public void row(Object[] values) throws DataSetException
      {
!         _activeRowList.add(values);
      }
  }
--- 105,115 ----
      {
  //         System.out.println("END " + _activeMetaData.getTableName());
!         _tableList.add(_activeTable);
!         _activeTable = null;
      }
  
      public void row(Object[] values) throws DataSetException
      {
!         _activeTable.addRow(values);
      }
  }

Index: CachedTable.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/CachedTable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CachedTable.java	22 Jan 2004 02:54:18 -0000	1.3
--- CachedTable.java	7 May 2004 01:55:50 -0000	1.4
***************
*** 22,27 ****
  package org.dbunit.dataset;
  
! import java.util.ArrayList;
! import java.util.List;
  
  /**
--- 22,26 ----
  package org.dbunit.dataset;
  
! 
  
  /**
***************
*** 34,38 ****
      public CachedTable(ITable table) throws DataSetException
      {
!         super(table.getTableMetaData(), createRowList(table));
      }
  
--- 33,38 ----
      public CachedTable(ITable table) throws DataSetException
      {
!         super(table.getTableMetaData());
!         addTableRows(table);
      }
  
***************
*** 41,70 ****
          super(metaData);
      }
- 
-     protected static List createRowList(ITable table) throws DataSetException
-     {
-         List rowList = new ArrayList();
-         try
-         {
-             Column[] columns = table.getTableMetaData().getColumns();
-             if (columns.length > 0)
-             {
-                 for (int i = 0; ; i++)
-                 {
-                     Object[] rowValues = new Object[columns.length];
-                     for (int j = 0; j < columns.length; j++)
-                     {
-                         Column column = columns[j];
-                         rowValues[j] = table.getValue(i, column.getColumnName());
-                     }
-                     rowList.add(rowValues);
-                 }
-             }
-         }
-         catch(RowOutOfBoundsException e)
-         {
-             // end of table
-         }
-         return rowList;
-     }
  }
--- 41,43 ----

Index: DefaultTable.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/DefaultTable.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DefaultTable.java	22 Jan 2004 02:54:18 -0000	1.9
--- DefaultTable.java	7 May 2004 01:55:50 -0000	1.10
***************
*** 33,38 ****
  {
      private final ITableMetaData _metaData;
!     protected final List _rowList;
  
      public DefaultTable(ITableMetaData metaData, List list)
      {
--- 33,42 ----
  {
      private final ITableMetaData _metaData;
!     private final List _rowList;
  
+     /**
+      * Creates a new empty table with specified metadata and values.
+      * @deprecated Use public mutators to initialize table values instead
+      */
      public DefaultTable(ITableMetaData metaData, List list)
      {
***************
*** 50,53 ****
--- 54,61 ----
      }
  
+     /**
+      * Creates a new empty table with specified metadata and values.
+      * @deprecated Use public mutators to initialize table values instead
+      */
      public DefaultTable(String tableName, Column[] columns, List list)
      {
***************
*** 56,59 ****
--- 64,70 ----
      }
  
+     /**
+      * Creates a new empty table with specified metadata.
+      */
      public DefaultTable(String tableName, Column[] columns)
      {
***************
*** 62,66 ****
      }
  
!     protected DefaultTable(ITableMetaData metaData)
      {
          _metaData = metaData;
--- 73,77 ----
      }
  
!     public DefaultTable(ITableMetaData metaData)
      {
          _metaData = metaData;
***************
*** 68,71 ****
--- 79,85 ----
      }
  
+     /**
+      * Inserts a new empty row. You can add values with {@link #setValue}.
+      */
      public void addRow() throws DataSetException
      {
***************
*** 74,77 ****
--- 88,97 ----
      }
  
+     /**
+      * Inserts a new row initialized with specified array of values.
+      * @param values The array of values. Each value correspond to the column at the
+      * same index from {@link ITableMetaData#getColumns}.
+      * @see #getTableMetaData
+      */
      public void addRow(Object[] values) throws DataSetException
      {
***************
*** 79,88 ****
      }
  
!     public void setValue(int row, String column, Object value) throws DataSetException
      {
          assertValidRowIndex(row);
  
          Object[] rowValues = (Object[])_rowList.get(row);
!         rowValues[getColumnIndex(column)] = value;
      }
  
--- 99,151 ----
      }
  
!     /**
!      * Inserts all rows from the specified table.
!      * @param table The source table.
!      */
!     public void addTableRows(ITable table) throws DataSetException
!     {
!         try
!         {
!             Column[] columns = _metaData.getColumns();
!             if (columns.length > 0)
!             {
!                 for (int i = 0; ; i++)
!                 {
!                     Object[] rowValues = new Object[columns.length];
!                     for (int j = 0; j < columns.length; j++)
!                     {
!                         Column column = columns[j];
!                         rowValues[j] = table.getValue(i, column.getColumnName());
!                     }
!                     _rowList.add(rowValues);
!                 }
!             }
!         }
!         catch(RowOutOfBoundsException e)
!         {
!             // end of table
!         }
!     }
! 
!     /**
!      * Replaces the value at the specified position in this table with the specified value.
!      * @param row The row index
!      * @param column The column name
!      * @param value The value to store at the specified location
!      * @return the value previously at the specified location
!      * @throws RowOutOfBoundsException if the row index is out of range
!      * @throws NoSuchColumnException if the column does not exist
!      * @throws DataSetException if an unexpected error occurs
!      */
!     public Object setValue(int row, String column, Object value)
!             throws RowOutOfBoundsException, NoSuchColumnException, DataSetException
      {
          assertValidRowIndex(row);
  
          Object[] rowValues = (Object[])_rowList.get(row);
!         int columnIndex = getColumnIndex(column);
!         Object oldValue = rowValues[columnIndex];
!         rowValues[columnIndex] = value;
!         return oldValue;
      }
  

[dbunit-commit] dbunit/src/java/org/dbunit/dataset/xml FlatDtdDataSet.java,1.12,1.13

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11935/src/java/org/dbunit/dataset/xml

Modified Files:
	FlatDtdDataSet.java 
Log Message:
* DefaultTable(ITableMetaData metaData) constructor is now public.
* Added javadoc comments to DefaultTable class.
* Deprecated DefaultTable constructors taking List as argument and do not use them anymore.

Index: FlatDtdDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FlatDtdDataSet.java	15 Mar 2004 16:44:18 -0000	1.12
--- FlatDtdDataSet.java	7 May 2004 01:55:50 -0000	1.13
***************
*** 37,42 ****
  public class FlatDtdDataSet extends AbstractDataSet implements IDataSetConsumer
  {
-     private static final List EMPTY_LIST = Arrays.asList(new Object[0]);
- 
      private final List _tableNames = new ArrayList();
      private final Map _tableMap = new HashMap();
--- 37,40 ----
***************
*** 177,181 ****
          String tableName = metaData.getTableName();
          _tableNames.add(tableName);
!         _tableMap.put(tableName.toUpperCase(), new DefaultTable(metaData, EMPTY_LIST));
      }
  
--- 175,179 ----
          String tableName = metaData.getTableName();
          _tableNames.add(tableName);
!         _tableMap.put(tableName.toUpperCase(), new DefaultTable(metaData));
      }
  

[dbunit-commit] dbunit/src/java/org/dbunit/database CachedResultSetTable.java,1.12,1.13

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11935/src/java/org/dbunit/database

Modified Files:
	CachedResultSetTable.java 
Log Message:
* DefaultTable(ITableMetaData metaData) constructor is now public.
* Added javadoc comments to DefaultTable class.
* Deprecated DefaultTable constructors taking List as argument and do not use them anymore.

Index: CachedResultSetTable.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/CachedResultSetTable.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CachedResultSetTable.java	22 Jan 2004 02:54:17 -0000	1.12
--- CachedResultSetTable.java	7 May 2004 01:55:50 -0000	1.13
***************
*** 36,41 ****
  public class CachedResultSetTable extends CachedTable implements IResultSetTable
  {
!     public CachedResultSetTable(ITableMetaData metaData, ResultSet resultSet
!             ) throws SQLException, DataSetException
      {
          this(new ForwardOnlyResultSetTable(metaData, resultSet));
--- 36,41 ----
  public class CachedResultSetTable extends CachedTable implements IResultSetTable
  {
!     public CachedResultSetTable(ITableMetaData metaData, ResultSet resultSet)
!             throws SQLException, DataSetException
      {
          this(new ForwardOnlyResultSetTable(metaData, resultSet));
***************
*** 53,57 ****
          try
          {
!             _rowList.addAll(createRowList(table));
          }
          finally
--- 53,57 ----
          try
          {
!             addTableRows(table);
          }
          finally
***************
*** 66,70 ****
      public void close() throws DataSetException
      {
!         // nothing to do, already closed
      }
  }
--- 66,70 ----
      public void close() throws DataSetException
      {
!         // nothing to do, resultset already been closed
      }
  }

[dbunit-commit] dbunit/src/java/org/dbunit Assertion.java,1.12,1.13

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3970/src/java/org/dbunit

Modified Files:
	Assertion.java 
Log Message:
Javadoc update

Index: Assertion.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/Assertion.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Assertion.java	4 Apr 2004 04:57:19 -0000	1.12
--- Assertion.java	5 May 2004 17:27:05 -0000	1.13
***************
*** 87,92 ****
      /**
       * Asserts that the two specified tables are equals. This method ignore the
!      * table names, the columns order, the columns data type and the primary
!      * keys.
       */
      public static void assertEquals(ITable expectedTable, ITable actualTable)
--- 87,92 ----
      /**
       * Asserts that the two specified tables are equals. This method ignore the
!      * table names, the columns order, the columns data type and which columns
!      * are composing the primary keys.
       */
      public static void assertEquals(ITable expectedTable, ITable actualTable)

[dbunit-commit] dbunit/src/java/org/dbunit/dataset/xml FlatXmlDataSet.java,1.28,1.29

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27971/src/java/org/dbunit/dataset/xml

Modified Files:
	FlatXmlDataSet.java 
Log Message:
Added back FlatXmlDataSet constructors taking URL argument missing in version 2.0. 

Index: FlatXmlDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/xml/FlatXmlDataSet.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** FlatXmlDataSet.java	30 Mar 2004 19:13:01 -0000	1.28
--- FlatXmlDataSet.java	3 May 2004 18:23:04 -0000	1.29
***************
*** 34,37 ****
--- 34,38 ----
  import java.io.Reader;
  import java.io.Writer;
+ import java.net.URL;
  
  /**
***************
*** 98,107 ****
              throws IOException, DataSetException
      {
!         super(new FlatXmlProducer(
!                 new InputSource(xmlFile.toURL().toString()),
!                 dtdMetadata));
      }
  
      /**
       * Creates an FlatXmlDataSet object with the specifed xml reader.
       * Relative DOCTYPE uri are resolved from the current working dicrectory.
--- 99,131 ----
              throws IOException, DataSetException
      {
!         this(xmlFile.toURL(), dtdMetadata);
!     }
! 
!     /**
!      * Creates an FlatXmlDataSet object with the specifed xml URL.
!      * Relative DOCTYPE uri are resolved from the xml file path.
!      *
!      * @param xmlUrl the xml URL
!      */
!     public FlatXmlDataSet(URL xmlUrl) throws IOException, DataSetException
!     {
!         this(xmlUrl, true);
      }
  
      /**
+      * Creates an FlatXmlDataSet object with the specifed xml URL.
+      * Relative DOCTYPE uri are resolved from the xml file path.
+      *
+      * @param xmlUrl the xml URL
+      * @param dtdMetadata if <code>false</code> do not use DTD as metadata
+      */
+     public FlatXmlDataSet(URL xmlUrl, boolean dtdMetadata)
+             throws IOException, DataSetException
+     {
+         super(new FlatXmlProducer(
+                 new InputSource(xmlUrl.toString()), dtdMetadata));
+     }
+     
+     /**
       * Creates an FlatXmlDataSet object with the specifed xml reader.
       * Relative DOCTYPE uri are resolved from the current working dicrectory.

[dbunit-commit] dbunit/xdocs faq.fml,1.15,1.16 index.xml,1.8,1.9

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18926/xdocs

Modified Files:
	faq.fml index.xml 
Log Message:
* Added link to DeveloperWorks article.
* Small FAQ update about multiple schemas.

Index: faq.fml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/faq.fml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** faq.fml	31 Mar 2004 02:42:55 -0000	1.15
--- faq.fml	28 Apr 2004 19:02:35 -0000	1.16
***************
*** 122,126 ****
        </question>
        <answer>
!         Yes, see the <a href="properties.html#qualifiedtablenames">qualified table names</a> feature.
        </answer>
      </faq>
--- 122,126 ----
        </question>
        <answer>
!         Yes, see <a href="#AmbiguousTableNameException">Why I get a "AmbiguousTableNameException"?</a>.
        </answer>
      </faq>
***************
*** 349,358 ****
        </question>
        <answer>
!       <p>This situation occurs when no schema is specified and that DbUnit detect 
          that it is getting columns information from multiple tables having the 
          same name and located in different schemas.</p>
        <p>You can solve this problem in three different ways:
        <ol>
!         <li>Provide the schema name when creating the database connection. Note that for Oracle you must specify a all uppercase schema name.</li>
          <li>Ensure that the connection is restricted to access only one schema.</li>
          <li>Enable the <a href="properties.html#qualifiedtablenames">qualified table names</a> feature.</li>
--- 349,358 ----
        </question>
        <answer>
!       <p>This error occurs when no schema is specified and that DbUnit detect 
          that it is getting columns information from multiple tables having the 
          same name and located in different schemas.</p>
        <p>You can solve this problem in three different ways:
        <ol>
!         <li>Provide the schema name when creating the database connection. <b>Note that for Oracle you must specify the schema name in uppercase.</b></li>
          <li>Ensure that the connection is restricted to access only one schema.</li>
          <li>Enable the <a href="properties.html#qualifiedtablenames">qualified table names</a> feature.</li>

Index: index.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/xdocs/index.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** index.xml	31 Mar 2004 02:42:55 -0000	1.8
--- index.xml	28 Apr 2004 19:02:35 -0000	1.9
***************
*** 26,29 ****
--- 26,33 ----
        <table border="1">
          <tr> 
+           <td>2004-04-28</td>
+           <td>DeveloperWorks article: <a href="http://www-106.ibm.com/developerworks/library/j-dbunit.html?ca=drs-j1604">Control your test-environement with DbUnit and Anthill</a>.</td>
+         </tr>
+         <tr> 
            <td>2004-03-16</td>
            <td>The <a href="http://www.dbunit.org/wiki/">DbUnit Wiki</a> is now officially online. Please contribute to the <a href=" http://www.dbunit.org/cgi-bin/wiki.pl?SupportedRDBMS">SupportedRDBMS</a> page.</td>

[dbunit-commit] dbunit/src/java/org/dbunit/dataset/datatype BooleanDataType.java,1.14,1.15 BytesDataType.java,1.17,1.18 DataTypeException.java,1.9,1.10 DateDataType.java,1.14,1.15 DoubleDataType.java,1.13,1.14 FloatDataType.java,1.13,1.14 IntegerDataType.java,1.13,1.14 LongDataType.java,1.13,1.14 NumberDataType.java,1.13,1.14 StringDataType.java,1.23,1.24 TimeDataType.java,1.14,1.15 TimestampDataType.java,1.15,1.16 TypeCastException.java,1.10,1.11

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28402/src/java/org/dbunit/dataset/datatype

Modified Files:
	BooleanDataType.java BytesDataType.java DataTypeException.java 
	DateDataType.java DoubleDataType.java FloatDataType.java 
	IntegerDataType.java LongDataType.java NumberDataType.java 
	StringDataType.java TimeDataType.java TimestampDataType.java 
	TypeCastException.java 
Log Message:
Now TypeCastException error message displays the original value and the target data type.

Index: BooleanDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/BooleanDataType.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** BooleanDataType.java	22 Feb 2004 23:27:20 -0000	1.14
--- BooleanDataType.java	28 Apr 2004 19:49:34 -0000	1.15
***************
*** 78,82 ****
          }
  
!         throw new TypeCastException(value.toString());
      }
  
--- 78,82 ----
          }
  
!         throw new TypeCastException(value, this);
      }
  

Index: BytesDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/BytesDataType.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** BytesDataType.java	3 Apr 2004 18:16:33 -0000	1.17
--- BytesDataType.java	28 Apr 2004 19:49:34 -0000	1.18
***************
*** 111,115 ****
              catch (IOException e)
              {
!                 throw new TypeCastException(e);
              }
          }
--- 111,115 ----
              catch (IOException e)
              {
!                 throw new TypeCastException(value, this, e);
              }
          }
***************
*** 124,128 ****
              catch (SQLException e)
              {
!                 throw new TypeCastException(e);
              }
          }
--- 124,128 ----
              catch (SQLException e)
              {
!                 throw new TypeCastException(value, this, e);
              }
          }
***************
*** 136,140 ****
              catch (IOException e)
              {
!                 throw new TypeCastException(e);
              }
          }
--- 136,140 ----
              catch (IOException e)
              {
!                 throw new TypeCastException(value, this, e);
              }
          }
***************
*** 150,158 ****
              catch (IOException e)
              {
!                 throw new TypeCastException(e);
              }
          }
  
!         throw new TypeCastException(value.toString());
      }
  
--- 150,158 ----
              catch (IOException e)
              {
!                 throw new TypeCastException(value, this, e);
              }
          }
  
!         throw new TypeCastException(value, this);
      }
  

Index: DataTypeException.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/DataTypeException.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DataTypeException.java	22 Jan 2004 02:54:18 -0000	1.9
--- DataTypeException.java	28 Apr 2004 19:49:34 -0000	1.10
***************
*** 51,55 ****
          super(msg, e);
      }
- 
  }
  
--- 51,54 ----

Index: DateDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/DateDataType.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DateDataType.java	3 Apr 2004 18:16:33 -0000	1.14
--- DateDataType.java	28 Apr 2004 19:49:34 -0000	1.15
***************
*** 93,101 ****
              catch (IllegalArgumentException e)
              {
!                 throw new TypeCastException(stringValue, e);
              }
          }
  
!         throw new TypeCastException(value.toString());
      }
  
--- 93,101 ----
              catch (IllegalArgumentException e)
              {
!                 throw new TypeCastException(value, this, e);
              }
          }
  
!         throw new TypeCastException(value, this);
      }
  

Index: DoubleDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/DoubleDataType.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DoubleDataType.java	22 Feb 2004 23:27:20 -0000	1.13
--- DoubleDataType.java	28 Apr 2004 19:49:34 -0000	1.14
***************
*** 61,65 ****
          catch (java.lang.NumberFormatException e)
          {
!             throw new TypeCastException(e);
          }
      }
--- 61,65 ----
          catch (java.lang.NumberFormatException e)
          {
!             throw new TypeCastException(value, this, e);
          }
      }

Index: FloatDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/FloatDataType.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FloatDataType.java	22 Feb 2004 23:27:20 -0000	1.13
--- FloatDataType.java	28 Apr 2004 19:49:34 -0000	1.14
***************
*** 62,66 ****
          catch (java.lang.NumberFormatException e)
          {
!             throw new TypeCastException(e);
          }
      }
--- 62,66 ----
          catch (java.lang.NumberFormatException e)
          {
!             throw new TypeCastException(value, this, e);
          }
      }

Index: IntegerDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/IntegerDataType.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** IntegerDataType.java	22 Feb 2004 23:27:20 -0000	1.13
--- IntegerDataType.java	28 Apr 2004 19:49:34 -0000	1.14
***************
*** 61,65 ****
          catch (java.lang.NumberFormatException e)
          {
!             throw new TypeCastException(e);
          }
      }
--- 61,65 ----
          catch (java.lang.NumberFormatException e)
          {
!             throw new TypeCastException(value, this, e);
          }
      }

Index: LongDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/LongDataType.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** LongDataType.java	22 Feb 2004 23:27:20 -0000	1.13
--- LongDataType.java	28 Apr 2004 19:49:34 -0000	1.14
***************
*** 62,66 ****
          catch (java.lang.NumberFormatException e)
          {
!             throw new TypeCastException(e);
          }
      }
--- 62,66 ----
          catch (java.lang.NumberFormatException e)
          {
!             throw new TypeCastException(value, this, e);
          }
      }

Index: NumberDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/NumberDataType.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NumberDataType.java	3 Apr 2004 18:16:33 -0000	1.13
--- NumberDataType.java	28 Apr 2004 19:49:34 -0000	1.14
***************
*** 70,74 ****
          catch (java.lang.NumberFormatException e)
          {
!             throw new TypeCastException(e);
          }
      }
--- 70,74 ----
          catch (java.lang.NumberFormatException e)
          {
!             throw new TypeCastException(value, this, e);
          }
      }

Index: StringDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/StringDataType.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** StringDataType.java	3 Apr 2004 18:16:33 -0000	1.23
--- StringDataType.java	28 Apr 2004 19:49:34 -0000	1.24
***************
*** 73,77 ****
              catch (java.lang.NumberFormatException e)
              {
!                 throw new TypeCastException(e);
              }
          }
--- 73,77 ----
              catch (java.lang.NumberFormatException e)
              {
!                 throw new TypeCastException(value, this, e);
              }
          }
***************
*** 92,96 ****
              catch (SQLException e)
              {
!                 throw new TypeCastException(e);
              }
          }
--- 92,96 ----
              catch (SQLException e)
              {
!                 throw new TypeCastException(value, this, e);
              }
          }
***************
*** 110,118 ****
              catch (SQLException e)
              {
!                 throw new TypeCastException(e);
              }
          }
  
!         throw new TypeCastException(value.toString());
      }
  
--- 110,118 ----
              catch (SQLException e)
              {
!                 throw new TypeCastException(value, this, e);
              }
          }
  
!         throw new TypeCastException(value, this);
      }
  

Index: TimeDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/TimeDataType.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** TimeDataType.java	3 Apr 2004 18:16:33 -0000	1.14
--- TimeDataType.java	28 Apr 2004 19:49:34 -0000	1.15
***************
*** 73,81 ****
              catch (IllegalArgumentException e)
              {
!                 throw new TypeCastException((String)value, e);
              }
          }
  
!         throw new TypeCastException(value.toString());
      }
  
--- 73,81 ----
              catch (IllegalArgumentException e)
              {
!                 throw new TypeCastException(value, this, e);
              }
          }
  
!         throw new TypeCastException(value, this);
      }
  

Index: TimestampDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/TimestampDataType.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TimestampDataType.java	3 Apr 2004 18:16:33 -0000	1.15
--- TimestampDataType.java	28 Apr 2004 19:49:34 -0000	1.16
***************
*** 89,97 ****
              catch (IllegalArgumentException e)
              {
!                 throw new TypeCastException(stringValue, e);
              }
          }
  
!         throw new TypeCastException(value.toString());
      }
  
--- 89,97 ----
              catch (IllegalArgumentException e)
              {
!                 throw new TypeCastException(value, this, e);
              }
          }
  
!         throw new TypeCastException(value, this);
      }
  

Index: TypeCastException.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/datatype/TypeCastException.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TypeCastException.java	22 Jan 2004 02:54:18 -0000	1.10
--- TypeCastException.java	28 Apr 2004 19:49:34 -0000	1.11
***************
*** 29,51 ****
  public class TypeCastException extends DataTypeException
  {
!     public TypeCastException()
      {
!         super();
      }
  
!     public TypeCastException(String msg)
      {
!         super(msg);
      }
  
!     public TypeCastException(Throwable e)
      {
!         super(e);
      }
  
!     public TypeCastException(String msg, Throwable e)
      {
!         super(msg, e);
      }
  }
  
--- 29,63 ----
  public class TypeCastException extends DataTypeException
  {
! //    public TypeCastException()
! //    {
! //        super();
! //    }
! //
! //    public TypeCastException(String msg)
! //    {
! //        super(msg);
! //    }
! 
!     public TypeCastException(Throwable e)
      {
!         super(e);
      }
  
!     public TypeCastException(String msg, Throwable e)
      {
!         super(msg, e);
      }
  
!     public TypeCastException(Object value, DataType dataType)
      {
!         super("Unable to typecast value <" + value + "> of type <" +
!                 value.getClass().getName() + "> to " + dataType);
      }
  
!     public TypeCastException(Object value, DataType dataType, Throwable e)
      {
!         super("Error typecasting value <" + value + "> to " + dataType, e);
      }
+ 
  }
  

[dbunit-commit] dbunit/src/java/org/dbunit/ext/oracle OracleBlobDataType.java,1.1,1.2 OracleClobDataType.java,1.2,1.3

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/oracle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28402/src/java/org/dbunit/ext/oracle

Modified Files:
	OracleBlobDataType.java OracleClobDataType.java 
Log Message:
Now TypeCastException error message displays the original value and the target data type.

Index: OracleBlobDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/oracle/OracleBlobDataType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OracleBlobDataType.java	2 Feb 2004 23:07:24 -0000	1.1
--- OracleBlobDataType.java	28 Apr 2004 19:49:34 -0000	1.2
***************
*** 96,120 ****
          {
              freeTemporaryBlob(tempBlob);
!             throw new TypeCastException(e);
          }
          catch (NoSuchMethodException e)
          {
              freeTemporaryBlob(tempBlob);
!             throw new TypeCastException(e);
          }
          catch (IOException e)
          {
              freeTemporaryBlob(tempBlob);
!             throw new TypeCastException(e);
          }
          catch (InvocationTargetException e)
          {
              freeTemporaryBlob(tempBlob);
!             throw new TypeCastException(e.getTargetException());
          }
          catch (ClassNotFoundException e)
          {
              freeTemporaryBlob(tempBlob);
!             throw new TypeCastException(e);
          }
  
--- 96,120 ----
          {
              freeTemporaryBlob(tempBlob);
!             throw new TypeCastException(value, this, e);
          }
          catch (NoSuchMethodException e)
          {
              freeTemporaryBlob(tempBlob);
!             throw new TypeCastException(value, this, e);
          }
          catch (IOException e)
          {
              freeTemporaryBlob(tempBlob);
!             throw new TypeCastException(value, this, e);
          }
          catch (InvocationTargetException e)
          {
              freeTemporaryBlob(tempBlob);
!             throw new TypeCastException(value, this, e);
          }
          catch (ClassNotFoundException e)
          {
              freeTemporaryBlob(tempBlob);
!             throw new TypeCastException(value, this, e);
          }
  
***************
*** 137,149 ****
          catch (NoSuchMethodException e)
          {
!             throw new TypeCastException(e);
          }
          catch (IllegalAccessException e)
          {
!             throw new TypeCastException(e);
          }
          catch (InvocationTargetException e)
          {
!             throw new TypeCastException(e);
          }
      }
--- 137,149 ----
          catch (NoSuchMethodException e)
          {
!             throw new TypeCastException("Error freeing Oracle BLOB", e);
          }
          catch (IllegalAccessException e)
          {
!             throw new TypeCastException("Error freeing Oracle BLOB", e);
          }
          catch (InvocationTargetException e)
          {
!             throw new TypeCastException("Error freeing Oracle BLOB", e.getTargetException());
          }
      }

Index: OracleClobDataType.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/oracle/OracleClobDataType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OracleClobDataType.java	22 Jan 2004 02:54:19 -0000	1.2
--- OracleClobDataType.java	28 Apr 2004 19:49:34 -0000	1.3
***************
*** 96,120 ****
          {
              freeTemporaryClob(tempClob);
!             throw new TypeCastException(e);
          }
          catch (NoSuchMethodException e)
          {
              freeTemporaryClob(tempClob);
!             throw new TypeCastException(e);
          }
          catch (IOException e)
          {
              freeTemporaryClob(tempClob);
!             throw new TypeCastException(e);
          }
          catch (InvocationTargetException e)
          {
              freeTemporaryClob(tempClob);
!             throw new TypeCastException(e.getTargetException());
          }
          catch (ClassNotFoundException e)
          {
              freeTemporaryClob(tempClob);
!             throw new TypeCastException(e);
          }
  
--- 96,120 ----
          {
              freeTemporaryClob(tempClob);
!             throw new TypeCastException(value, this, e);
          }
          catch (NoSuchMethodException e)
          {
              freeTemporaryClob(tempClob);
!             throw new TypeCastException(value, this, e);
          }
          catch (IOException e)
          {
              freeTemporaryClob(tempClob);
!             throw new TypeCastException(value, this, e);
          }
          catch (InvocationTargetException e)
          {
              freeTemporaryClob(tempClob);
!             throw new TypeCastException(value, this, e.getTargetException());
          }
          catch (ClassNotFoundException e)
          {
              freeTemporaryClob(tempClob);
!             throw new TypeCastException(value, this, e);
          }
  
***************
*** 137,149 ****
          catch (NoSuchMethodException e)
          {
!             throw new TypeCastException(e);
          }
          catch (IllegalAccessException e)
          {
!             throw new TypeCastException(e);
          }
          catch (InvocationTargetException e)
          {
!             throw new TypeCastException(e);
          }
      }
--- 137,149 ----
          catch (NoSuchMethodException e)
          {
!             throw new TypeCastException("Error freeing Oracle CLOB", e);
          }
          catch (IllegalAccessException e)
          {
!             throw new TypeCastException("Error freeing Oracle CLOB", e);
          }
          catch (InvocationTargetException e)
          {
!             throw new TypeCastException("Error freeing Oracle CLOB", e.getTargetException());
          }
      }

[dbunit-commit] dbunit/src/java/org/dbunit/database DatabaseSequenceFilter.java,1.6,1.7

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19741/src/java/org/dbunit/database

Modified Files:
	DatabaseSequenceFilter.java 
Log Message:
Implemented "qualified table names" feature support (#939401)

Index: DatabaseSequenceFilter.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/database/DatabaseSequenceFilter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DatabaseSequenceFilter.java	15 Mar 2004 16:44:16 -0000	1.6
--- DatabaseSequenceFilter.java	22 Apr 2004 00:45:59 -0000	1.7
***************
*** 23,26 ****
--- 23,27 ----
  import org.dbunit.DatabaseUnitRuntimeException;
  import org.dbunit.dataset.DataSetException;
+ import org.dbunit.dataset.DataSetUtils;
  import org.dbunit.dataset.filter.SequenceTableFilter;
  
***************
*** 162,169 ****
              }
  
              DatabaseMetaData metaData = _connection.getConnection().getMetaData();
!             String schema = _connection.getSchema();
  
-             ResultSet resultSet = metaData.getExportedKeys(null, schema, tableName);
              try
              {
--- 163,180 ----
              }
  
+             boolean qualifiedNames = _connection.getConfig().getFeature(
+                     DatabaseConfig.FEATURE_QUALIFIED_TABLE_NAMES);
+ 
+             String originalTableName = tableName;
+             String schemaName = _connection.getSchema();
+             int index = tableName.indexOf(".");
+             if (index >= 0)
+             {
+                 schemaName = tableName.substring(0, index);
+                 tableName = tableName.substring(index + 1);
+             }
              DatabaseMetaData metaData = _connection.getConnection().getMetaData();
!             ResultSet resultSet = metaData.getExportedKeys(null, schemaName, tableName);
  
              try
              {
***************
*** 172,183 ****
                  while (resultSet.next())
                  {
!                     // TODO : add support for qualified table names
! //                    String foreignSchemaName = resultSet.getString(6);
                      String foreignTableName = resultSet.getString(7);
  
                      foreignTableSet.add(foreignTableName);
                  }
  
!                 _dependentMap.put(tableName, foreignTableSet);
                  return foreignTableSet;
              }
--- 183,198 ----
                  while (resultSet.next())
                  {
!                     String foreignSchemaName = resultSet.getString(6);
                      String foreignTableName = resultSet.getString(7);
+                     if (qualifiedNames)
+                     {
+                         foreignTableName = DataSetUtils.getQualifiedName(
+                                 foreignSchemaName, foreignTableName);
+                     }
  
                      foreignTableSet.add(foreignTableName);
                  }
  
!                 _dependentMap.put(originalTableName, foreignTableSet);
                  return foreignTableSet;
              }

[dbunit-commit] dbunit project.xml,1.17,1.18

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10040

Modified Files:
	project.xml 
Log Message:
Updated POI dependency to 2.0 final.

Index: project.xml
===================================================================
RCS file: /cvsroot/dbunit/dbunit/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** project.xml	15 Mar 2004 16:44:16 -0000	1.17
--- project.xml	21 Apr 2004 23:37:40 -0000	1.18
***************
*** 190,194 ****
      <dependency>
       <id>poi</id>
!      <version>1.8.0-dev-20020919</version>      
      </dependency>       
      <dependency>
--- 190,194 ----
      <dependency>
       <id>poi</id>
!      <version>2.0-final-20040126</version>      
      </dependency>       
      <dependency>

[dbunit-commit] dbunit/src/java/org/dbunit/dataset/excel XlsDataSet.java,1.5,1.6

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/excel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7653/src/java/org/dbunit/dataset/excel

Modified Files:
	XlsDataSet.java 
Log Message:
937732 - Use UTF-16 encoding to support Asian characters. Patch submitted by Shuhei Kondo.

Index: XlsDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/excel/XlsDataSet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** XlsDataSet.java	15 Mar 2004 16:44:17 -0000	1.5
--- XlsDataSet.java	21 Apr 2004 23:22:14 -0000	1.6
***************
*** 81,85 ****
  
              // write table metadata i.e. first row in sheet
!             workbook.setSheetName(index, metaData.getTableName());
  
              HSSFRow headerRow = sheet.createRow(0);
--- 81,85 ----
  
              // write table metadata i.e. first row in sheet
!             workbook.setSheetName(index, metaData.getTableName(), HSSFWorkbook.ENCODING_UTF_16);
  
              HSSFRow headerRow = sheet.createRow(0);
***************
*** 89,92 ****
--- 89,93 ----
                  Column column = columns[j];
                  HSSFCell cell = headerRow.createCell((short)j);
+                 cell.setEncoding(HSSFCell.ENCODING_UTF_16);
                  cell.setCellValue(column.getColumnName());
              }
***************
*** 103,106 ****
--- 104,108 ----
                      {
                          HSSFCell cell = row.createCell((short)k);
+                         cell.setEncoding(HSSFCell.ENCODING_UTF_16);
                          cell.setCellValue(DataType.asString(value));
                      }

[dbunit-commit] dbunit/src/java/org/dbunit/dataset CompositeDataSet.java,1.14,1.15

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6125/src/java/org/dbunit/dataset

Modified Files:
	CompositeDataSet.java 
Log Message:
CompositeDataSet refactoring


Index: CompositeDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/CompositeDataSet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CompositeDataSet.java	22 Jan 2004 02:54:18 -0000	1.14
--- CompositeDataSet.java	18 Apr 2004 15:57:18 -0000	1.15
***************
*** 24,27 ****
--- 24,28 ----
  import java.util.ArrayList;
  import java.util.List;
+ import java.util.ListIterator;
  
  /**
***************
*** 60,76 ****
          for (int i = 0; i < dataSets.length; i++)
          {
!             ITable[] tables = DataSetUtils.getTables(dataSets[i]);
!             for (int j = 0; j < tables.length; j++)
              {
!                 ITable table = tables[j];
!                 tableList.add(table);
              }
          }
  
          _tables = (ITable[])tableList.toArray(new ITable[0]);
-         if (combine)
-         {
-             _tables = combineTables(_tables);
-         }
      }
  
--- 61,73 ----
          for (int i = 0; i < dataSets.length; i++)
          {
!             IDataSet dataSet = dataSets[i];
!             ITableIterator iterator = dataSet.iterator();
!             while(iterator.next())
              {
!                 addTable(iterator.getTable(), tableList, combine);
              }
          }
  
          _tables = (ITable[])tableList.toArray(new ITable[0]);
      }
  
***************
*** 103,107 ****
  
      /**
!      * Creates a composite dataset that combines dsuplicate tables of the specified dataset.
       *
       * @param dataSet
--- 100,104 ----
  
      /**
!      * Creates a composite dataset that combines duplicate tables of the specified dataset.
       *
       * @param dataSet
***************
*** 110,113 ****
--- 107,112 ----
       *      if <code>true</code>, tables having the same name are merged into
       *      one table.
+      * @deprecated This constructor is useless when the combine parameter is
+      * <code>false</code>. Use overload that doesn't have the combine argument. 
       */
      public CompositeDataSet(IDataSet dataSet, boolean combine)
***************
*** 118,169 ****
  
      /**
!      * Creates a composite dataset that combines tables having identical name.
!      * Tables having the same name are merged into one table.
       */
!     public CompositeDataSet(ITable[] tables) throws DataSetException
      {
!         _tables = combineTables(tables);
      }
  
!     private ITable[] combineTables(ITable[] tables) //throws DataSetException
      {
          List tableList = new ArrayList();
! 
!         // process each table
!         for (int j = 0; j < tables.length; j++)
          {
!             // search table in list
!             ITable table = tables[j];
!             int index = getTableIndex(
!                     table.getTableMetaData().getTableName(), tableList);
! 
!             // not found, add new table in list
!             if (index == -1)
!             {
!                 tableList.add(table);
!             }
!             // found so combine them together
!             else
!             {
!                 table = new CompositeTable((ITable)tableList.get(index), table);
!                 tableList.set(index, table);
!             }
          }
  
!         return (ITable[])tableList.toArray(new ITable[0]);
      }
  
!     private int getTableIndex(String tableName, List list)
      {
!         for (int i = 0; i < list.size(); i++)
          {
!             ITable table = (ITable)list.get(i);
              if (tableName.equalsIgnoreCase(table.getTableMetaData().getTableName()))
              {
!                 return i;
              }
          }
  
!         return -1;
      }
  
--- 117,169 ----
  
      /**
!      * Creates a composite dataset that combines duplicate tables of the specified dataset.
!      *
!      * @param dataSet
!      *      the dataset
       */
!     public CompositeDataSet(IDataSet dataSet) throws DataSetException
      {
!         this(new IDataSet[]{dataSet}, true);
      }
  
!     /**
!      * Creates a composite dataset that combines tables having identical name.
!      * Tables having the same name are merged into one table.
!      */
!     public CompositeDataSet(ITable[] tables) throws DataSetException
      {
          List tableList = new ArrayList();
!         for (int i = 0; i < tables.length; i++)
          {
!             addTable(tables[i], tableList, true);
          }
  
!         _tables = (ITable[])tableList.toArray(new ITable[0]);
      }
  
!     private void addTable(ITable newTable, List tableList, boolean combine)
      {
!         // No merge required, simply add new table at then end of the list
!         if (!combine)
          {
!             tableList.add(newTable);
!             return;
!         }
! 
!         // Merge required, search for existing table with the same name
!         String tableName = newTable.getTableMetaData().getTableName();
!         for (ListIterator it = tableList.listIterator(); it.hasNext();)
!         {
!             ITable table = (ITable)it.next();
              if (tableName.equalsIgnoreCase(table.getTableMetaData().getTableName()))
              {
!                 // Found existing table, merge existing and new tables together
!                 it.set(new CompositeTable(table, newTable));
!                 return;
              }
          }
  
!         // No existing table found, add new table at the end of the list
!         tableList.add(newTable);
      }
  

[dbunit-commit] dbunit/src/test/org/dbunit/dataset CompositeDataSetTest.java,1.11,1.12

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6125/src/test/org/dbunit/dataset

Modified Files:
	CompositeDataSetTest.java 
Log Message:
CompositeDataSet refactoring


Index: CompositeDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/CompositeDataSetTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CompositeDataSetTest.java	22 Jan 2004 02:54:21 -0000	1.11
--- CompositeDataSetTest.java	18 Apr 2004 15:57:19 -0000	1.12
***************
*** 74,78 ****
          assertEquals("table count before", 3, originaldataSet.getTableNames().length);
  
!         IDataSet combinedDataSet = new CompositeDataSet(originaldataSet, true);
          assertEquals("table count combined", 2, combinedDataSet.getTableNames().length);
      }
--- 74,78 ----
          assertEquals("table count before", 3, originaldataSet.getTableNames().length);
  
!         IDataSet combinedDataSet = new CompositeDataSet(originaldataSet);
          assertEquals("table count combined", 2, combinedDataSet.getTableNames().length);
      }

[dbunit-commit] dbunit/src/java/org/dbunit/dataset/filter DefaultColumnFilter.java,NONE,1.1 DefaultTableFilter.java,NONE,1.1 IColumnFilter.java,NONE,1.1 PatternMatcher.java,NONE,1.1 AbstractTableFilter.java,1.4,1.5 ExcludeTableFilter.java,1.6,1.7 ITableFilter.java,1.5,1.6 IncludeTableFilter.java,1.6,1.7 SequenceTableFilter.java,1.5,1.6

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3906/src/java/org/dbunit/dataset/filter

Modified Files:
	AbstractTableFilter.java ExcludeTableFilter.java 
	ITableFilter.java IncludeTableFilter.java 
	SequenceTableFilter.java 
Added Files:
	DefaultColumnFilter.java DefaultTableFilter.java 
	IColumnFilter.java PatternMatcher.java 
Log Message:
* Added IColumnFilter interface. Currently only used as a configurable strategy to detect MS SQL Server identity columns. Will eventually be used with FilteredDataSet decorator to include/exclude table columns.
* Renamed ITableFilter.isValidName() method to accept()to be consistent with the new IColumnFilter interface. 
* Added DefaultTableFilter class, which combine Include/ExcludeTableFilter classes.

--- NEW FILE: DefaultColumnFilter.java ---
/*
 *
 * The DbUnit Database Testing Framework
 * Copyright (C)2002-2004, DbUnit.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */
package org.dbunit.dataset.filter;

import org.dbunit.dataset.Column;

/**
 * @author Manuel Laflamme
 * @since Apr 17, 2004
 * @version $Revision: 1.1 $
 */
public class DefaultColumnFilter implements IColumnFilter
{
    private final PatternMatcher _includeMatcher = new PatternMatcher();
    private final PatternMatcher _excludeMatcher = new PatternMatcher();

    /**
     * Add a new accepted column name pattern for all tables.
     * The following wildcard characters are supported:
     * '*' matches zero or more characters,
     * '?' matches one character.
     */
    public void includeColumn(String columnPattern)
    {
        _includeMatcher.addPattern(columnPattern);
    }

    /**
     * Add a new refused column name pattern for all tables.
     * The following wildcard characters are supported:
     * '*' matches zero or more characters,
     * '?' matches one character.
     */
    public void excludeColumn(String columnPattern)
    {
        _excludeMatcher.addPattern(columnPattern);
    }

    ////////////////////////////////////////////////////////////////////////////
    // IColumnFilter interface

    public boolean accept(String tableName, Column column)
    {
        if (_includeMatcher.isEmpty() ||
                _includeMatcher.accept(column.getColumnName()))
        {
            return !_excludeMatcher.accept(column.getColumnName());
        }
        return false;
    }
}

--- NEW FILE: DefaultTableFilter.java ---
/*
 *
 * The DbUnit Database Testing Framework
 * Copyright (C)2002-2004, DbUnit.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */
package org.dbunit.dataset.filter;

import org.dbunit.dataset.DataSetException;

/**
 * This filter exposes only tables matching include patterns and not matching
 * exclude patterns. This implementation do not modify the original table
 * sequence from the filtered dataset and support duplicate table names.
 *
 * @author Manuel Laflamme
 * @since Apr 17, 2004
 * @version $Revision: 1.1 $
 */
public class DefaultTableFilter extends AbstractTableFilter implements ITableFilter
{
    private final IncludeTableFilter _includeFilter = new IncludeTableFilter();
    private final ExcludeTableFilter _excludeFilter = new ExcludeTableFilter();

    /**
     * Add a new accepted table name pattern.
     * The following wildcard characters are supported:
     * '*' matches zero or more characters,
     * '?' matches one character.
     */
    public void includeTable(String patternName)
    {
        _includeFilter.includeTable(patternName);
    }

    /**
     * Add a new refused table pattern name.
     * The following wildcard characters are supported:
     * '*' matches zero or more characters,
     * '?' matches one character.
     */
    public void excludeTable(String patternName)
    {
        _excludeFilter.excludeTable(patternName);
    }

    ////////////////////////////////////////////////////////////////////////////
    // AbstractTableFilter interface

    public boolean isValidName(String tableName) throws DataSetException
    {
        if (_includeFilter.isEmpty() || _includeFilter.accept(tableName))
        {
            return _excludeFilter.accept(tableName);
        }
        return false;
    }
}

--- NEW FILE: IColumnFilter.java ---
/*
 *
 * The DbUnit Database Testing Framework
 * Copyright (C)2002-2004, DbUnit.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */
package org.dbunit.dataset.filter;

import org.dbunit.dataset.Column;

/**
 * @author Manuel Laflamme
 * @since Apr 17, 2004
 * @version $Revision: 1.1 $
 */
public interface IColumnFilter
{
    public boolean accept(String tableName, Column column);
}

--- NEW FILE: PatternMatcher.java ---
/*
 *
 * The DbUnit Database Testing Framework
 * Copyright (C)2002-2004, DbUnit.org
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */
package org.dbunit.dataset.filter;

import java.util.Set;
import java.util.HashSet;
import java.util.Iterator;

/**
 * @author Manuel Laflamme
 * @since Apr 17, 2004
 * @version $Revision: 1.1 $
 */
class PatternMatcher
{
    private final Set _acceptedNames = new HashSet();
    private final Set _acceptedPatterns = new HashSet();

    /**
     * Add a new accepted pattern.
     * The following wildcard characters are supported:
     * '*' matches zero or more characters,
     * '?' matches one character.
     */
    public void addPattern(String patternName)
    {
        if (patternName.indexOf("*") != -1 || patternName.indexOf("?") != -1)
        {
            _acceptedPatterns.add(patternName);
        }
        else
        {
            _acceptedNames.add(patternName.toUpperCase());
        }
    }

    public boolean isEmpty()
    {
        if (_acceptedNames.isEmpty() && _acceptedPatterns.isEmpty())
        {
            return true;
        }

        return false;
    }

    public boolean accept(String name)
    {
        if (_acceptedNames.contains(name.toUpperCase()))
        {
            return true;
        }

        if (_acceptedPatterns.size() > 0)
        {
            for (Iterator it = _acceptedPatterns.iterator(); it.hasNext();)
            {
                String pattern = (String)it.next();
                if (match(pattern, name, false))
                {
                    return true;
                }
            }
        }

        return false;
    }

    /**
     * Matches a string against a pattern. The pattern contains two special
     * characters:
     * '*' which means zero or more characters,
     * '?' which means one and only one character.
     *
     * @param pattern the (non-null) pattern to match against
     * @param str     the (non-null) string that must be matched against the
     *                pattern
     *
     * @return <code>true</code> when the string matches against the pattern,
     *         <code>false</code> otherwise.
     */
    private boolean match(String pattern, String str, boolean isCaseSensitive)
    {
        /* Following pattern matching code taken from the Apache Ant project. */

        char[] patArr = pattern.toCharArray();
        char[] strArr = str.toCharArray();
        int patIdxStart = 0;
        int patIdxEnd = patArr.length - 1;
        int strIdxStart = 0;
        int strIdxEnd = strArr.length - 1;
        char ch;

        boolean containsStar = false;
        for (int i = 0; i < patArr.length; i++)
        {
            if (patArr[i] == '*')
            {
                containsStar = true;
                break;
            }
        }

        if (!containsStar)
        {
            // No '*'s, so we make a shortcut
            if (patIdxEnd != strIdxEnd)
            {
                return false; // Pattern and string do not have the same size
            }
            for (int i = 0; i <= patIdxEnd; i++)
            {
                ch = patArr[i];
                if (ch != '?')
                {
                    if (isCaseSensitive && ch != strArr[i])
                    {
                        return false;// Character mismatch
                    }
                    if (!isCaseSensitive && Character.toUpperCase(ch) !=
                            Character.toUpperCase(strArr[i]))
                    {
                        return false; // Character mismatch
                    }
                }
            }
            return true; // String matches against pattern
        }

        if (patIdxEnd == 0)
        {
            return true; // Pattern contains only '*', which matches anything
        }

        // Process characters before first star
        while ((ch = patArr[patIdxStart]) != '*' && strIdxStart <= strIdxEnd)
        {
            if (ch != '?')
            {
                if (isCaseSensitive && ch != strArr[strIdxStart])
                {
                    return false;// Character mismatch
                }
                if (!isCaseSensitive && Character.toUpperCase(ch) !=
                        Character.toUpperCase(strArr[strIdxStart]))
                {
                    return false;// Character mismatch
                }
            }
            patIdxStart++;
            strIdxStart++;
        }
        if (strIdxStart > strIdxEnd)
        {
            // All characters in the string are used. Check if only '*'s are
            // left in the pattern. If so, we succeeded. Otherwise failure.
            for (int i = patIdxStart; i <= patIdxEnd; i++)
            {
                if (patArr[i] != '*')
                {
                    return false;
                }
            }
            return true;
        }

        // Process characters after last star
        while ((ch = patArr[patIdxEnd]) != '*' && strIdxStart <= strIdxEnd)
        {
            if (ch != '?')
            {
                if (isCaseSensitive && ch != strArr[strIdxEnd])
                {
                    return false;// Character mismatch
                }
                if (!isCaseSensitive && Character.toUpperCase(ch) !=
                        Character.toUpperCase(strArr[strIdxEnd]))
                {
                    return false;// Character mismatch
                }
            }
            patIdxEnd--;
            strIdxEnd--;
        }
        if (strIdxStart > strIdxEnd)
        {
            // All characters in the string are used. Check if only '*'s are
            // left in the pattern. If so, we succeeded. Otherwise failure.
            for (int i = patIdxStart; i <= patIdxEnd; i++)
            {
                if (patArr[i] != '*')
                {
                    return false;
                }
            }
            return true;
        }

        // process pattern between stars. padIdxStart and patIdxEnd point
        // always to a '*'.
        while (patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd)
        {
            int patIdxTmp = -1;
            for (int i = patIdxStart + 1; i <= patIdxEnd; i++)
            {
                if (patArr[i] == '*')
                {
                    patIdxTmp = i;
                    break;
                }
            }
            if (patIdxTmp == patIdxStart + 1)
            {
                // Two stars next to each other, skip the first one.
                patIdxStart++;
                continue;
            }
            // Find the pattern between padIdxStart & padIdxTmp in str between
            // strIdxStart & strIdxEnd
            int patLength = (patIdxTmp - patIdxStart - 1);
            int strLength = (strIdxEnd - strIdxStart + 1);
            int foundIdx = -1;
            strLoop:
            for (int i = 0; i <= strLength - patLength; i++)
            {
                for (int j = 0; j < patLength; j++)
                {
                    ch = patArr[patIdxStart + j + 1];
                    if (ch != '?')
                    {
                        if (isCaseSensitive && ch != strArr[strIdxStart + i + j])
                        {
                            continue strLoop;
                        }
                        if (!isCaseSensitive && Character.toUpperCase(ch) !=
                                Character.toUpperCase(strArr[strIdxStart + i + j]))
                        {
                            continue strLoop;
                        }
                    }
                }

                foundIdx = strIdxStart + i;
                break;
            }

            if (foundIdx == -1)
            {
                return false;
            }

            patIdxStart = patIdxTmp;
            strIdxStart = foundIdx + patLength;
        }

        // All characters in the string are used. Check if only '*'s are left
        // in the pattern. If so, we succeeded. Otherwise failure.
        for (int i = patIdxStart; i <= patIdxEnd; i++)
        {
            if (patArr[i] != '*')
            {
                return false;
            }
        }
        return true;
    }

}

Index: AbstractTableFilter.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/AbstractTableFilter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AbstractTableFilter.java	15 Mar 2004 16:44:17 -0000	1.4
--- AbstractTableFilter.java	18 Apr 2004 02:48:19 -0000	1.5
***************
*** 29,33 ****
   * This class provides a skeletal implementation of the {@link ITableFilter}
   * interface to minimize the effort required to implement a filter. Subsclasses
!  * are only required to implement the {@link ITableFilter#isValidName} method.
   *
   * @author Manuel Laflamme
--- 29,33 ----
   * This class provides a skeletal implementation of the {@link ITableFilter}
   * interface to minimize the effort required to implement a filter. Subsclasses
!  * are only required to implement the {@link #isValidName} method.
   *
   * @author Manuel Laflamme
***************
*** 38,44 ****
--- 38,56 ----
  {
  
+     /**
+      * Returns <code>true</code> if specified table is allowed by this filter.
+      * This legacy method, now replaced by accept, still exist for compatibily
+      * with older environment
+      */
+     public abstract boolean isValidName(String tableName) throws DataSetException;
+ 
      ////////////////////////////////////////////////////////////////////////////
      // ITableFilter interface
  
+     public boolean accept(String tableName) throws DataSetException
+     {
+         return isValidName(tableName);
+     }
+ 
      public String[] getTableNames(IDataSet dataSet) throws DataSetException
      {
***************
*** 48,52 ****
          {
              String tableName = tableNames[i];
!             if (isValidName(tableName))
              {
                  nameList.add(tableName);
--- 60,64 ----
          {
              String tableName = tableNames[i];
!             if (accept(tableName))
              {
                  nameList.add(tableName);
***************
*** 82,86 ****
              while(_iterator.next())
              {
!                 if (isValidName(_iterator.getTableMetaData().getTableName()))
                  {
                      return true;
--- 94,98 ----
              while(_iterator.next())
              {
!                 if (accept(_iterator.getTableMetaData().getTableName()))
                  {
                      return true;

Index: ExcludeTableFilter.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/ExcludeTableFilter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ExcludeTableFilter.java	22 Jan 2004 02:54:18 -0000	1.6
--- ExcludeTableFilter.java	18 Apr 2004 02:48:19 -0000	1.7
***************
*** 21,24 ****
--- 21,26 ----
  package org.dbunit.dataset.filter;
  
+ import org.dbunit.dataset.DataSetException;
+ 
  
  /**
***************
*** 33,37 ****
  public class ExcludeTableFilter extends AbstractTableFilter implements ITableFilter
  {
!     private final IncludeTableFilter _includeFilter;
  
      /**
--- 35,39 ----
  public class ExcludeTableFilter extends AbstractTableFilter implements ITableFilter
  {
!     private final PatternMatcher _patternMatcher = new PatternMatcher();
  
      /**
***************
*** 41,45 ****
      public ExcludeTableFilter()
      {
-         _includeFilter = new IncludeTableFilter();
      }
  
--- 43,46 ----
***************
*** 49,58 ****
      public ExcludeTableFilter(String[] tableNames)
      {
!         _includeFilter = new IncludeTableFilter(tableNames);
      }
  
      /**
!      * Add a new table pattern name to exclude in this filter.
!      * The following special characters can be used:
       * '*' matches zero or more characters,
       * '?' matches one character.
--- 50,63 ----
      public ExcludeTableFilter(String[] tableNames)
      {
!         for (int i = 0; i < tableNames.length; i++)
!         {
!             String tableName = tableNames[i];
!             excludeTable(tableName);
!         }
      }
  
      /**
!      * Add a new refused table pattern name.
!      * The following wildcard characters are supported:
       * '*' matches zero or more characters,
       * '?' matches one character.
***************
*** 60,64 ****
      public void excludeTable(String patternName)
      {
!         _includeFilter.includeTable(patternName);
      }
  
--- 65,74 ----
      public void excludeTable(String patternName)
      {
!         _patternMatcher.addPattern(patternName);
!     }
! 
!     public boolean isEmpty()
!     {
!         return _patternMatcher.isEmpty();
      }
  
***************
*** 66,72 ****
      // ITableFilter interface
  
!     public boolean isValidName(String tableName)
      {
!         return !_includeFilter.isValidName(tableName);
      }
  }
--- 76,82 ----
      // ITableFilter interface
  
!     public boolean isValidName(String tableName) throws DataSetException
      {
!         return !_patternMatcher.accept(tableName);
      }
  }

Index: ITableFilter.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/ITableFilter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ITableFilter.java	23 Jan 2004 07:12:44 -0000	1.5
--- ITableFilter.java	18 Apr 2004 02:48:19 -0000	1.6
***************
*** 38,42 ****
       * Returns <code>true</code> if specified table is allowed by this filter.
       */
!     public boolean isValidName(String tableName) throws DataSetException;
  
      /**
--- 38,42 ----
       * Returns <code>true</code> if specified table is allowed by this filter.
       */
!     public boolean accept(String tableName) throws DataSetException;
  
      /**

Index: IncludeTableFilter.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/IncludeTableFilter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** IncludeTableFilter.java	22 Jan 2004 02:54:18 -0000	1.6
--- IncludeTableFilter.java	18 Apr 2004 02:48:19 -0000	1.7
***************
*** 36,41 ****
  public class IncludeTableFilter extends AbstractTableFilter implements ITableFilter
  {
!     private final Set _allowedNames = new HashSet();
!     private final Set _allowedPatterns = new HashSet();
  
      /**
--- 36,40 ----
  public class IncludeTableFilter extends AbstractTableFilter implements ITableFilter
  {
!     private final PatternMatcher _patternMatcher = new PatternMatcher();
  
      /**
***************
*** 60,65 ****
  
      /**
!      * Add a new table name pattern to include in this filter.
!      * The following special characters can be used:
       * '*' matches zero or more characters,
       * '?' matches one character.
--- 59,64 ----
  
      /**
!      * Add a new accepted table name pattern.
!      * The following wildcard characters are supported:
       * '*' matches zero or more characters,
       * '?' matches one character.
***************
*** 67,277 ****
      public void includeTable(String patternName)
      {
!         if (patternName.indexOf("*") != -1 || patternName.indexOf("?") != -1)
!         {
!             _allowedPatterns.add(patternName);
!         }
!         else
!         {
!             _allowedNames.add(patternName.toUpperCase());
!         }
      }
  
!     /**
!      * Matches a string against a pattern. The pattern contains two special
!      * characters:
!      * '*' which means zero or more characters,
!      * '?' which means one and only one character.
!      *
!      * @param pattern the (non-null) pattern to match against
!      * @param str     the (non-null) string that must be matched against the
!      *                pattern
!      *
!      * @return <code>true</code> when the string matches against the pattern,
!      *         <code>false</code> otherwise.
!      */
!     private boolean match(String pattern, String str, boolean isCaseSensitive)
      {
!         /* Following pattern matching code taken from the Apache Ant project. */
! 
!         char[] patArr = pattern.toCharArray();
!         char[] strArr = str.toCharArray();
!         int patIdxStart = 0;
!         int patIdxEnd = patArr.length - 1;
!         int strIdxStart = 0;
!         int strIdxEnd = strArr.length - 1;
!         char ch;
! 
!         boolean containsStar = false;
!         for (int i = 0; i < patArr.length; i++)
!         {
!             if (patArr[i] == '*')
!             {
!                 containsStar = true;
!                 break;
!             }
!         }
! 
!         if (!containsStar)
!         {
!             // No '*'s, so we make a shortcut
!             if (patIdxEnd != strIdxEnd)
!             {
!                 return false; // Pattern and string do not have the same size
!             }
!             for (int i = 0; i <= patIdxEnd; i++)
!             {
!                 ch = patArr[i];
!                 if (ch != '?')
!                 {
!                     if (isCaseSensitive && ch != strArr[i])
!                     {
!                         return false;// Character mismatch
!                     }
!                     if (!isCaseSensitive && Character.toUpperCase(ch) !=
!                             Character.toUpperCase(strArr[i]))
!                     {
!                         return false; // Character mismatch
!                     }
!                 }
!             }
!             return true; // String matches against pattern
!         }
! 
!         if (patIdxEnd == 0)
!         {
!             return true; // Pattern contains only '*', which matches anything
!         }
! 
!         // Process characters before first star
!         while ((ch = patArr[patIdxStart]) != '*' && strIdxStart <= strIdxEnd)
!         {
!             if (ch != '?')
!             {
!                 if (isCaseSensitive && ch != strArr[strIdxStart])
!                 {
!                     return false;// Character mismatch
!                 }
!                 if (!isCaseSensitive && Character.toUpperCase(ch) !=
!                         Character.toUpperCase(strArr[strIdxStart]))
!                 {
!                     return false;// Character mismatch
!                 }
!             }
!             patIdxStart++;
!             strIdxStart++;
!         }
!         if (strIdxStart > strIdxEnd)
!         {
!             // All characters in the string are used. Check if only '*'s are
!             // left in the pattern. If so, we succeeded. Otherwise failure.
!             for (int i = patIdxStart; i <= patIdxEnd; i++)
!             {
!                 if (patArr[i] != '*')
!                 {
!                     return false;
!                 }
!             }
!             return true;
!         }
! 
!         // Process characters after last star
!         while ((ch = patArr[patIdxEnd]) != '*' && strIdxStart <= strIdxEnd)
!         {
!             if (ch != '?')
!             {
!                 if (isCaseSensitive && ch != strArr[strIdxEnd])
!                 {
!                     return false;// Character mismatch
!                 }
!                 if (!isCaseSensitive && Character.toUpperCase(ch) !=
!                         Character.toUpperCase(strArr[strIdxEnd]))
!                 {
!                     return false;// Character mismatch
!                 }
!             }
!             patIdxEnd--;
!             strIdxEnd--;
!         }
!         if (strIdxStart > strIdxEnd)
!         {
!             // All characters in the string are used. Check if only '*'s are
!             // left in the pattern. If so, we succeeded. Otherwise failure.
!             for (int i = patIdxStart; i <= patIdxEnd; i++)
!             {
!                 if (patArr[i] != '*')
!                 {
!                     return false;
!                 }
!             }
!             return true;
!         }
! 
!         // process pattern between stars. padIdxStart and patIdxEnd point
!         // always to a '*'.
!         while (patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd)
!         {
!             int patIdxTmp = -1;
!             for (int i = patIdxStart + 1; i <= patIdxEnd; i++)
!             {
!                 if (patArr[i] == '*')
!                 {
!                     patIdxTmp = i;
!                     break;
!                 }
!             }
!             if (patIdxTmp == patIdxStart + 1)
!             {
!                 // Two stars next to each other, skip the first one.
!                 patIdxStart++;
!                 continue;
!             }
!             // Find the pattern between padIdxStart & padIdxTmp in str between
!             // strIdxStart & strIdxEnd
!             int patLength = (patIdxTmp - patIdxStart - 1);
!             int strLength = (strIdxEnd - strIdxStart + 1);
!             int foundIdx = -1;
!             strLoop:
!             for (int i = 0; i <= strLength - patLength; i++)
!             {
!                 for (int j = 0; j < patLength; j++)
!                 {
!                     ch = patArr[patIdxStart + j + 1];
!                     if (ch != '?')
!                     {
!                         if (isCaseSensitive && ch != strArr[strIdxStart + i + j])
!                         {
!                             continue strLoop;
!                         }
!                         if (!isCaseSensitive && Character.toUpperCase(ch) !=
!                                 Character.toUpperCase(strArr[strIdxStart + i + j]))
!                         {
!                             continue strLoop;
!                         }
!                     }
!                 }
! 
!                 foundIdx = strIdxStart + i;
!                 break;
!             }
! 
!             if (foundIdx == -1)
!             {
!                 return false;
!             }
! 
!             patIdxStart = patIdxTmp;
!             strIdxStart = foundIdx + patLength;
!         }
! 
!         // All characters in the string are used. Check if only '*'s are left
!         // in the pattern. If so, we succeeded. Otherwise failure.
!         for (int i = patIdxStart; i <= patIdxEnd; i++)
!         {
!             if (patArr[i] != '*')
!             {
!                 return false;
!             }
!         }
!         return true;
      }
  
--- 66,75 ----
      public void includeTable(String patternName)
      {
!         _patternMatcher.addPattern(patternName);
      }
  
!     public boolean isEmpty()
      {
!         return _patternMatcher.isEmpty();
      }
  
***************
*** 281,302 ****
      public boolean isValidName(String tableName)
      {
!         if (_allowedNames.contains(tableName.toUpperCase()))
!         {
!             return true;
!         }
! 
!         if (_allowedPatterns.size() > 0)
!         {
!             for (Iterator it = _allowedPatterns.iterator(); it.hasNext();)
!             {
!                 String pattern = (String)it.next();
!                 if (match(pattern, tableName, false))
!                 {
!                     return true;
!                 }
!             }
!         }
! 
!         return false;
      }
  }
--- 79,83 ----
      public boolean isValidName(String tableName)
      {
!         return _patternMatcher.accept(tableName);
      }
  }

Index: SequenceTableFilter.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/filter/SequenceTableFilter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SequenceTableFilter.java	15 Mar 2004 16:44:17 -0000	1.5
--- SequenceTableFilter.java	18 Apr 2004 02:48:19 -0000	1.6
***************
*** 29,33 ****
  /**
   * This filter expose a specified table sequence and can be used to reorder
!  * dataset table names. This implementation do not support duplicate table names.
   * Thus you cannot specify the same table name more than once in this filter
   * and the filtered dataset must not contains duplicate table names. This is
--- 29,33 ----
  /**
   * This filter expose a specified table sequence and can be used to reorder
!  * tables in a dataset. This implementation do not support duplicate table names.
   * Thus you cannot specify the same table name more than once in this filter
   * and the filtered dataset must not contains duplicate table names. This is
***************
*** 50,54 ****
      }
  
!     private boolean isValidName(String tableName, String[] tableNames,
              boolean verifyDuplicate) throws AmbiguousTableNameException
      {
--- 50,54 ----
      }
  
!     private boolean accept(String tableName, String[] tableNames,
              boolean verifyDuplicate) throws AmbiguousTableNameException
      {
***************
*** 77,83 ****
      // ITableFilter interface
  
!     public boolean isValidName(String tableName) throws DataSetException
      {
!         return isValidName(tableName, _tableNames, true);
      }
  
--- 77,83 ----
      // ITableFilter interface
  
!     public boolean accept(String tableName) throws DataSetException
      {
!         return accept(tableName, _tableNames, true);
      }
  

[dbunit-commit] dbunit/src/java/org/dbunit/ext/mssql InsertIdentityOperation.java,1.3,1.4

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/mssql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3906/src/java/org/dbunit/ext/mssql

Modified Files:
	InsertIdentityOperation.java 
Log Message:
* Added IColumnFilter interface. Currently only used as a configurable strategy to detect MS SQL Server identity columns. Will eventually be used with FilteredDataSet decorator to include/exclude table columns.
* Renamed ITableFilter.isValidName() method to accept()to be consistent with the new IColumnFilter interface. 
* Added DefaultTableFilter class, which combine Include/ExcludeTableFilter classes.

Index: InsertIdentityOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/ext/mssql/InsertIdentityOperation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InsertIdentityOperation.java	15 Mar 2004 16:44:18 -0000	1.3
--- InsertIdentityOperation.java	18 Apr 2004 02:48:19 -0000	1.4
***************
*** 24,28 ****
--- 24,30 ----
  import org.dbunit.DatabaseUnitException;
  import org.dbunit.database.IDatabaseConnection;
+ import org.dbunit.database.DatabaseConfig;
  import org.dbunit.dataset.*;
+ import org.dbunit.dataset.filter.IColumnFilter;
  import org.dbunit.operation.AbstractOperation;
  import org.dbunit.operation.CompositeOperation;
***************
*** 54,57 ****
--- 56,62 ----
  public class InsertIdentityOperation extends AbstractOperation
  {
+     public static final String IDENTITY_COLUMN_FILTER =
+             "http://www.dbunit.org/features/mssql/identityColumnFilter";
+ 
      public static final DatabaseOperation INSERT =
              new InsertIdentityOperation(DatabaseOperation.INSERT);
***************
*** 64,67 ****
--- 69,81 ----
              new InsertIdentityOperation(DatabaseOperation.REFRESH);
  
+     private static final IColumnFilter DEFAULT_IDENTITY_FILTER = new IColumnFilter()
+     {
+         public boolean accept(String tableName, Column column)
+         {
+             return column.getSqlTypeName().endsWith("identity");
+         }
+     };
+ 
+ 
      private final DatabaseOperation _operation;
  
***************
*** 75,87 ****
      }
  
!     protected boolean hasIdentityColumn(ITableMetaData metaData)
              throws DataSetException
      {
!         // check all columns to see if they are an identity column
!         Column[] columns = metaData.getColumns();
  
          for (int i = 0; i < columns.length; i++)
          {
!             if (columns[i].getSqlTypeName().endsWith("identity"))
              {
                  return true;
--- 89,108 ----
      }
  
!     private boolean hasIdentityColumn(ITableMetaData metaData, IDatabaseConnection connection)
              throws DataSetException
      {
!         DatabaseConfig config = connection.getConfig();
!         IColumnFilter identityFilter = (IColumnFilter)config.getProperty(
!                 IDENTITY_COLUMN_FILTER);
!         if (identityFilter == null)
!         {
!             identityFilter = DEFAULT_IDENTITY_FILTER;
!         }
  
+         // Verify if there is at least one identity column
+         Column[] columns = metaData.getColumns();
          for (int i = 0; i < columns.length; i++)
          {
!             if (identityFilter.accept(null, columns[i]))
              {
                  return true;
***************
*** 125,129 ****
  
                  // enable identity insert
!                 boolean hasIdentityColumn = hasIdentityColumn(metaData);
  
                  if (hasIdentityColumn)
--- 146,150 ----
  
                  // enable identity insert
!                 boolean hasIdentityColumn = hasIdentityColumn(metaData, connection);
  
                  if (hasIdentityColumn)

[dbunit-commit] dbunit/src/test/org/dbunit/dataset/filter AbstractTableFilterTest.java,1.5,1.6 ExcludeTableFilterTest.java,1.5,1.6 IncludeTableFilterTest.java,1.5,1.6 SequenceTableFilterTest.java,1.6,1.7

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3906/src/test/org/dbunit/dataset/filter

Modified Files:
	AbstractTableFilterTest.java ExcludeTableFilterTest.java 
	IncludeTableFilterTest.java SequenceTableFilterTest.java 
Log Message:
* Added IColumnFilter interface. Currently only used as a configurable strategy to detect MS SQL Server identity columns. Will eventually be used with FilteredDataSet decorator to include/exclude table columns.
* Renamed ITableFilter.isValidName() method to accept()to be consistent with the new IColumnFilter interface. 
* Added DefaultTableFilter class, which combine Include/ExcludeTableFilter classes.

Index: AbstractTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/AbstractTableFilterTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractTableFilterTest.java	15 Mar 2004 16:44:21 -0000	1.5
--- AbstractTableFilterTest.java	18 Apr 2004 02:48:19 -0000	1.6
***************
*** 66,70 ****
      }
  
!     public abstract void testIsValidName() throws Exception;
  
      public abstract void testIsCaseInsensitiveValidName() throws Exception;
--- 66,70 ----
      }
  
!     public abstract void testAccept() throws Exception;
  
      public abstract void testIsCaseInsensitiveValidName() throws Exception;

Index: ExcludeTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/ExcludeTableFilterTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExcludeTableFilterTest.java	15 Mar 2004 16:44:21 -0000	1.5
--- ExcludeTableFilterTest.java	18 Apr 2004 02:48:19 -0000	1.6
***************
*** 43,47 ****
      }
  
!     public void testIsValidName() throws Exception
      {
          String[] validNames = getExpectedNames();
--- 43,47 ----
      }
  
!     public void testAccept() throws Exception
      {
          String[] validNames = getExpectedNames();
***************
*** 52,56 ****
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.isValidName(validName));
          }
      }
--- 52,56 ----
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.accept(validName));
          }
      }
***************
*** 65,69 ****
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.isValidName(validName));
          }
      }
--- 65,69 ----
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.accept(validName));
          }
      }
***************
*** 80,84 ****
          {
              String invalidName = invalidNames[i];
!             assertEquals(invalidName, false, filter.isValidName(invalidName));
          }
      }
--- 80,84 ----
          {
              String invalidName = invalidNames[i];
!             assertEquals(invalidName, false, filter.accept(invalidName));
          }
      }
***************
*** 244,248 ****
              ExcludeTableFilter filter = new ExcludeTableFilter();
              filter.excludeTable(pattern);
!             assertEquals(pattern, true, filter.isValidName(validName));
          }
      }
--- 244,248 ----
              ExcludeTableFilter filter = new ExcludeTableFilter();
              filter.excludeTable(pattern);
!             assertEquals(pattern, true, filter.accept(validName));
          }
      }
***************
*** 258,262 ****
              ExcludeTableFilter filter = new ExcludeTableFilter();
              filter.excludeTable(pattern);
!             assertEquals(pattern, false, filter.isValidName(validName));
          }
      }
--- 258,262 ----
              ExcludeTableFilter filter = new ExcludeTableFilter();
              filter.excludeTable(pattern);
!             assertEquals(pattern, false, filter.accept(validName));
          }
      }

Index: IncludeTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/IncludeTableFilterTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IncludeTableFilterTest.java	15 Mar 2004 16:44:21 -0000	1.5
--- IncludeTableFilterTest.java	18 Apr 2004 02:48:19 -0000	1.6
***************
*** 64,68 ****
      }
  
!     public void testIsValidName() throws Exception
      {
          String[] validNames = getExpectedNames();
--- 64,68 ----
      }
  
!     public void testAccept() throws Exception
      {
          String[] validNames = getExpectedNames();
***************
*** 72,76 ****
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.isValidName(validName));
          }
      }
--- 72,76 ----
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.accept(validName));
          }
      }
***************
*** 84,88 ****
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.isValidName(validName));
          }
      }
--- 84,88 ----
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.accept(validName));
          }
      }
***************
*** 100,104 ****
          {
              String invalidName = invalidNames[i];
!             assertEquals(invalidName, false, filter.isValidName(invalidName));
          }
      }
--- 100,104 ----
          {
              String invalidName = invalidNames[i];
!             assertEquals(invalidName, false, filter.accept(invalidName));
          }
      }
***************
*** 287,291 ****
              IncludeTableFilter filter = new IncludeTableFilter();
              filter.includeTable(pattern);
!             assertEquals(pattern, true, filter.isValidName(validName));
          }
      }
--- 287,291 ----
              IncludeTableFilter filter = new IncludeTableFilter();
              filter.includeTable(pattern);
!             assertEquals(pattern, true, filter.accept(validName));
          }
      }
***************
*** 301,305 ****
              IncludeTableFilter filter = new IncludeTableFilter();
              filter.includeTable(pattern);
!             assertEquals(pattern, false, filter.isValidName(validName));
          }
      }
--- 301,305 ----
              IncludeTableFilter filter = new IncludeTableFilter();
              filter.includeTable(pattern);
!             assertEquals(pattern, false, filter.accept(validName));
          }
      }

Index: SequenceTableFilterTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/filter/SequenceTableFilterTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SequenceTableFilterTest.java	15 Mar 2004 16:44:21 -0000	1.6
--- SequenceTableFilterTest.java	18 Apr 2004 02:48:19 -0000	1.7
***************
*** 41,45 ****
      }
  
!     public void testIsValidName() throws Exception
      {
          String[] validNames = getExpectedNames();
--- 41,45 ----
      }
  
!     public void testAccept() throws Exception
      {
          String[] validNames = getExpectedNames();
***************
*** 49,53 ****
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.isValidName(validName));
          }
      }
--- 49,53 ----
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.accept(validName));
          }
      }
***************
*** 61,65 ****
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.isValidName(validName));
          }
      }
--- 61,65 ----
          {
              String validName = validNames[i];
!             assertEquals(validName, true, filter.accept(validName));
          }
      }
***************
*** 77,81 ****
          {
              String invalidName = invalidNames[i];
!             assertEquals(invalidName, false, filter.isValidName(invalidName));
          }
      }
--- 77,81 ----
          {
              String invalidName = invalidNames[i];
!             assertEquals(invalidName, false, filter.accept(invalidName));
          }
      }

[dbunit-commit] dbunit/src/java/org/dbunit/dataset FilteredDataSet.java,1.17,1.18

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3906/src/java/org/dbunit/dataset

Modified Files:
	FilteredDataSet.java 
Log Message:
* Added IColumnFilter interface. Currently only used as a configurable strategy to detect MS SQL Server identity columns. Will eventually be used with FilteredDataSet decorator to include/exclude table columns.
* Renamed ITableFilter.isValidName() method to accept()to be consistent with the new IColumnFilter interface. 
* Added DefaultTableFilter class, which combine Include/ExcludeTableFilter classes.

Index: FilteredDataSet.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/FilteredDataSet.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FilteredDataSet.java	23 Jan 2004 07:12:21 -0000	1.17
--- FilteredDataSet.java	18 Apr 2004 02:48:19 -0000	1.18
***************
*** 31,36 ****
   * @see ITableFilter
   * @see SequenceTableFilter
!  * @see org.dbunit.dataset.filter.IncludeTableFilter
!  * @see org.dbunit.dataset.filter.ExcludeTableFilter
   *
   * @author Manuel Laflamme
--- 31,35 ----
   * @see ITableFilter
   * @see SequenceTableFilter
!  * @see org.dbunit.dataset.filter.DefaultTableFilter
   *
   * @author Manuel Laflamme
***************
*** 56,60 ****
      /**
       * Creates a FilteredDataSet that decorates the specified dataset and
!      * exposes only the tables allowed by the specified filtering strategy.
       *
       * @param dataSet the filtered dataset
--- 55,59 ----
      /**
       * Creates a FilteredDataSet that decorates the specified dataset and
!      * exposes only the tables allowed by the specified filter.
       *
       * @param dataSet the filtered dataset
***************
*** 87,91 ****
              throws DataSetException
      {
!         if (!_filter.isValidName(tableName))
          {
              throw new NoSuchTableException(tableName);
--- 86,90 ----
              throws DataSetException
      {
!         if (!_filter.accept(tableName))
          {
              throw new NoSuchTableException(tableName);
***************
*** 97,101 ****
      public ITable getTable(String tableName) throws DataSetException
      {
!         if (!_filter.isValidName(tableName))
          {
              throw new NoSuchTableException(tableName);
--- 96,100 ----
      public ITable getTable(String tableName) throws DataSetException
      {
!         if (!_filter.accept(tableName))
          {
              throw new NoSuchTableException(tableName);

[dbunit-commit] dbunit/src/java/org/dbunit/dataset/csv CsvDataSetWriter.java,1.2,1.3 CsvParser.java,1.2,1.3 CsvParserException.java,1.2,1.3 CsvParserImpl.java,1.2,1.3 CsvProducer.java,1.2,1.3

[<fsp...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/csv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10953/src/java/org/dbunit/dataset/csv

Added Files:
	CsvDataSetWriter.java CsvParser.java CsvParserException.java 
	CsvParserImpl.java CsvProducer.java 
Log Message:
- renamed CSV* files to csv*
- DbUnitTaskTest.testExportCsv seems to have random failures, need to investigate

[dbunit-commit] dbunit/src/test/org/dbunit/dataset/csv CsvDataSetWriterTest.java,1.2,1.3 CsvParserTest.java,1.2,1.3 CsvProducerTest.java,1.3,1.4

[<fsp...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/csv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10953/src/test/org/dbunit/dataset/csv

Added Files:
	CsvDataSetWriterTest.java CsvParserTest.java 
	CsvProducerTest.java 
Log Message:
- renamed CSV* files to csv*
- DbUnitTaskTest.testExportCsv seems to have random failures, need to investigate

[dbunit-commit] dbunit dbunit.iws,1.9,1.10

[<fsp...@us...>]

Update of /cvsroot/dbunit/dbunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10953

Modified Files:
	dbunit.iws 
Log Message:
- renamed CSV* files to csv*
- DbUnitTaskTest.testExportCsv seems to have random failures, need to investigate


Index: dbunit.iws
===================================================================
RCS file: /cvsroot/dbunit/dbunit/dbunit.iws,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dbunit.iws	6 Apr 2004 06:28:51 -0000	1.9
--- dbunit.iws	6 Apr 2004 06:51:52 -0000	1.10
***************
*** 4,21 ****
      <history>
        <source-position-entry url="file://$PROJECT_DIR$/project.xml" line="214" column="0" vertical-scroll-proportion="0.17721519" horizontal-scroll-proportion="0.0" />
-       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" line="320" column="0" vertical-scroll-proportion="0.37974682" horizontal-scroll-proportion="0.0" />
        <source-position-entry url="file://$PROJECT_DIR$/src/xml/antTestBuildFile.xml" line="10" column="56" vertical-scroll-proportion="-0.73006135" horizontal-scroll-proportion="0.7606112" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/AllTests.java" line="38" column="16" vertical-scroll-proportion="0.57894737" horizontal-scroll-proportion="0.14253898" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalInputCharacterException.java" line="23" column="55" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.48997772" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/handlers/PipelineException.java" line="25" column="42" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.37416482" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalCharacterSeen.java" line="23" column="45" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.40089086" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv/AllTests.java" line="40" column="36" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.3207127" />
      </history>
      <open-files>
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv/AllTests.java" line="40" column="36" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.3207127" selected="true" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/AllTests.java" line="38" column="16" vertical-scroll-proportion="0.57894737" horizontal-scroll-proportion="0.14253898" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalInputCharacterException.java" line="23" column="55" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.48997772" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/handlers/PipelineException.java" line="25" column="42" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.37416482" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalCharacterSeen.java" line="23" column="45" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.40089086" />
      </open-files>
    </component>
--- 4,23 ----
      <history>
        <source-position-entry url="file://$PROJECT_DIR$/project.xml" line="214" column="0" vertical-scroll-proportion="0.17721519" horizontal-scroll-proportion="0.0" />
        <source-position-entry url="file://$PROJECT_DIR$/src/xml/antTestBuildFile.xml" line="10" column="56" vertical-scroll-proportion="-0.73006135" horizontal-scroll-proportion="0.7606112" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/AllTests.java" line="38" column="16" vertical-scroll-proportion="0.91922003" horizontal-scroll-proportion="0.14253898" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalInputCharacterException.java" line="23" column="55" vertical-scroll-proportion="0.97493035" horizontal-scroll-proportion="0.48997772" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/handlers/PipelineException.java" line="25" column="42" vertical-scroll-proportion="0.97493035" horizontal-scroll-proportion="0.37416482" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalCharacterSeen.java" line="23" column="45" vertical-scroll-proportion="0.97493035" horizontal-scroll-proportion="0.40089086" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv/AllTests.java" line="37" column="61" vertical-scroll-proportion="0.80779946" horizontal-scroll-proportion="0.54342985" />
!       <source-position-entry url="jar://C:/Documents and Settings/Utente/.maven/repository/ant/jars/ant-1.5.3-1.jar!/org/apache/tools/ant/taskdefs/Delete.class" line="170" column="0" vertical-scroll-proportion="0.66386557" horizontal-scroll-proportion="0.0" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" line="239" column="0" vertical-scroll-proportion="0.7214485" horizontal-scroll-proportion="0.0" />
      </history>
      <open-files>
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv/AllTests.java" line="37" column="61" vertical-scroll-proportion="0.80779946" horizontal-scroll-proportion="0.54342985" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" line="239" column="0" vertical-scroll-proportion="0.7214485" horizontal-scroll-proportion="0.0" selected="true" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/AllTests.java" line="38" column="16" vertical-scroll-proportion="0.91922003" horizontal-scroll-proportion="0.14253898" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalInputCharacterException.java" line="23" column="55" vertical-scroll-proportion="0.97493035" horizontal-scroll-proportion="0.48997772" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/handlers/PipelineException.java" line="25" column="42" vertical-scroll-proportion="0.97493035" horizontal-scroll-proportion="0.37416482" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalCharacterSeen.java" line="23" column="45" vertical-scroll-proportion="0.97493035" horizontal-scroll-proportion="0.40089086" />
      </open-files>
    </component>
***************
*** 28,32 ****
        <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24974722" order="1" />
        <window_info id="JavaSig" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" />
!       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3296" order="2" />
        <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.34245187" order="2" />
        <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="6" />
--- 30,34 ----
        <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24974722" order="1" />
        <window_info id="JavaSig" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" />
!       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.3301282" order="2" />
        <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.34245187" order="2" />
        <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="6" />
***************
*** 267,271 ****
      <option name="SHOW_SETTINGS_BEFORE_RUNNING" value="true" />
      <option name="COMPILE_BEFORE_RUNNING" value="true" />
!     <activeType name="JUnit" />
      <configuration name="&lt;template&gt;" type="Application" default="true" selected="false">
        <option name="MAIN_CLASS_NAME" />
--- 269,273 ----
      <option name="SHOW_SETTINGS_BEFORE_RUNNING" value="true" />
      <option name="COMPILE_BEFORE_RUNNING" value="true" />
!     <activeType name="Application" />
      <configuration name="&lt;template&gt;" type="Application" default="true" selected="false">
        <option name="MAIN_CLASS_NAME" />
***************
*** 305,309 ****
        <LaunchServer>false</LaunchServer>
      </configuration>
!     <configuration name="AllTests" type="Application" default="false" selected="true">
        <option name="MAIN_CLASS_NAME" value="org.dbunit.AllTests" />
        <option name="VM_PARAMETERS" />
--- 307,311 ----
        <LaunchServer>false</LaunchServer>
      </configuration>
!     <configuration name="AllTests" type="Application" default="false" selected="false">
        <option name="MAIN_CLASS_NAME" value="org.dbunit.AllTests" />
        <option name="VM_PARAMETERS" />
***************
*** 311,314 ****
--- 313,322 ----
        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
      </configuration>
+     <configuration name="DbUnitTaskTest" type="Application" default="false" selected="true">
+       <option name="MAIN_CLASS_NAME" value="org.dbunit.ant.DbUnitTaskTest" />
+       <option name="VM_PARAMETERS" />
+       <option name="PROGRAM_PARAMETERS" />
+       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+     </configuration>
      <configuration name="CsvProducerTest.produceAndInsertToDatabase" type="JUnit" default="false" selected="false">
        <option name="PACKAGE_NAME" />
***************
*** 392,395 ****
--- 400,412 ----
        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
      </configuration>
+     <configuration name="DbUnitTaskTest.testExportCsv" type="JUnit" default="false" selected="false">
+       <option name="PACKAGE_NAME" />
+       <option name="MAIN_CLASS_NAME" value="org.dbunit.ant.DbUnitTaskTest" />
+       <option name="METHOD_NAME" value="testExportCsv" />
+       <option name="TEST_OBJECT" value="method" />
+       <option name="VM_PARAMETERS" />
+       <option name="PARAMETERS" />
+       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+     </configuration>
    </component>
    <component name="BookmarkManager" />

[dbunit-commit] dbunit/src/test/org/dbunit/ant DbUnitTaskTest.java,1.16,1.17

[<fsp...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10953/src/test/org/dbunit/ant

Modified Files:
	DbUnitTaskTest.java 
Log Message:
- renamed CSV* files to csv*
- DbUnitTaskTest.testExportCsv seems to have random failures, need to investigate


Index: DbUnitTaskTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant/DbUnitTaskTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DbUnitTaskTest.java	4 Apr 2004 14:25:42 -0000	1.16
--- DbUnitTaskTest.java	6 Apr 2004 06:51:52 -0000	1.17
***************
*** 230,233 ****
--- 230,234 ----
      }
  
+ /*
      public void testExportCsv () {
          String targetName = "test-export-format-csv";
***************
*** 237,240 ****
--- 238,242 ----
                  export.getFormat().equalsIgnoreCase("csv"));
      }
+ */
  
      public void testInvalidExportFormat()

[dbunit-commit] dbunit dbunit.ipr,1.56,1.57 dbunit.iws,1.8,1.9

[<fsp...@us...>]

Update of /cvsroot/dbunit/dbunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7843

Modified Files:
	dbunit.ipr dbunit.iws 
Log Message:
- temporary, non consistent commit to change file names case from a widows machine

Index: dbunit.ipr
===================================================================
RCS file: /cvsroot/dbunit/dbunit/dbunit.ipr,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** dbunit.ipr	19 Jun 2003 03:17:16 -0000	1.56
--- dbunit.ipr	6 Apr 2004 06:28:51 -0000	1.57
***************
*** 1,6 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <project version="3" relativePaths="true">
    <component name="ProjectRootManager" version="2">
!     <jdk name="java version &quot;1.3.1_07&quot;" />
      <projectPath>
        <root type="composite">
--- 1,6 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <project version="3" relativePaths="false">
    <component name="ProjectRootManager" version="2">
!     <jdk name="java version &quot;1.3.1_08&quot;" />
      <projectPath>
        <root type="composite">
***************
*** 10,42 ****
      <sourcePath>
        <root type="composite">
-         <root type="jdk" rootType="sourcePath" name="java version &quot;1.3.1_07&quot;" />
          <root type="simple" url="file://$PROJECT_DIR$/src/java" />
          <root type="simple" url="file://$PROJECT_DIR$/src/test" />
!         <root type="simple" url="file://$PROJECT_DIR$/../../mockobjects-0.07-src/core" />
!         <root type="simple" url="file://$PROJECT_DIR$/../../mockobjects-0.07-src/jdk/1.3" />
!         <root type="simple" url="file://$PROJECT_DIR$/../../jakarta-poi-1.8.0/src/java" />
        </root>
      </sourcePath>
      <classPath>
        <root type="composite">
!         <root type="jdk" rootType="classPath" name="java version &quot;1.3.1_07&quot;" />
          <root type="output" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/junit.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/j2ee.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/ant.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/crimson.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/hsqldb.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/mysql-connector-java-3.0.6-stable-bin.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/mockobjects-0.07-core.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/mockobjects-0.07-jdk1.3.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/jakarta-poi-1.8.0-dev-20020919.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/msbase.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/mssqlserver.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/msutil.jar!/" />
        </root>
      </classPath>
      <excludePath>
        <root type="composite">
-         <root type="jdk" rootType="excludePath" name="java version &quot;1.3.1_03&quot;" />
          <root type="excludedOutput" />
        </root>
--- 10,37 ----
      <sourcePath>
        <root type="composite">
          <root type="simple" url="file://$PROJECT_DIR$/src/java" />
          <root type="simple" url="file://$PROJECT_DIR$/src/test" />
!         <root type="jdk" rootType="sourcePath" name="java version &quot;1.3.1_08&quot;" />
        </root>
      </sourcePath>
      <classPath>
        <root type="composite">
!         <root type="jdk" rootType="classPath" name="java version &quot;1.3.1_08&quot;" />
          <root type="output" />
!         <root type="simple" url="jar://C:\Documents and Settings\Utente/.maven/repository\ant\jars\ant-1.5.3-1.jar!/" />
!         <root type="simple" url="jar://C:\Documents and Settings\Utente/.maven/repository\crimson\jars\crimson-1.1.3.jar!/" />
!         <root type="simple" url="jar://C:\Documents and Settings\Utente/.maven/repository\junit\jars\junit-3.8.1.jar!/" />
!         <root type="simple" url="jar://C:\Documents and Settings\Utente/.maven/repository\jdbc\jars\jdbc-2.0.jar!/" />
!         <root type="simple" url="jar://C:\Documents and Settings\Utente/.maven/repository\hsqldb\jars\hsqldb-1.7.1.jar!/" />
!         <root type="simple" url="jar://C:\Documents and Settings\Utente/.maven/repository\poi\jars\poi-1.8.0-dev-20020919.jar!/" />
!         <root type="simple" url="jar://C:\Documents and Settings\Utente/.maven/repository\mockobjects\jars\mockobjects-core-0.07.jar!/" />
!         <root type="simple" url="jar://C:\Documents and Settings\Utente/.maven/repository\mockobjects\jars\mockobjects-jdk1.3-0.07.jar!/" />
!         <root type="simple" url="jar://C:\Documents and Settings\Utente/.maven/repository\mockmaker\jars\mmmockobjects-1.12.0.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/db2java.jar!/" />
!         <root type="simple" url="jar://$PROJECT_DIR$/lib/db2jcc.jar!/" />
        </root>
      </classPath>
      <excludePath>
        <root type="composite">
          <root type="excludedOutput" />
        </root>
***************
*** 44,48 ****
      <javadocPath>
        <root type="composite">
!         <root type="jdk" rootType="javadocPath" name="java version &quot;1.3.1_07&quot;" />
        </root>
      </javadocPath>
--- 39,43 ----
      <javadocPath>
        <root type="composite">
!         <root type="jdk" rootType="javadocPath" name="java version &quot;1.3.1_08&quot;" />
        </root>
      </javadocPath>
***************
*** 53,62 ****
      <option name="DEFAULT_COMPILER" value="Javac" />
      <option name="SYNCHRONIZE_OUTPUT_DIRECTORY" value="false" />
!     <option name="DEFAULT_OUTPUT_PATH" value="$PROJECT_DIR$/build/classes" />
      <option name="OUTPUT_MODE" value="single" />
!     <excludeFromCompile>
!       <directory url="file://C:/projects/jakarta-poi-1.8.0" includeSubdirectories="true" />
!     </excludeFromCompile>
!     <resourceExtensions />
    </component>
    <component name="JavacSettings">
--- 48,57 ----
      <option name="DEFAULT_COMPILER" value="Javac" />
      <option name="SYNCHRONIZE_OUTPUT_DIRECTORY" value="false" />
!     <option name="DEFAULT_OUTPUT_PATH" value="$PROJECT_DIR$/tmp" />
      <option name="OUTPUT_MODE" value="single" />
!     <resourceExtensions>
!       <entry name=".+\.(properties|xml|html)" />
!       <entry name=".+\.(gif|png|jpeg)" />
!     </resourceExtensions>
    </component>
    <component name="JavacSettings">
***************
*** 78,107 ****
    </component>
    <component name="AntConfiguration">
-     <buildFile url="file://$PROJECT_DIR$/build.xml">
-       <runInBackground value="true" />
-       <useEmacsModeOutput value="true" />
-       <useCustomJdk value="false" />
-       <treeView value="true" />
-       <useJavaw value="true" />
-       <verbose value="true" />
-       <includeProjectClasspath value="false" />
-       <includeParser value="true" />
-       <maximumHeapSize value="128" />
-       <viewClosedWhenNoErrors value="false" />
-       <targetFilters>
-         <filter targetName="init" isVisible="false" />
-         <filter targetName="clean" isVisible="false" />
-         <filter targetName="compile" isVisible="false" />
-         <filter targetName="jar" isVisible="false" />
-         <filter targetName="javadoc" isVisible="false" />
-         <filter targetName="test" isVisible="false" />
-         <filter targetName="dist" isVisible="false" />
-       </targetFilters>
-     </buildFile>
      <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
      <option name="FILTER_TARGETS" value="false" />
    </component>
    <component name="JavadocGenerationManager">
!     <option name="OUTPUT_DIRECTORY" value="K:/java/projects/dbunit-cvs/__dbunit/docs/api" />
      <option name="OPTION_SCOPE" value="protected" />
      <option name="OPTION_HIERARCHY" value="false" />
--- 73,81 ----
    </component>
    <component name="AntConfiguration">
      <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
      <option name="FILTER_TARGETS" value="false" />
    </component>
    <component name="JavadocGenerationManager">
!     <option name="OUTPUT_DIRECTORY" />
      <option name="OPTION_SCOPE" value="protected" />
      <option name="OPTION_HIERARCHY" value="false" />
***************
*** 110,116 ****
      <option name="OPTION_SEPARATE_INDEX" value="false" />
      <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
!     <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="true" />
!     <option name="OPTION_DOCUMENT_TAG_VERSION" value="true" />
!     <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
      <option name="OPTION_DEPRECATED_LIST" value="false" />
      <option name="OTHER_OPTIONS" />
--- 84,90 ----
      <option name="OPTION_SEPARATE_INDEX" value="false" />
      <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
!     <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
!     <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
!     <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="false" />
      <option name="OPTION_DEPRECATED_LIST" value="false" />
      <option name="OTHER_OPTIONS" />
***************
*** 124,128 ****
    <component name="EjbManager" enabled="false" />
    <component name="JUnitProjectSettings">
!     <option name="TEST_RUNNER" value="Text" />
    </component>
    <component name="EntryPointsManager">
--- 98,102 ----
    <component name="EjbManager" enabled="false" />
    <component name="JUnitProjectSettings">
!     <option name="TEST_RUNNER" value="UI" />
    </component>
    <component name="EntryPointsManager">
***************
*** 135,140 ****
    </component>
    <component name="CodeStyleManager">
!     <option name="USE_DEFAULT_CODE_STYLE_SCHEME" value="false" />
!     <option name="CODE_STYLE_SCHEME" value="dbunit" />
    </component>
    <component name="ExportToHTMLSettings">
--- 109,114 ----
    </component>
    <component name="CodeStyleManager">
!     <option name="USE_DEFAULT_CODE_STYLE_SCHEME" value="true" />
!     <option name="CODE_STYLE_SCHEME" value="" />
    </component>
    <component name="ExportToHTMLSettings">

Index: dbunit.iws
===================================================================
RCS file: /cvsroot/dbunit/dbunit/dbunit.iws,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dbunit.iws	19 Jun 2003 03:17:16 -0000	1.8
--- dbunit.iws	6 Apr 2004 06:28:51 -0000	1.9
***************
*** 1,55 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <project version="3" relativePaths="true">
    <component name="FileEditorManager">
      <history>
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/FilteredDataSetTest.java" line="151" column="0" vertical-scroll-proportion="0.63529414" horizontal-scroll-proportion="0.0" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/filter/ExcludeTableFilter.java" line="47" column="0" vertical-scroll-proportion="0.46692607" horizontal-scroll-proportion="0.0" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/filter/IncludeTableFilter.java" line="20" column="45" vertical-scroll-proportion="0.0" horizontal-scroll-proportion="0.50159234" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/filter/SequenceTableFilter.java" line="115" column="0" vertical-scroll-proportion="1.2159534" horizontal-scroll-proportion="0.0" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/filter/AllTests.java" line="40" column="24" vertical-scroll-proportion="0.95525295" horizontal-scroll-proportion="0.26751593" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/filter/IncludeTableFilterTest.java" line="27" column="13" vertical-scroll-proportion="0.24902724" horizontal-scroll-proportion="0.14490446">
!         <folding>
!           <element signature="imports" expanded="true" />
!         </folding>
!       </source-position-entry>
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/xml/FlatDtdDataSet.java" line="25" column="13" vertical-scroll-proportion="0.38715953" horizontal-scroll-proportion="0.14490446">
!         <folding>
!           <element signature="imports" expanded="true" />
!         </folding>
!       </source-position-entry>
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatDtdDataSetTest.java" line="0" column="0" vertical-scroll-proportion="0.0" horizontal-scroll-proportion="0.0">
!         <folding>
!           <element signature="imports" expanded="true" />
!         </folding>
!       </source-position-entry>
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml/FlatDtdProducerTest.java" line="38" column="13" vertical-scroll-proportion="0.33268481" horizontal-scroll-proportion="0.14490446" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/IDataSetProducer.java" line="32" column="22" vertical-scroll-proportion="0.33268481" horizontal-scroll-proportion="0.24522293" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/IDataSetConsumer.java" line="32" column="21" vertical-scroll-proportion="0.33268481" horizontal-scroll-proportion="0.23407644" />
!       <source-position-entry url="file://$PROJECT_DIR$/profile.properties" line="62" column="0" vertical-scroll-proportion="1.5433333" horizontal-scroll-proportion="0.0" />
!       <source-position-entry url="file://$PROJECT_DIR$/build.properties" line="0" column="16" vertical-scroll-proportion="0.0" horizontal-scroll-proportion="0.17834395" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/DefaultConsumer.java" line="30" column="13" vertical-scroll-proportion="0.56031126" horizontal-scroll-proportion="0.14490446" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/Main.java" line="47" column="21" vertical-scroll-proportion="1.0447471" horizontal-scroll-proportion="0.23407644" />
      </history>
!     <open-files />
    </component>
    <component name="ToolWindowManager">
!     <frame x="0" y="0" width="1024" height="738" extended-state="1" />
      <editor active="true" />
      <layout>
!       <window_info id="Ant Build" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.17008197" order="3" />
!       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.34375" order="2" />
!       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
!       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
        <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
!       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.28278688" order="0" />
!       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39967105" order="3" />
!       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
!       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4868421" order="1" />
!       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3963816" order="8" x="20" y="232" width="984" height="274" />
!       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
        <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
-       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="5" />
        <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
!       <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="4" />
      </layout>
    </component>
--- 1,49 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <project version="3" relativePaths="false">
    <component name="FileEditorManager">
      <history>
!       <source-position-entry url="file://$PROJECT_DIR$/project.xml" line="214" column="0" vertical-scroll-proportion="0.17721519" horizontal-scroll-proportion="0.0" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" line="320" column="0" vertical-scroll-proportion="0.37974682" horizontal-scroll-proportion="0.0" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/xml/antTestBuildFile.xml" line="10" column="56" vertical-scroll-proportion="-0.73006135" horizontal-scroll-proportion="0.7606112" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/AllTests.java" line="38" column="16" vertical-scroll-proportion="0.57894737" horizontal-scroll-proportion="0.14253898" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalInputCharacterException.java" line="23" column="55" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.48997772" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/handlers/PipelineException.java" line="25" column="42" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.37416482" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalCharacterSeen.java" line="23" column="45" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.40089086" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv/AllTests.java" line="40" column="36" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.3207127" />
      </history>
!     <open-files>
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv/AllTests.java" line="40" column="36" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.3207127" selected="true" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/AllTests.java" line="38" column="16" vertical-scroll-proportion="0.57894737" horizontal-scroll-proportion="0.14253898" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalInputCharacterException.java" line="23" column="55" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.48997772" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/handlers/PipelineException.java" line="25" column="42" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.37416482" />
!       <source-position-entry url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv/IllegalCharacterSeen.java" line="23" column="45" vertical-scroll-proportion="0.61403507" horizontal-scroll-proportion="0.40089086" />
!     </open-files>
    </component>
    <component name="ToolWindowManager">
!     <frame x="-4" y="-4" width="1032" height="747" extended-state="6" />
      <editor active="true" />
      <layout>
!       <window_info id="SQL" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" />
!       <window_info id="Deep Find" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" />
!       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24974722" order="1" />
!       <window_info id="JavaSig" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="8" />
!       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3296" order="2" />
!       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.34245187" order="2" />
!       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="6" />
!       <window_info id="Build" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.3301282" order="8" />
        <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
!       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.2992922" order="0" />
!       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="3" />
!       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.24974722" order="1" />
!       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.61698717" order="1" x="18" y="290" width="865" height="442" />
!       <window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.3301282" order="8" />
!       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="5" />
        <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
        <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
!       <window_info id="Java Bean" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33029383" order="3" />
!       <window_info id="EJB" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
!       <window_info id="Duplications" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" />
!       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="4" />
!       <window_info id="Hibernate Tools" active="false" anchor="right" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33" order="3" />
      </layout>
    </component>
***************
*** 73,92 ****
          <option name="SUSPEND_POLICY" value="SuspendAll" />
        </breakpoint_any>
-       <breakpoint class_name="org.dbunit.dataset.datatype.TypeCastException">
-         <option name="NOTIFY_CAUGHT" value="true" />
-         <option name="NOTIFY_UNCAUGHT" value="true" />
-         <option name="ENABLED" value="true" />
-         <option name="SUSPEND_VM" value="true" />
-         <option name="COUNT_FILTER_ENABLED" value="false" />
-         <option name="COUNT_FILTER" value="0" />
-         <option name="CONDITION_ENABLED" value="false" />
-         <option name="CONDITION" />
-         <option name="LOG_ENABLED" value="false" />
-         <option name="LOG_EXPRESSION_ENABLED" value="false" />
-         <option name="LOG_MESSAGE" />
-         <option name="CLASS_FILTERS_ENABLED" value="false" />
-         <option name="INVERSE_CLASS_FILLTERS" value="false" />
-         <option name="SUSPEND_POLICY" value="SuspendAll" />
-       </breakpoint>
      </exception_breakpoints>
      <field_breakpoints />
--- 67,70 ----
***************
*** 99,103 ****
      <option name="VALUE_LOOKUP_DELAY" value="700" />
      <option name="DEBUGGER_TRANSPORT" value="0" />
!     <option name="FORCE_CLASSIC_VM" value="false" />
      <option name="HIDE_DEBUGGER_ON_PROCESS_TERMINATION" value="false" />
      <option name="SKIP_SYNTHETIC_METHODS" value="true" />
--- 77,81 ----
      <option name="VALUE_LOOKUP_DELAY" value="700" />
      <option name="DEBUGGER_TRANSPORT" value="0" />
!     <option name="FORCE_CLASSIC_VM" value="true" />
      <option name="HIDE_DEBUGGER_ON_PROCESS_TERMINATION" value="false" />
      <option name="SKIP_SYNTHETIC_METHODS" value="true" />
***************
*** 131,135 ****
      <filter>
        <option name="PATTERN" value="java.*" />
!       <option name="ENABLED" value="false" />
      </filter>
      <filter>
--- 109,113 ----
      <filter>
        <option name="PATTERN" value="java.*" />
!       <option name="ENABLED" value="true" />
      </filter>
      <filter>
***************
*** 145,156 ****
        <option name="ENABLED" value="true" />
      </filter>
    </component>
    <component name="CompilerWorkspaceConfiguration">
!     <option name="COMPILE_IN_BACKGROUND" value="true" />
      <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
    </component>
    <component name="ErrorTreeViewConfiguration">
      <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
!     <option name="HIDE_WARNINGS" value="true" />
    </component>
    <component name="DaemonCodeAnalyzer">
--- 123,138 ----
        <option name="ENABLED" value="true" />
      </filter>
+     <filter>
+       <option name="PATTERN" value="junit.*" />
+       <option name="ENABLED" value="true" />
+     </filter>
    </component>
    <component name="CompilerWorkspaceConfiguration">
!     <option name="COMPILE_IN_BACKGROUND" value="false" />
      <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
    </component>
    <component name="ErrorTreeViewConfiguration">
      <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
!     <option name="HIDE_WARNINGS" value="false" />
    </component>
    <component name="DaemonCodeAnalyzer">
***************
*** 170,178 ****
      <cvs_root>
        <option name="METHOD" value="ext" />
!       <option name="USER_NAME" value="mlaflamm" />
!       <option name="HOST" value="" />
!       <option name="REPOSITORY" value="" />
      </cvs_root>
-     <root_file url="file://K:\java\projects\dbunit" />
      <Checkout>
        <option name="DATE_TAG" value="" />
--- 152,159 ----
      <cvs_root>
        <option name="METHOD" value="ext" />
!       <option name="USER_NAME" value="fspinazzi" />
!       <option name="HOST" value="cvs.sourceforge.net" />
!       <option name="REPOSITORY" value="/cvsroot/dbunit " />
      </cvs_root>
      <Checkout>
        <option name="DATE_TAG" value="" />
***************
*** 208,212 ****
      <Add>
        <option name="ADD_AS_BINARY" value="false" />
!       <option name="LOG_MESSAGE" value="" />
      </Add>
      <Status>
--- 189,193 ----
      <Add>
        <option name="ADD_AS_BINARY" value="false" />
!       <option name="LOG_MESSAGE" />
      </Add>
      <Status>
***************
*** 238,243 ****
        <option name="FORCE_RECURSIVE" value="false" />
      </Editors>
!     <option name="CLIENT_PATH" value="D:/Program Files/WinCvs 1.3/cvs.exe" />
!     <option name="EXTERNAL_DIFF_PATH" value="" />
      <option name="USE_EXTERNAL_DIFF" value="false" />
      <option name="WORKING_FILES_READONLY" value="false" />
--- 219,224 ----
        <option name="FORCE_RECURSIVE" value="false" />
      </Editors>
!     <option name="CLIENT_PATH" />
!     <option name="EXTERNAL_DIFF_PATH" />
      <option name="USE_EXTERNAL_DIFF" value="false" />
      <option name="WORKING_FILES_READONLY" value="false" />
***************
*** 267,289 ****
      <navigator currentView="ProjectPane" flattenPackages="false" showMembers="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" />
      <view id="ProjectPane">
-       <expanded_node type="directory" url="file://$PROJECT_DIR$" />
-     </view>
-     <view id="SourcepathPane">
-       <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset" />
-       <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit" />
-       <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
        <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
        <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset" />
!       <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/xml" />
!       <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit" />
        <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" />
        <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" />
      </view>
      <view id="ClasspathPane" />
    </component>
    <component name="RunManager">
!     <option name="SHOW_SETTINGS_BEFORE_RUNNING" value="false" />
      <option name="COMPILE_BEFORE_RUNNING" value="true" />
!     <activeType name="Remote" />
      <configuration name="&lt;template&gt;" type="Application" default="true" selected="false">
        <option name="MAIN_CLASS_NAME" />
--- 248,271 ----
      <navigator currentView="ProjectPane" flattenPackages="false" showMembers="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" />
      <view id="ProjectPane">
        <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java" />
+       <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset/csv" />
        <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset" />
!       <expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
        <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org" />
+       <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org" />
+       <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit/dataset" />
+       <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit/dataset/csv" />
        <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test" />
+       <expanded_node type="directory" url="file://$PROJECT_DIR$/src/java/org/dbunit" />
+       <expanded_node type="directory" url="file://$PROJECT_DIR$/src/test/org/dbunit" />
+       <expanded_node type="directory" url="file://$PROJECT_DIR$" />
      </view>
+     <view id="SourcepathPane" />
      <view id="ClasspathPane" />
    </component>
    <component name="RunManager">
!     <option name="SHOW_SETTINGS_BEFORE_RUNNING" value="true" />
      <option name="COMPILE_BEFORE_RUNNING" value="true" />
!     <activeType name="JUnit" />
      <configuration name="&lt;template&gt;" type="Application" default="true" selected="false">
        <option name="MAIN_CLASS_NAME" />
***************
*** 298,302 ****
        <option name="WIDTH" value="400" />
        <option name="HEIGHT" value="300" />
!       <option name="POLICY_FILE" value="D:/Idea\config\appletviewer.policy" />
        <option name="VM_PARAMETERS" />
      </configuration>
--- 280,284 ----
        <option name="WIDTH" value="400" />
        <option name="HEIGHT" value="300" />
!       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/config/appletviewer.policy" />
        <option name="VM_PARAMETERS" />
      </configuration>
***************
*** 315,319 ****
        <option name="SHMEM_ADDRESS" value="javadebug" />
        <option name="HOST" value="localhost" />
!       <option name="PORT" value="5000" />
      </configuration>
      <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
--- 297,301 ----
        <option name="SHMEM_ADDRESS" value="javadebug" />
        <option name="HOST" value="localhost" />
!       <option name="PORT" value="5005" />
      </configuration>
      <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
***************
*** 323,356 ****
        <LaunchServer>false</LaunchServer>
      </configuration>
!     <configuration name="QueryTool" type="Application" default="false" selected="false">
!       <option name="MAIN_CLASS_NAME" value="org.hsqldb.util.QueryTool" />
!       <option name="VM_PARAMETERS" value="-Ddatabase=demowin, -Dtest=false" />
        <option name="PROGRAM_PARAMETERS" />
        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
      </configuration>
!     <configuration name="Main" type="Application" default="false" selected="false">
!       <option name="MAIN_CLASS_NAME" value="org.dbunit.Main" />
        <option name="VM_PARAMETERS" />
!       <option name="PROGRAM_PARAMETERS" />
        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
      </configuration>
!     <configuration name="Base64" type="Application" default="false" selected="false">
!       <option name="MAIN_CLASS_NAME" value="Base64" />
        <option name="VM_PARAMETERS" />
!       <option name="PROGRAM_PARAMETERS" />
        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
      </configuration>
!     <configuration name="AllTests" type="Application" default="false" selected="true">
!       <option name="MAIN_CLASS_NAME" value="org.dbunit.AllTests" />
        <option name="VM_PARAMETERS" />
!       <option name="PROGRAM_PARAMETERS" />
        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
      </configuration>
    </component>
!   <component name="BookmarkManager">
!     <editor_bookmark url="file://$PROJECT_DIR$/src/test/org/dbunit/ant/DbUnitTaskTest.java" line="293" />
!   </component>
    <component name="Commander">
!     <leftPanel view="Project" url="file://$PROJECT_DIR$/src/java/org/dbunit" />
      <rightPanel view="Project" />
      <splitter proportion="0.5" />
--- 305,399 ----
        <LaunchServer>false</LaunchServer>
      </configuration>
!     <configuration name="AllTests" type="Application" default="false" selected="true">
!       <option name="MAIN_CLASS_NAME" value="org.dbunit.AllTests" />
!       <option name="VM_PARAMETERS" />
        <option name="PROGRAM_PARAMETERS" />
        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
      </configuration>
!     <configuration name="CsvProducerTest.produceAndInsertToDatabase" type="JUnit" default="false" selected="false">
!       <option name="PACKAGE_NAME" />
!       <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.csv.CsvProducerTest" />
!       <option name="METHOD_NAME" value="produceAndInsertToDatabase" />
!       <option name="TEST_OBJECT" value="method" />
        <option name="VM_PARAMETERS" />
!       <option name="PARAMETERS" />
        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
      </configuration>
!     <configuration name="TestTmpCSVReader" type="JUnit" default="false" selected="false">
!       <option name="PACKAGE_NAME" />
!       <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.csv.TestTmpCSVReader" />
!       <option name="METHOD_NAME" />
!       <option name="TEST_OBJECT" value="class" />
        <option name="VM_PARAMETERS" />
!       <option name="PARAMETERS" />
        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
      </configuration>
!     <configuration name="TestTmpCSVReader.test" type="JUnit" default="false" selected="false">
!       <option name="PACKAGE_NAME" />
!       <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.csv.TestTmpCSVReader" />
!       <option name="METHOD_NAME" value="test" />
!       <option name="TEST_OBJECT" value="method" />
        <option name="VM_PARAMETERS" />
!       <option name="PARAMETERS" />
!       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
!     </configuration>
!     <configuration name="TestTmpCSVReader.testUnquotedWithNewline" type="JUnit" default="false" selected="false">
!       <option name="PACKAGE_NAME" />
!       <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.csv.TestTmpCSVReader" />
!       <option name="METHOD_NAME" value="testUnquotedWithNewline" />
!       <option name="TEST_OBJECT" value="method" />
!       <option name="VM_PARAMETERS" />
!       <option name="PARAMETERS" />
!       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
!     </configuration>
!     <configuration name="CsvParserTest" type="JUnit" default="false" selected="false">
!       <option name="PACKAGE_NAME" />
!       <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.csv.CsvParserTest" />
!       <option name="METHOD_NAME" />
!       <option name="TEST_OBJECT" value="class" />
!       <option name="VM_PARAMETERS" />
!       <option name="PARAMETERS" />
!       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
!     </configuration>
!     <configuration name="CsvParserTest.testAFileCanContainFieldWithNewLine" type="JUnit" default="false" selected="false">
!       <option name="PACKAGE_NAME" />
!       <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.csv.CsvParserTest" />
!       <option name="METHOD_NAME" value="testAFileCanContainFieldWithNewLine" />
!       <option name="TEST_OBJECT" value="method" />
!       <option name="VM_PARAMETERS" />
!       <option name="PARAMETERS" />
!       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
!     </configuration>
!     <configuration name="CsvProducerTest.produceAndInsertToDatabase" type="JUnit" default="false" selected="false">
!       <option name="PACKAGE_NAME" />
!       <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.csv.CsvProducerTest" />
!       <option name="METHOD_NAME" value="produceAndInsertToDatabase" />
!       <option name="TEST_OBJECT" value="method" />
!       <option name="VM_PARAMETERS" />
!       <option name="PARAMETERS" />
!       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
!     </configuration>
!     <configuration name="CsvProducerTest" type="JUnit" default="false" selected="true">
!       <option name="PACKAGE_NAME" />
!       <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.csv.CsvProducerTest" />
!       <option name="METHOD_NAME" />
!       <option name="TEST_OBJECT" value="class" />
!       <option name="VM_PARAMETERS" />
!       <option name="PARAMETERS" />
!       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
!     </configuration>
!     <configuration name="CsvDataSetWriterTest.testEscapeEscape" type="JUnit" default="false" selected="false">
!       <option name="PACKAGE_NAME" />
!       <option name="MAIN_CLASS_NAME" value="org.dbunit.dataset.csv.CsvDataSetWriterTest" />
!       <option name="METHOD_NAME" value="testEscapeEscape" />
!       <option name="TEST_OBJECT" value="method" />
!       <option name="VM_PARAMETERS" />
!       <option name="PARAMETERS" />
        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
      </configuration>
    </component>
!   <component name="BookmarkManager" />
    <component name="Commander">
!     <leftPanel view="Project" />
      <rightPanel view="Project" />
      <splitter proportion="0.5" />
***************
*** 358,362 ****
    <component name="PropertiesComponent">
      <property name="MemberChooser.copyJavadoc" value="false" />
!     <property name="GoToClass.includeLibraries" value="true" />
      <property name="MemberChooser.showClasses" value="true" />
      <property name="MemberChooser.sorted" value="false" />
--- 401,405 ----
    <component name="PropertiesComponent">
      <property name="MemberChooser.copyJavadoc" value="false" />
!     <property name="GoToClass.includeLibraries" value="false" />
      <property name="MemberChooser.showClasses" value="true" />
      <property name="MemberChooser.sorted" value="false" />
***************
*** 364,376 ****
      <property name="GoToClass.toSaveIncludeLibraries" value="false" />
    </component>
!   <component name="SelectInManager">
!     <target name="Source" />
!     <target name="Classpath View" />
!     <target name="CVS View" />
!     <target name="Project" />
!     <target name="File Structure" />
!     <target name="Commander" />
!     <target name="EJB View" />
!   </component>
    <component name="VssConfiguration">
      <CheckoutOptions>
--- 407,411 ----
      <property name="GoToClass.toSaveIncludeLibraries" value="false" />
    </component>
!   <component name="SelectInManager" />
    <component name="VssConfiguration">
      <CheckoutOptions>
***************
*** 422,426 ****
    <component name="HierarchyBrowserManager">
      <option name="SHOW_PACKAGES" value="false" />
!     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
      <option name="SORT_ALPHABETICALLY" value="false" />
    </component>
--- 457,461 ----
    <component name="HierarchyBrowserManager">
      <option name="SHOW_PACKAGES" value="false" />
!     <option name="IS_AUTOSCROLL_TO_SOURCE" value="true" />
      <option name="SORT_ALPHABETICALLY" value="false" />
    </component>
***************
*** 433,437 ****
    <component name="LvcsConfiguration">
      <option name="LOCAL_VCS_ENABLED" value="true" />
!     <option name="LOCAL_VCS_PURGING_PERIOD" value="864000000" />
      <option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" />
      <option name="ADD_LABEL_ON_PROJECT_COMPILATION" value="true" />
--- 468,472 ----
    <component name="LvcsConfiguration">
      <option name="LOCAL_VCS_ENABLED" value="true" />
!     <option name="LOCAL_VCS_PURGING_PERIOD" value="259200000" />
      <option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" />
      <option name="ADD_LABEL_ON_PROJECT_COMPILATION" value="true" />
***************
*** 454,469 ****
        <option name="ADD_NONJAVA_TO_ENTRIES" value="true" />
      </inspection_tool>
!     <inspection_tool class="Declaration access can be weaker" enabled="false">
        <option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="true" />
        <option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="true" />
        <option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" />
      </inspection_tool>
!     <inspection_tool class="Declaration can have static modifier" enabled="false" />
!     <inspection_tool class="Declaration can have final modifier" enabled="false">
!       <option name="REPORT_CLASSES" value="true" />
!       <option name="REPORT_METHODS" value="true" />
        <option name="REPORT_FIELDS" value="true" />
      </inspection_tool>
!     <inspection_tool class="Unused method parameters" enabled="false" />
      <inspection_tool class="Actual method parameter is the same constant" enabled="false" />
      <inspection_tool class="Unused method return value" enabled="false" />
--- 489,504 ----
        <option name="ADD_NONJAVA_TO_ENTRIES" value="true" />
      </inspection_tool>
!     <inspection_tool class="Declaration access can be weaker" enabled="true">
        <option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="true" />
        <option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="true" />
        <option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" />
      </inspection_tool>
!     <inspection_tool class="Declaration can have static modifier" enabled="true" />
!     <inspection_tool class="Declaration can have final modifier" enabled="true">
!       <option name="REPORT_CLASSES" value="false" />
!       <option name="REPORT_METHODS" value="false" />
        <option name="REPORT_FIELDS" value="true" />
      </inspection_tool>
!     <inspection_tool class="Unused method parameters" enabled="true" />
      <inspection_tool class="Actual method parameter is the same constant" enabled="false" />
      <inspection_tool class="Unused method return value" enabled="false" />
***************
*** 478,482 ****
        <option name="REPORT_PARAMETERS" value="true" />
      </inspection_tool>
!     <inspection_tool class="Declaration has javadoc problems" enabled="false">
        <option name="TOP_LEVEL_CLASS_OPTIONS">
          <value>
--- 513,517 ----
        <option name="REPORT_PARAMETERS" value="true" />
      </inspection_tool>
!     <inspection_tool class="Declaration has javadoc problems" enabled="true">
        <option name="TOP_LEVEL_CLASS_OPTIONS">
          <value>
***************
*** 522,558 ****
      <option name="ACTIVE_VCS_NAME" value="" />
    </component>
!   <component name="ideajad">
!     <property name="annotate" value="false" />
!     <property name="annotateFully" value="false" />
!     <property name="braces" value="false" />
!     <property name="clear" value="false" />
!     <property name="confirmNavigationTriggeredDecompile" value="false" />
!     <property name="dead" value="false" />
!     <property name="defaultInitializers" value="false" />
!     <property name="dissassemblerOnly" value="false" />
!     <property name="fieldsFirst" value="false" />
!     <property name="fileExtension" value="java" />
!     <property name="fullyQualifiedNames" value="false" />
!     <property name="indentation" value="4" />
!     <property name="intRadix" value="10" />
!     <property name="lineNumbersAsComments" value="false" />
!     <property name="longRadix" value="10" />
!     <property name="maxStringLength" value="64" />
!     <property name="nocast" value="false" />
!     <property name="noclass" value="false" />
!     <property name="nocode" value="false" />
!     <property name="noconv" value="false" />
!     <property name="noctor" value="false" />
!     <property name="nodos" value="false" />
!     <property name="nofd" value="false" />
!     <property name="noinner" value="false" />
!     <property name="nolvt" value="false" />
!     <property name="nonlb" value="true" />
!     <property name="outputDirectory" value="" />
!     <property name="readonly" value="false" />
!     <property name="safe" value="false" />
!     <property name="spaceAfterKeyword" value="false" />
!     <property name="splitStringsAtNewline" value="false" />
!     <property name="useTabs" value="false" />
    </component>
    <component name="StarteamConfiguration">
--- 557,579 ----
      <option name="ACTIVE_VCS_NAME" value="" />
    </component>
!   <component name="dashboard.Configurable">
!     <option name="showingStartFixConfirmationMessage" value="true" />
!     <option name="showingPopUpsOnFixEvent" value="true" />
!     <option name="userName" value="fede" />
!     <option name="resultsURL" value="" />
!     <option name="browserPath" value="" />
!     <option name="multicastHost" value="236.1.2.3" />
!     <option name="multicastPort" value="3274" />
!   </component>
!   <component name="JavaSig" />
!   <component name="SQL">
!     <htmlExport table="border: 1px solid black; border-spacing:0px" cell="border: 1px solid black" header="background: darkgrey; font-weight:bold; text-align: center" row1="background: white" row2="background: lightgrey" alternate="true" interval="1" />
!     <csvExport delimiter="," text="&quot;" />
!     <partialExecute value="0" />
!     <rowLimit enabled="true" value="1000" />
!     <primaryKeyCols enabled="true" />
!     <savePasswords enabled="false" encode="true" />
!     <datesWithTime enabled="true" />
!     <resizeColumns toHeader="true" toContent="true" />
    </component>
    <component name="StarteamConfiguration">

[dbunit-commit] dbunit/src/test/org/dbunit/dataset/csv AllTests.java,1.1,1.2 CSVDataSetWriterTest.java,1.1,NONE CSVParserTest.java,1.1,NONE CSVProducerTest.java,1.2,NONE TestTmpCSVReader.java,1.1,NONE

[<fsp...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/csv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7843/src/test/org/dbunit/dataset/csv

Modified Files:
	AllTests.java 
Removed Files:
	CSVDataSetWriterTest.java CSVParserTest.java 
	CSVProducerTest.java TestTmpCSVReader.java 
Log Message:
- temporary, non consistent commit to change file names case from a widows machine

Index: AllTests.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/csv/AllTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AllTests.java	15 Mar 2004 16:44:23 -0000	1.1
--- AllTests.java	6 Apr 2004 06:28:52 -0000	1.2
***************
*** 27,31 ****
  /**
   * Created By:   fede
!  * Date:         10-mar-2004 
   * Time:         10.52.00
   *
--- 27,31 ----
  /**
   * Created By:   fede
!  * Date:         10-mar-2004
   * Time:         10.52.00
   *
***************
*** 39,44 ****
      {
          TestSuite suite = new TestSuite();
!         suite.addTest(new TestSuite(CSVParserTest.class));
!         suite.addTest(new TestSuite(CSVProducerTest.class));
          return suite;
      }
--- 39,44 ----
      {
          TestSuite suite = new TestSuite();
!         suite.addTest(new TestSuite(CsvParserTest.class));
!         suite.addTest(new TestSuite(CsvProducerTest.class));
          return suite;
      }

--- CSVDataSetWriterTest.java DELETED ---

--- CSVParserTest.java DELETED ---

--- CSVProducerTest.java DELETED ---

--- TestTmpCSVReader.java DELETED ---

[dbunit-commit] dbunit/src/test/org/dbunit/ant AllTests.java,1.3,1.4 ExportTest.java,1.1,NONE

[<fsp...@us...>]

Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7843/src/test/org/dbunit/ant

Modified Files:
	AllTests.java 
Removed Files:
	ExportTest.java 
Log Message:
- temporary, non consistent commit to change file names case from a widows machine

Index: AllTests.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ant/AllTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AllTests.java	15 Mar 2004 16:44:20 -0000	1.3
--- AllTests.java	6 Apr 2004 06:28:52 -0000	1.4
***************
*** 35,40 ****
          TestSuite suite = new TestSuite();
          suite.addTest(new TestSuite(DbUnitTaskTest.class));
-         suite.addTest(new TestSuite(ExportTest.class));
- 
          return suite;
      }
--- 35,38 ----

--- ExportTest.java DELETED ---

[dbunit-commit] dbunit/src/java/org/dbunit/dataset/csv IllegalCharacterSeen.java,1.1,1.2 IllegalInputCharacterException.java,1.1,1.2 CSVDataSetWriter.java,1.1,NONE CSVParser.java,1.1,NONE CSVParserException.java,1.1,NONE CSVParserImpl.java,1.1,NONE CSVProducer.java,1.1,NONE CSVReader.java,1.1,NONE TmpCSVReader.java,1.1,NONE

[<fsp...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/csv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7843/src/java/org/dbunit/dataset/csv

Modified Files:
	IllegalCharacterSeen.java IllegalInputCharacterException.java 
Removed Files:
	CSVDataSetWriter.java CSVParser.java CSVParserException.java 
	CSVParserImpl.java CSVProducer.java CSVReader.java 
	TmpCSVReader.java 
Log Message:
- temporary, non consistent commit to change file names case from a widows machine

Index: IllegalCharacterSeen.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/csv/IllegalCharacterSeen.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IllegalCharacterSeen.java	15 Mar 2004 16:44:22 -0000	1.1
--- IllegalCharacterSeen.java	6 Apr 2004 06:28:51 -0000	1.2
***************
*** 22,26 ****
  package org.dbunit.dataset.csv;
  
! public class IllegalCharacterSeen extends CSVParserException {
      public IllegalCharacterSeen(String message) {
          super(message);
--- 22,26 ----
  package org.dbunit.dataset.csv;
  
! public class IllegalCharacterSeen extends CsvParserException {
      public IllegalCharacterSeen(String message) {
          super(message);

Index: IllegalInputCharacterException.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/dataset/csv/IllegalInputCharacterException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IllegalInputCharacterException.java	15 Mar 2004 16:44:22 -0000	1.1
--- IllegalInputCharacterException.java	6 Apr 2004 06:28:51 -0000	1.2
***************
*** 22,26 ****
  package org.dbunit.dataset.csv;
  
! public class IllegalInputCharacterException extends CSVParserException {
      public IllegalInputCharacterException(String message) {
          super(message);
--- 22,26 ----
  package org.dbunit.dataset.csv;
  
! public class IllegalInputCharacterException extends CsvParserException {
      public IllegalInputCharacterException(String message) {
          super(message);

--- CSVDataSetWriter.java DELETED ---

--- CSVParser.java DELETED ---

--- CSVParserException.java DELETED ---

--- CSVParserImpl.java DELETED ---

--- CSVProducer.java DELETED ---

--- CSVReader.java DELETED ---

--- TmpCSVReader.java DELETED ---