svn commit: r1454860 [1/2] - in /commons/proper/dbutils/branches/2_0/src: main/java/org/apache/commons/dbutils/ main/java/org/apache/commons/dbutils/handlers/ main/java/org/apache/commons/dbutils/wrappers/ main/java/org/apache/commons/dbutils2/ main/ja...

[ws...@apache.org]

Author: wspeirs
Date: Sun Mar 10 14:54:34 2013
New Revision: 1454860

URL: http://svn.apache.org/r1454860
Log:
Changed the package names so dbutils and dbutils2 won't conflict if both loaded

Added:
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/AbstractExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AsyncExecutor.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/AsyncExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BasicRowProcessor.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BasicRowProcessor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BatchExecutor.java
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BatchExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BeanProcessor.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/DbUtils.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/DbUtils.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/GenerousBeanProcessor.java
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/GenerousBeanProcessor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/InsertExecutor.java
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/InsertExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ProxyFactory.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ProxyFactory.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryLoader.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryLoader.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryRunner.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryRunner.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetHandler.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ResultSetHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetIterator.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/RowProcessor.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/RowProcessor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/UpdateExecutor.java
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/UpdateExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/
      - copied from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/handlers/
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/package-info.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/package-info.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/
      - copied from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/wrappers/
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/AbstractExecutorTest.java
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/AbstractExecutorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/AsyncExecutorTest.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/AsyncExecutorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseResultSetHandlerTestCase.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BaseResultSetHandlerTestCase.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BaseTestCase.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BasicRowProcessorTest.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BasicRowProcessorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BatchExecutorTest.java
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BatchExecutorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/BeanProcessorTest.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BeanProcessorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/DbUtilsTest.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/GenerousBeanProcessorTest.java
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/GenerousBeanProcessorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/InsertExecutorTest.java
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/InsertExecutorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSet.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/MockResultSet.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/MockResultSetMetaData.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/MockResultSetMetaData.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ProxyFactoryTest.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/ProxyFactoryTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryExecutorTest.java
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryExecutorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryLoaderTest.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryLoaderTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/QueryRunnerTest.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/ResultSetIteratorTest.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/ResultSetIteratorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/TestBean.java   (contents, props changed)
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/TestBean.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/UpdateExecutorTest.java
      - copied, changed from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/UpdateExecutorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/
      - copied from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/handlers/
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/wrappers/
      - copied from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/wrappers/
Removed:
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/AbstractExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/AsyncExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BasicRowProcessor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BatchExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/DbUtils.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/GenerousBeanProcessor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/InsertExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ProxyFactory.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryLoader.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryRunner.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ResultSetHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/RowProcessor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/UpdateExecutor.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/handlers/
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/package-info.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/wrappers/
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/AbstractExecutorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/AsyncExecutorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BaseResultSetHandlerTestCase.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BaseTestCase.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BasicRowProcessorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BatchExecutorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/BeanProcessorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/DbUtilsTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/GenerousBeanProcessorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/InsertExecutorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/MockResultSet.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/MockResultSetMetaData.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/ProxyFactoryTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryExecutorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryLoaderTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/QueryRunnerTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/ResultSetIteratorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/TestBean.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/UpdateExecutorTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/handlers/
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/wrappers/
Modified:
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractKeyedHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractListHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayListHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanListHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanMapHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ColumnListHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/KeyedHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapListHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ScalarHandler.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/package-info.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/SqlNullCheckedResultSet.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSet.java
    commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/package-info.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ArrayHandlerTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ArrayListHandlerTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanHandlerTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanListHandlerTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/BeanMapHandlerTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ColumnListHandlerTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/KeyedHandlerTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/MapHandlerTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/MapListHandlerTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/handlers/ScalarHandlerTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/wrappers/SqlNullCheckedResultSetTest.java
    commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSetTest.java

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/AbstractExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/AbstractExecutor.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/AbstractExecutor.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AbstractExecutor.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AsyncExecutor.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/AsyncExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AsyncExecutor.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AsyncExecutor.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/AsyncExecutor.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/AsyncExecutor.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AsyncExecutor.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.sql.SQLException;
 import java.util.concurrent.Callable;
@@ -42,7 +42,7 @@ public class AsyncExecutor {
     }
     
     /**
-     * Execute a {@link org.apache.commons.dbutils.BatchExecutor}.
+     * Execute a {@link org.apache.commons.dbutils2.BatchExecutor}.
      * @return A <code>Future</code> which returns the result of the batch call.
      * @throws SQLException if a database access error occurs
      */
@@ -58,7 +58,7 @@ public class AsyncExecutor {
     }
 
     /**
-     * Execute a {@link org.apache.commons.dbutils.QueryExecutor} given a handler.
+     * Execute a {@link org.apache.commons.dbutils2.QueryExecutor} given a handler.
      * @param <T> The type of object that the handler returns
      * @param handler The handler that converts the results into an object.
      * @return A <code>Future</code> which returns the result of the query call.
@@ -76,7 +76,7 @@ public class AsyncExecutor {
     }
 
     /**
-     * Execute a {@link org.apache.commons.dbutils.UpdateExecutor}.
+     * Execute a {@link org.apache.commons.dbutils2.UpdateExecutor}.
      * @param <T> The type of object that the handler returns
      * @return A <code>Future</code> which returns the result of the query call.
      * @throws SQLException if a database access error occurs
@@ -93,7 +93,7 @@ public class AsyncExecutor {
     }
 
     /**
-     * Execute a {@link org.apache.commons.dbutils.InsertExecutor} given a handler.
+     * Execute a {@link org.apache.commons.dbutils2.InsertExecutor} given a handler.
      * @param <T> The type of object that the handler returns
      * @param handler The handler that converts the results into an object.
      * @return A <code>Future</code> which returns the result of the query call.
@@ -111,7 +111,7 @@ public class AsyncExecutor {
     }
 
     /**
-     * Execute a {@link org.apache.commons.dbutils.InsertExecutor} given a handler.
+     * Execute a {@link org.apache.commons.dbutils2.InsertExecutor} given a handler.
      * @return A <code>Future</code> which returns the number of rows inserted.
      * @throws SQLException if a database access error occurs
      */

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/AsyncExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BaseResultSetHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.io.InputStream;
 import java.io.Reader;

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BaseResultSetHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BasicRowProcessor.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BasicRowProcessor.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BasicRowProcessor.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BasicRowProcessor.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BasicRowProcessor.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BasicRowProcessor.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BasicRowProcessor.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -71,7 +71,7 @@ public class BasicRowProcessor implement
      * order they're returned from the <code>ResultSet</code>.  Array elements
      * will be set to <code>null</code> if the column was SQL NULL.
      *
-     * @see org.apache.commons.dbutils.RowProcessor#toArray(java.sql.ResultSet)
+     * @see org.apache.commons.dbutils2.RowProcessor#toArray(java.sql.ResultSet)
      * @param rs ResultSet that supplies the array data
      * @throws SQLException if a database access error occurs
      * @return the newly created array
@@ -92,8 +92,8 @@ public class BasicRowProcessor implement
     /**
      * Convert a <code>ResultSet</code> row into a JavaBean.  This
      * implementation delegates to a BeanProcessor instance.
-     * @see org.apache.commons.dbutils.RowProcessor#toBean(java.sql.ResultSet, java.lang.Class)
-     * @see org.apache.commons.dbutils.BeanProcessor#toBean(java.sql.ResultSet, java.lang.Class)
+     * @see org.apache.commons.dbutils2.RowProcessor#toBean(java.sql.ResultSet, java.lang.Class)
+     * @see org.apache.commons.dbutils2.BeanProcessor#toBean(java.sql.ResultSet, java.lang.Class)
      * @param <T> The type of bean to create
      * @param rs ResultSet that supplies the bean data
      * @param type Class from which to create the bean instance
@@ -108,8 +108,8 @@ public class BasicRowProcessor implement
     /**
      * Convert a <code>ResultSet</code> into a <code>List</code> of JavaBeans.
      * This implementation delegates to a BeanProcessor instance.
-     * @see org.apache.commons.dbutils.RowProcessor#toBeanList(java.sql.ResultSet, java.lang.Class)
-     * @see org.apache.commons.dbutils.BeanProcessor#toBeanList(java.sql.ResultSet, java.lang.Class)
+     * @see org.apache.commons.dbutils2.RowProcessor#toBeanList(java.sql.ResultSet, java.lang.Class)
+     * @see org.apache.commons.dbutils2.BeanProcessor#toBeanList(java.sql.ResultSet, java.lang.Class)
      * @param <T> The type of bean to create
      * @param rs ResultSet that supplies the bean data
      * @param type Class from which to create the bean instance
@@ -127,7 +127,7 @@ public class BasicRowProcessor implement
      * implementation returns a <code>Map</code> with case insensitive column
      * names as keys.  Calls to <code>map.get("COL")</code> and
      * <code>map.get("col")</code> return the same value.
-     * @see org.apache.commons.dbutils.RowProcessor#toMap(java.sql.ResultSet)
+     * @see org.apache.commons.dbutils2.RowProcessor#toMap(java.sql.ResultSet)
      * @param rs ResultSet that supplies the map data
      * @throws SQLException if a database access error occurs
      * @return the newly created Map

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BasicRowProcessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BasicRowProcessor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BatchExecutor.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BatchExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BatchExecutor.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BatchExecutor.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BatchExecutor.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BatchExecutor.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BatchExecutor.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.sql.Connection;
 import java.sql.SQLException;

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BeanProcessor.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BeanProcessor.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BeanProcessor.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BeanProcessor.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BeanProcessor.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/BeanProcessor.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BeanProcessor.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BeanProcessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/BeanProcessor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/DbUtils.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/DbUtils.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/DbUtils.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/DbUtils.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/DbUtils.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/DbUtils.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/DbUtils.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import static java.sql.DriverManager.registerDriver;
 import java.io.PrintWriter;

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/DbUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/DbUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/GenerousBeanProcessor.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/GenerousBeanProcessor.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/GenerousBeanProcessor.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/GenerousBeanProcessor.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/GenerousBeanProcessor.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/GenerousBeanProcessor.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/GenerousBeanProcessor.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 
 import java.beans.PropertyDescriptor;

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/InsertExecutor.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/InsertExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/InsertExecutor.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/InsertExecutor.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/InsertExecutor.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/InsertExecutor.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/InsertExecutor.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.sql.Connection;
 import java.sql.ResultSet;

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ProxyFactory.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ProxyFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ProxyFactory.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ProxyFactory.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ProxyFactory.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ProxyFactory.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ProxyFactory.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ProxyFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ProxyFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryExecutor.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryExecutor.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryExecutor.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.sql.Connection;
 import java.sql.ResultSet;

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryLoader.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryLoader.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryLoader.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryLoader.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryLoader.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryLoader.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryLoader.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.io.IOException;
 import java.io.InputStream;

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryLoader.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryRunner.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryRunner.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryRunner.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryRunner.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryRunner.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/QueryRunner.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryRunner.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -94,7 +94,7 @@ public class QueryRunner {
     }
 
     /**
-     * Creates an {@link org.apache.commons.dbutils.BatchExecutor} for the given SQL.
+     * Creates an {@link org.apache.commons.dbutils2.BatchExecutor} for the given SQL.
      * <code>Connection</code> is retrieved from the <code>DataSource</code>
      * set in the constructor.  This <code>Connection</code> must be in
      * auto-commit mode or the insert will not be saved. The <code>Connection</code> is
@@ -102,7 +102,7 @@ public class QueryRunner {
      * 
      * @param sql The SQL statement to execute.
      * 
-     * @return An {@link org.apache.commons.dbutils.BatchExecutor} for this SQL statement.
+     * @return An {@link org.apache.commons.dbutils2.BatchExecutor} for this SQL statement.
      * @throws SQLException If there are database or parameter errors.
      */
     public BatchExecutor batch(String sql) throws SQLException {
@@ -110,13 +110,13 @@ public class QueryRunner {
     }
 
     /**
-     * Creates an {@link org.apache.commons.dbutils.BatchExecutor} for the given SQL statement and connection.
+     * Creates an {@link org.apache.commons.dbutils2.BatchExecutor} for the given SQL statement and connection.
      * The connection is <b>NOT</b> closed after execution.
      *
      * @param conn The connection to use for the batch call.
      * @param sql The SQL statement to execute.
      * 
-     * @return An {@link org.apache.commons.dbutils.BatchExecutor} for this SQL statement.
+     * @return An {@link org.apache.commons.dbutils2.BatchExecutor} for this SQL statement.
      * @throws SQLException If there are database or parameter errors.
      */
     public BatchExecutor batch(Connection conn, String sql) throws SQLException {
@@ -124,13 +124,13 @@ public class QueryRunner {
     }
 
     /**
-     * Creates an {@link org.apache.commons.dbutils.BatchExecutor} for the given SQL statement and connection.
+     * Creates an {@link org.apache.commons.dbutils2.BatchExecutor} for the given SQL statement and connection.
      * 
      * @param conn The connection to use for the batch call.
      * @param closeConn True if the connection should be closed, false otherwise.
      * @param sql The SQL statement to execute.
      * 
-     * @return An {@link org.apache.commons.dbutils.BatchExecutor} for this SQL statement.
+     * @return An {@link org.apache.commons.dbutils2.BatchExecutor} for this SQL statement.
      * @throws SQLException If there are database or parameter errors.
      */
     public BatchExecutor batch(Connection conn, boolean closeConn, String sql) throws SQLException {
@@ -149,7 +149,7 @@ public class QueryRunner {
     }
 
     /**
-     * Creates an {@link org.apache.commons.dbutils.QueryExecutor} for the given SQL.
+     * Creates an {@link org.apache.commons.dbutils2.QueryExecutor} for the given SQL.
      * <code>Connection</code> is retrieved from the <code>DataSource</code>
      * set in the constructor.  This <code>Connection</code> must be in
      * auto-commit mode or the insert will not be saved. The <code>Connection</code> is
@@ -157,7 +157,7 @@ public class QueryRunner {
      * 
      * @param sql The SQL statement to execute.
      * 
-     * @return An {@link org.apache.commons.dbutils.QueryExecutor} for this SQL statement.
+     * @return An {@link org.apache.commons.dbutils2.QueryExecutor} for this SQL statement.
      * @throws SQLException If there are database or parameter errors.
      */
     public QueryExecutor query(String sql) throws SQLException {
@@ -165,13 +165,13 @@ public class QueryRunner {
     }
 
     /**
-     * Creates an {@link org.apache.commons.dbutils.QueryExecutor} for the given SQL statement and connection.
+     * Creates an {@link org.apache.commons.dbutils2.QueryExecutor} for the given SQL statement and connection.
      * The connection is <b>NOT</b> closed after execution.
      * 
      * @param conn The connection to use for the update call.
      * @param sql The SQL statement to execute.
      * 
-     * @return An {@link org.apache.commons.dbutils.QueryExecutor} for this SQL statement.
+     * @return An {@link org.apache.commons.dbutils2.QueryExecutor} for this SQL statement.
      * @throws SQLException If there are database or parameter errors.
      */
     public QueryExecutor query(Connection conn, String sql) throws SQLException {
@@ -179,13 +179,13 @@ public class QueryRunner {
     }
 
     /**
-     * Creates an {@link org.apache.commons.dbutils.QueryExecutor} for the given SQL statement and connection.
+     * Creates an {@link org.apache.commons.dbutils2.QueryExecutor} for the given SQL statement and connection.
      * 
      * @param conn The connection to use for the query call.
      * @param closeConn True if the connection should be closed, false otherwise.
      * @param sql The SQL statement to execute.
      * 
-     * @return An {@link org.apache.commons.dbutils.QueryExecutor} for this SQL statement.
+     * @return An {@link org.apache.commons.dbutils2.QueryExecutor} for this SQL statement.
      * @throws SQLException If there are database or parameter errors.
      */
     public QueryExecutor query(Connection conn, boolean closeConn, String sql) throws SQLException {
@@ -204,7 +204,7 @@ public class QueryRunner {
     }
 
     /**
-     * Creates an {@link org.apache.commons.dbutils.UpdateExecutor} for the given SQL.
+     * Creates an {@link org.apache.commons.dbutils2.UpdateExecutor} for the given SQL.
      * <code>Connection</code> is retrieved from the <code>DataSource</code>
      * set in the constructor.  This <code>Connection</code> must be in
      * auto-commit mode or the insert will not be saved. The <code>Connection</code> is
@@ -212,7 +212,7 @@ public class QueryRunner {
      *
      * @param sql The SQL statement to execute.
      * 
-     * @return An {@link org.apache.commons.dbutils.UpdateExecutor} for this SQL statement.
+     * @return An {@link org.apache.commons.dbutils2.UpdateExecutor} for this SQL statement.
      * @throws SQLException if a database access error occurs
      */
     public UpdateExecutor update(String sql) throws SQLException {
@@ -220,13 +220,13 @@ public class QueryRunner {
     }
 
     /**
-     * Creates an {@link org.apache.commons.dbutils.UpdateExecutor} for the given SQL statement and connection.
+     * Creates an {@link org.apache.commons.dbutils2.UpdateExecutor} for the given SQL statement and connection.
      * The connection is <b>NOT</b> closed after execution.
      * 
      * @param conn The connection to use for the update call.
      * @param sql The SQL statement to execute.
      * 
-     * @return An {@link org.apache.commons.dbutils.UpdateExecutor} for this SQL statement.
+     * @return An {@link org.apache.commons.dbutils2.UpdateExecutor} for this SQL statement.
      * @throws SQLException If there are database or parameter errors.
      */
     public UpdateExecutor update(Connection conn, String sql) throws SQLException {
@@ -234,13 +234,13 @@ public class QueryRunner {
     }
 
     /**
-     * Creates an {@link org.apache.commons.dbutils.UpdateExecutor} for the given SQL statement and connection.
+     * Creates an {@link org.apache.commons.dbutils2.UpdateExecutor} for the given SQL statement and connection.
      * 
      * @param conn The connection to use for the update call.
      * @param closeConn True if the connection should be closed, false otherwise.
      * @param sql The SQL statement to execute.
      * 
-     * @return An {@link org.apache.commons.dbutils.UpdateExecutor} for this SQL statement.
+     * @return An {@link org.apache.commons.dbutils2.UpdateExecutor} for this SQL statement.
      * @throws SQLException If there are database or parameter errors.
      */
     public UpdateExecutor update(Connection conn, boolean closeConn, String sql) throws SQLException {
@@ -259,7 +259,7 @@ public class QueryRunner {
     }
 
     /**
-     * Creates an {@link org.apache.commons.dbutils.InsertExecutor} for the given SQL.
+     * Creates an {@link org.apache.commons.dbutils2.InsertExecutor} for the given SQL.
      * <code>Connection</code> is retrieved from the <code>DataSource</code>
      * set in the constructor.  This <code>Connection</code> must be in
      * auto-commit mode or the insert will not be saved. The <code>Connection</code> is
@@ -267,7 +267,7 @@ public class QueryRunner {
      * 
      * @param sql The SQL statement to execute.
      *
-     * @return An {@link org.apache.commons.dbutils.InsertExecutor} for this SQL statement.
+     * @return An {@link org.apache.commons.dbutils2.InsertExecutor} for this SQL statement.
      * @throws SQLException If there are database or parameter errors.
      */
     public InsertExecutor insert(String sql) throws SQLException {
@@ -275,13 +275,13 @@ public class QueryRunner {
     }
 
     /**
-     * Creates an {@link org.apache.commons.dbutils.InsertExecutor} for the given SQL and connection
+     * Creates an {@link org.apache.commons.dbutils2.InsertExecutor} for the given SQL and connection
      * The connection is <b>NOT</b> closed after execution.
      * 
      * @param conn The connection to use for the query call.
      * @param sql The SQL statement to execute.
      *
-     * @return An {@link org.apache.commons.dbutils.InsertExecutor} for this SQL statement.
+     * @return An {@link org.apache.commons.dbutils2.InsertExecutor} for this SQL statement.
      * @throws SQLException If there are database or parameter errors.
      */
     public InsertExecutor insert(Connection conn, String sql) throws SQLException {
@@ -289,13 +289,13 @@ public class QueryRunner {
     }
 
     /**
-     * Creates an {@link org.apache.commons.dbutils.InsertExecutor} for the given SQL and connection.
+     * Creates an {@link org.apache.commons.dbutils2.InsertExecutor} for the given SQL and connection.
      * 
      * @param conn The connection to use for the insert call.
      * @param closeConn True if the connection should be closed, false otherwise.
      * @param sql The SQL statement to execute.
      *
-     * @return An {@link org.apache.commons.dbutils.InsertExecutor} for this SQL statement.
+     * @return An {@link org.apache.commons.dbutils2.InsertExecutor} for this SQL statement.
      * @throws SQLException If there are database or parameter errors.
      */
     public InsertExecutor insert(Connection conn, boolean closeConn, String sql) throws SQLException {

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryRunner.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/QueryRunner.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetHandler.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ResultSetHandler.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetHandler.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetHandler.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ResultSetHandler.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ResultSetHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetHandler.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetIterator.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetIterator.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetIterator.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetIterator.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/ResultSetIterator.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/RowProcessor.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/RowProcessor.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/RowProcessor.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/RowProcessor.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/RowProcessor.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/RowProcessor.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/RowProcessor.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/RowProcessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/RowProcessor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/UpdateExecutor.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/UpdateExecutor.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/UpdateExecutor.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/UpdateExecutor.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/UpdateExecutor.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/UpdateExecutor.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/UpdateExecutor.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import java.sql.Connection;
 import java.sql.SQLException;

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractKeyedHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractKeyedHandler.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractKeyedHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractKeyedHandler.java Sun Mar 10 14:54:34 2013
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.dbutils2.ResultSetHandler;
 
 /**
  * <p>
@@ -32,7 +32,7 @@ import org.apache.commons.dbutils.Result
  *
  * @param <K> the type of keys maintained by the returned map
  * @param <V> the type of mapped values
- * @see org.apache.commons.dbutils.ResultSetHandler
+ * @see org.apache.commons.dbutils2.ResultSetHandler
  * @since DbUtils 1.3
  */
 public abstract class AbstractKeyedHandler<K, V> implements ResultSetHandler<Map<K, V>> {
@@ -44,7 +44,7 @@ public abstract class AbstractKeyedHandl
      * @param rs <code>ResultSet</code> to process.
      * @return A <code>Map</code>, never <code>null</code>.
      * @throws SQLException if a database access error occurs
-     * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet)
+     * @see org.apache.commons.dbutils2.ResultSetHandler#handle(java.sql.ResultSet)
      */
     @Override
     public Map<K, V> handle(ResultSet rs) throws SQLException {

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractListHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractListHandler.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractListHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/AbstractListHandler.java Sun Mar 10 14:54:34 2013
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.dbutils2.ResultSetHandler;
 
 /**
  * Abstract class that simplify development of <code>ResultSetHandler</code>
  * classes that convert <code>ResultSet</code> into <code>List</code>.
  *
  * @param <T> the target List generic type
- * @see org.apache.commons.dbutils.ResultSetHandler
+ * @see org.apache.commons.dbutils2.ResultSetHandler
  */
 public abstract class AbstractListHandler<T> implements ResultSetHandler<List<T>> {
     /**

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java Sun Mar 10 14:54:34 2013
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.commons.dbutils.BasicRowProcessor;
-import org.apache.commons.dbutils.ResultSetHandler;
-import org.apache.commons.dbutils.RowProcessor;
+import org.apache.commons.dbutils2.BasicRowProcessor;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.RowProcessor;
 
 /**
  * <code>ResultSetHandler</code> implementation that converts a
  * <code>ResultSet</code> into an <code>Object[]</code>. This class is
  * thread safe.
  *
- * @see org.apache.commons.dbutils.ResultSetHandler
+ * @see org.apache.commons.dbutils2.ResultSetHandler
  */
 public class ArrayHandler implements ResultSetHandler<Object[]> {
 
@@ -71,7 +71,7 @@ public class ArrayHandler implements Res
      * <code>ResultSet</code>.
      *
      * @throws SQLException if a database access error occurs
-     * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet)
+     * @see org.apache.commons.dbutils2.ResultSetHandler#handle(java.sql.ResultSet)
      */
     @Override
     public Object[] handle(ResultSet rs) throws SQLException {

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayListHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayListHandler.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayListHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ArrayListHandler.java Sun Mar 10 14:54:34 2013
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.commons.dbutils.RowProcessor;
+import org.apache.commons.dbutils2.RowProcessor;
 
 /**
  * <code>ResultSetHandler</code> implementation that converts the
  * <code>ResultSet</code> into a <code>List</code> of <code>Object[]</code>s.
  * This class is thread safe.
  *
- * @see org.apache.commons.dbutils.ResultSetHandler
+ * @see org.apache.commons.dbutils2.ResultSetHandler
  */
 public class ArrayListHandler extends AbstractListHandler<Object[]> {
 
@@ -62,7 +62,7 @@ public class ArrayListHandler extends Ab
      * @return <code>Object[]</code>, never <code>null</code>.
      *
      * @throws SQLException if a database access error occurs
-     * @see org.apache.commons.dbutils.handlers.AbstractListHandler#handle(ResultSet)
+     * @see org.apache.commons.dbutils2.handlers.AbstractListHandler#handle(ResultSet)
      */
     @Override
     protected Object[] handleRow(ResultSet rs) throws SQLException {

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanHandler.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanHandler.java Sun Mar 10 14:54:34 2013
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.commons.dbutils.ResultSetHandler;
-import org.apache.commons.dbutils.RowProcessor;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.RowProcessor;
 
 /**
  * <code>ResultSetHandler</code> implementation that converts the first
  * <code>ResultSet</code> row into a JavaBean. This class is thread safe.
  *
  * @param <T> the target bean type
- * @see org.apache.commons.dbutils.ResultSetHandler
+ * @see org.apache.commons.dbutils2.ResultSetHandler
  */
 public class BeanHandler<T> implements ResultSetHandler<T> {
 
@@ -73,7 +73,7 @@ public class BeanHandler<T> implements R
      * rows in the <code>ResultSet</code>.
      *
      * @throws SQLException if a database access error occurs
-     * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet)
+     * @see org.apache.commons.dbutils2.ResultSetHandler#handle(java.sql.ResultSet)
      */
     @Override
     public T handle(ResultSet rs) throws SQLException {

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanListHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanListHandler.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanListHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanListHandler.java Sun Mar 10 14:54:34 2013
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.commons.dbutils.ResultSetHandler;
-import org.apache.commons.dbutils.RowProcessor;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.RowProcessor;
 
 /**
  * <code>ResultSetHandler</code> implementation that converts a
@@ -29,7 +29,7 @@ import org.apache.commons.dbutils.RowPro
  * thread safe.
  *
  * @param <T> the target bean type
- * @see org.apache.commons.dbutils.ResultSetHandler
+ * @see org.apache.commons.dbutils2.ResultSetHandler
  */
 public class BeanListHandler<T> implements ResultSetHandler<List<T>> {
 
@@ -76,7 +76,7 @@ public class BeanListHandler<T> implemen
      * @return A List of beans, never <code>null</code>.
      *
      * @throws SQLException if a database access error occurs
-     * @see org.apache.commons.dbutils.RowProcessor#toBeanList(ResultSet, Class)
+     * @see org.apache.commons.dbutils2.RowProcessor#toBeanList(ResultSet, Class)
      */
     @Override
     public List<T> handle(ResultSet rs) throws SQLException {

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanMapHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanMapHandler.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanMapHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/BeanMapHandler.java Sun Mar 10 14:54:34 2013
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.commons.dbutils.RowProcessor;
+import org.apache.commons.dbutils2.RowProcessor;
 
 /**
  * <p>
@@ -52,7 +52,7 @@ import org.apache.commons.dbutils.RowPro
  *            the type of keys maintained by the returned map
  * @param <V>
  *            the type of the bean
- * @see org.apache.commons.dbutils.ResultSetHandler
+ * @see org.apache.commons.dbutils2.ResultSetHandler
  * @since DbUtils 1.5
  */
 public class BeanMapHandler<K, V> extends AbstractKeyedHandler<K, V> {
@@ -165,7 +165,7 @@ public class BeanMapHandler<K, V> extend
      * @throws SQLException if a database access error occurs
      * @throws ClassCastException if the class datatype does not match the column type
      *
-     * @see org.apache.commons.dbutils.handlers.AbstractKeyedHandler#createKey(ResultSet)
+     * @see org.apache.commons.dbutils2.handlers.AbstractKeyedHandler#createKey(ResultSet)
      */
     // We assume that the user has picked the correct type to match the column
     // so getObject will return the appropriate type and the cast will succeed.

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ColumnListHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ColumnListHandler.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ColumnListHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ColumnListHandler.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,7 +25,7 @@ import java.sql.SQLException;
  * <code>Object</code>s. This class is thread safe.
  *
  * @param <T> The type of the column.
- * @see org.apache.commons.dbutils.ResultSetHandler
+ * @see org.apache.commons.dbutils2.ResultSetHandler
  * @since DbUtils 1.1
  */
 public class ColumnListHandler<T> extends AbstractListHandler<T> {
@@ -89,7 +89,7 @@ public class ColumnListHandler<T> extend
      * @throws SQLException if a database access error occurs
      * @throws ClassCastException if the class datatype does not match the column type
      *
-     * @see org.apache.commons.dbutils.handlers.AbstractListHandler#handle(ResultSet)
+     * @see org.apache.commons.dbutils2.handlers.AbstractListHandler#handle(ResultSet)
      */
     // We assume that the user has picked the correct type to match the column
     // so getObject will return the appropriate type and the cast will succeed.

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/KeyedHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/KeyedHandler.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/KeyedHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/KeyedHandler.java Sun Mar 10 14:54:34 2013
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Map;
 
-import org.apache.commons.dbutils.RowProcessor;
+import org.apache.commons.dbutils2.RowProcessor;
 
 /**
  * <p>
@@ -46,7 +46,7 @@ import org.apache.commons.dbutils.RowPro
  * <p>This class is thread safe.</p>
  *
  * @param <K> The type of the key
- * @see org.apache.commons.dbutils.ResultSetHandler
+ * @see org.apache.commons.dbutils2.ResultSetHandler
  * @since DbUtils 1.1
  */
 public class KeyedHandler<K> extends AbstractKeyedHandler<K, Map<String, Object>> {

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapHandler.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapHandler.java Sun Mar 10 14:54:34 2013
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Map;
 
-import org.apache.commons.dbutils.ResultSetHandler;
-import org.apache.commons.dbutils.RowProcessor;
+import org.apache.commons.dbutils2.ResultSetHandler;
+import org.apache.commons.dbutils2.RowProcessor;
 
 /**
  * <code>ResultSetHandler</code> implementation that converts the first
  * <code>ResultSet</code> row into a <code>Map</code>. This class is thread
  * safe.
  *
- * @see org.apache.commons.dbutils.ResultSetHandler
+ * @see org.apache.commons.dbutils2.ResultSetHandler
  */
 public class MapHandler implements ResultSetHandler<Map<String, Object>> {
 
@@ -66,7 +66,7 @@ public class MapHandler implements Resul
      *
      * @throws SQLException if a database access error occurs
      *
-     * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet)
+     * @see org.apache.commons.dbutils2.ResultSetHandler#handle(java.sql.ResultSet)
      */
     @Override
     public Map<String, Object> handle(ResultSet rs) throws SQLException {

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapListHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapListHandler.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapListHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/MapListHandler.java Sun Mar 10 14:54:34 2013
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Map;
 
-import org.apache.commons.dbutils.RowProcessor;
+import org.apache.commons.dbutils2.RowProcessor;
 
 /**
  * <code>ResultSetHandler</code> implementation that converts a
  * <code>ResultSet</code> into a <code>List</code> of <code>Map</code>s.
  * This class is thread safe.
  *
- * @see org.apache.commons.dbutils.ResultSetHandler
+ * @see org.apache.commons.dbutils2.ResultSetHandler
  */
 public class MapListHandler extends AbstractListHandler<Map<String, Object>> {
 
@@ -63,7 +63,7 @@ public class MapListHandler extends Abst
      *
      * @throws SQLException if a database access error occurs
      *
-     * @see org.apache.commons.dbutils.handlers.AbstractListHandler#handle(ResultSet)
+     * @see org.apache.commons.dbutils2.handlers.AbstractListHandler#handle(ResultSet)
      */
     @Override
     protected Map<String, Object> handleRow(ResultSet rs) throws SQLException {

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ScalarHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ScalarHandler.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ScalarHandler.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/ScalarHandler.java Sun Mar 10 14:54:34 2013
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.commons.dbutils.ResultSetHandler;
+import org.apache.commons.dbutils2.ResultSetHandler;
 
 /**
  * <code>ResultSetHandler</code> implementation that converts one
  * <code>ResultSet</code> column into an Object. This class is thread safe.
  *
  * @param <T> The type of the scalar
- * @see org.apache.commons.dbutils.ResultSetHandler
+ * @see org.apache.commons.dbutils2.ResultSetHandler
  */
 public class ScalarHandler<T> implements ResultSetHandler<T> {
 
@@ -91,7 +91,7 @@ public class ScalarHandler<T> implements
      * @throws SQLException if a database access error occurs
      * @throws ClassCastException if the class datatype does not match the column type
      *
-     * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet)
+     * @see org.apache.commons.dbutils2.ResultSetHandler#handle(java.sql.ResultSet)
      */
     // We assume that the user has picked the correct type to match the column
     // so getObject will return the appropriate type and the cast will succeed.

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/package-info.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/package-info.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/handlers/package-info.java Sun Mar 10 14:54:34 2013
@@ -18,4 +18,4 @@
 /**
  * Implementations of the org.apache.commons.dbutils.ResultSetHandler interface.
  */
-package org.apache.commons.dbutils.handlers;
+package org.apache.commons.dbutils2.handlers;

Copied: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/package-info.java (from r1454856, commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/package-info.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/package-info.java?p2=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/package-info.java&p1=commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/package-info.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils/package-info.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/package-info.java Sun Mar 10 14:54:34 2013
@@ -23,4 +23,4 @@
  * This package contains the core classes and interfaces - DbUtils, QueryRunner and the ResultSetHandler interface
  * should be your first items of interest.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/package-info.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/package-info.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/package-info.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/SqlNullCheckedResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/SqlNullCheckedResultSet.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/SqlNullCheckedResultSet.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/SqlNullCheckedResultSet.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.wrappers;
+package org.apache.commons.dbutils2.wrappers;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -32,7 +32,7 @@ import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.dbutils.ProxyFactory;
+import org.apache.commons.dbutils2.ProxyFactory;
 
 /**
  * Decorates a <code>ResultSet</code> with checks for a SQL NULL value on each

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSet.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSet.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/StringTrimmedResultSet.java Sun Mar 10 14:54:34 2013
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils.wrappers;
+package org.apache.commons.dbutils2.wrappers;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.sql.ResultSet;
 
-import org.apache.commons.dbutils.ProxyFactory;
+import org.apache.commons.dbutils2.ProxyFactory;
 
 /**
  * Wraps a <code>ResultSet</code> to trim strings returned by the

Modified: commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/package-info.java?rev=1454860&r1=1454856&r2=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/package-info.java (original)
+++ commons/proper/dbutils/branches/2_0/src/main/java/org/apache/commons/dbutils2/wrappers/package-info.java Sun Mar 10 14:54:34 2013
@@ -18,4 +18,4 @@
 /**
  * Wrappers that add functionality to java.sql classes.
  */
-package org.apache.commons.dbutils.wrappers;
+package org.apache.commons.dbutils2.wrappers;

Copied: commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/AbstractExecutorTest.java (from r1454856, commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/AbstractExecutorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/AbstractExecutorTest.java?p2=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/AbstractExecutorTest.java&p1=commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/AbstractExecutorTest.java&r1=1454856&r2=1454860&rev=1454860&view=diff
==============================================================================
--- commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils/AbstractExecutorTest.java (original)
+++ commons/proper/dbutils/branches/2_0/src/test/java/org/apache/commons/dbutils2/AbstractExecutorTest.java Sun Mar 10 14:54:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.dbutils;
+package org.apache.commons.dbutils2;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
@@ -25,6 +25,8 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
+
+import org.apache.commons.dbutils2.AbstractExecutor;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;