You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/02/09 12:42:29 UTC
[commons-beanutils] branch master updated: Organize packages such that all dependencies on java.sql are under org.apache.commons.beanutils2.sql
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
The following commit(s) were added to refs/heads/master by this push:
new aa7c79dc Organize packages such that all dependencies on java.sql are under org.apache.commons.beanutils2.sql
aa7c79dc is described below
commit aa7c79dcf298027e87a7f86b3cc758da8cbf1782
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Feb 9 07:42:25 2023 -0500
Organize packages such that all dependencies on java.sql are under
org.apache.commons.beanutils2.sql
More to come for references from root package
---
.../commons/beanutils2/ConvertUtilsBean.java | 6 +++---
.../apache/commons/beanutils2/DynaProperty.java | 2 +-
.../beanutils2/converters/sql/package-info.java | 24 ---------------------
.../beanutils2/locale/LocaleConvertUtilsBean.java | 6 +++---
.../locale/converters/sql/package-info.java | 25 ----------------------
.../beanutils2/{ => sql}/JDBCDynaClass.java | 7 ++++--
.../beanutils2/{ => sql}/ResultSetDynaClass.java | 4 +++-
.../beanutils2/{ => sql}/ResultSetIterator.java | 6 +++++-
.../beanutils2/{ => sql}/RowSetDynaClass.java | 7 +++++-
.../sql => sql/converters}/SqlDateConverter.java | 2 +-
.../sql => sql/converters}/SqlTimeConverter.java | 2 +-
.../converters}/SqlTimestampConverter.java | 2 +-
.../converters/locale}/SqlDateLocaleConverter.java | 2 +-
.../converters/locale}/SqlTimeLocaleConverter.java | 2 +-
.../locale}/SqlTimestampLocaleConverter.java | 2 +-
.../converters/BaseLocaleConverterTestCase.java | 2 +-
.../BigDecimalLocaleConverterTestCase.java | 4 +++-
.../BigIntegerLocaleConverterTestCase.java | 4 +++-
.../converters/ByteLocaleConverterTestCase.java | 4 +++-
.../converters/DateLocaleConverterTestCase.java | 3 ++-
.../converters/DoubleLocaleConverterTestCase.java | 4 +++-
.../converters/FloatLocaleConverterTestCase.java | 3 ++-
.../converters/IntegerLocaleConverterTestCase.java | 4 +++-
.../converters/LongLocaleConverterTestCase.java | 4 +++-
.../converters/ShortLocaleConverterTestCase.java | 4 +++-
.../{ => sql}/DynaResultSetTestCase.java | 8 +++++--
.../beanutils2/{ => sql}/DynaRowSetTestCase.java | 8 +++++--
.../beanutils2/{ => sql}/TestResultSet.java | 4 +++-
.../{ => sql}/TestResultSetMetaData.java | 4 +++-
.../converters}/SqlDateConverterTestCase.java | 2 +-
.../converters}/SqlTimeConverterTestCase.java | 2 +-
.../converters}/SqlTimestampConverterTestCase.java | 2 +-
32 files changed, 79 insertions(+), 86 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
index 4098d9d6..afd88a41 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
@@ -77,9 +77,9 @@ import org.apache.commons.beanutils2.converters.YearMonthConverter;
import org.apache.commons.beanutils2.converters.ZoneIdConverter;
import org.apache.commons.beanutils2.converters.ZoneOffsetConverter;
import org.apache.commons.beanutils2.converters.ZonedDateTimeConverter;
-import org.apache.commons.beanutils2.converters.sql.SqlDateConverter;
-import org.apache.commons.beanutils2.converters.sql.SqlTimeConverter;
-import org.apache.commons.beanutils2.converters.sql.SqlTimestampConverter;
+import org.apache.commons.beanutils2.sql.converters.SqlDateConverter;
+import org.apache.commons.beanutils2.sql.converters.SqlTimeConverter;
+import org.apache.commons.beanutils2.sql.converters.SqlTimestampConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
index b5b69bcc..ca2e34cd 100644
--- a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
+++ b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
@@ -129,7 +129,7 @@ public class DynaProperty implements Serializable {
/**
* Empty array.
*/
- static final DynaProperty[] EMPTY_ARRAY = {};
+ public static final DynaProperty[] EMPTY_ARRAY = {};
/**
* Gets the <em>(optional)</em> type of the indexed content for {@code DynaProperty}'s
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/sql/package-info.java b/src/main/java/org/apache/commons/beanutils2/converters/sql/package-info.java
deleted file mode 100644
index 89da0de7..00000000
--- a/src/main/java/org/apache/commons/beanutils2/converters/sql/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Standard implementations of the SQL
- * {@link org.apache.commons.beanutils2.Converter} interface that are
- * pre-registered with {@link org.apache.commons.beanutils2.ConvertUtils} at
- * startup time.
- */
-package org.apache.commons.beanutils2.converters.sql;
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
index 176d38f4..d0d31ce9 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
@@ -33,9 +33,9 @@ import org.apache.commons.beanutils2.locale.converters.IntegerLocaleConverter;
import org.apache.commons.beanutils2.locale.converters.LongLocaleConverter;
import org.apache.commons.beanutils2.locale.converters.ShortLocaleConverter;
import org.apache.commons.beanutils2.locale.converters.StringLocaleConverter;
-import org.apache.commons.beanutils2.locale.converters.sql.SqlDateLocaleConverter;
-import org.apache.commons.beanutils2.locale.converters.sql.SqlTimeLocaleConverter;
-import org.apache.commons.beanutils2.locale.converters.sql.SqlTimestampLocaleConverter;
+import org.apache.commons.beanutils2.sql.converters.locale.SqlDateLocaleConverter;
+import org.apache.commons.beanutils2.sql.converters.locale.SqlTimeLocaleConverter;
+import org.apache.commons.beanutils2.sql.converters.locale.SqlTimestampLocaleConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/package-info.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/package-info.java
deleted file mode 100644
index 307248f3..00000000
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/package-info.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Standard implementations of the locale-aware
- * {@link org.apache.commons.beanutils2.locale.LocaleConverter} interface that
- * are pre-registered with locale-aware SQL
- * {@link org.apache.commons.beanutils2.locale.LocaleConvertUtils} at startup
- * time.
- */
-package org.apache.commons.beanutils2.locale.converters.sql;
diff --git a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java b/src/main/java/org/apache/commons/beanutils2/sql/JDBCDynaClass.java
similarity index 98%
rename from src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
rename to src/main/java/org/apache/commons/beanutils2/sql/JDBCDynaClass.java
index e4e115c8..cc0f5e44 100644
--- a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/sql/JDBCDynaClass.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2;
+package org.apache.commons.beanutils2.sql;
import java.io.Serializable;
import java.sql.Date;
@@ -29,11 +29,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.DynaClass;
+import org.apache.commons.beanutils2.DynaProperty;
+
/**
* <p>Provides common logic for JDBC implementations of {@link DynaClass}.</p>
*
*/
-
abstract class JDBCDynaClass implements DynaClass, Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java b/src/main/java/org/apache/commons/beanutils2/sql/ResultSetDynaClass.java
similarity index 98%
rename from src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
rename to src/main/java/org/apache/commons/beanutils2/sql/ResultSetDynaClass.java
index 8b4fab2d..cef1bc12 100644
--- a/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/sql/ResultSetDynaClass.java
@@ -15,13 +15,15 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2;
+package org.apache.commons.beanutils2.sql;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.Objects;
+import org.apache.commons.beanutils2.DynaBean;
+
/**
* <p>Implementation of {@code DynaClass} for DynaBeans that wrap the
* {@code java.sql.Row</code> objects of a <code>java.sql.ResultSet}.
diff --git a/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java b/src/main/java/org/apache/commons/beanutils2/sql/ResultSetIterator.java
similarity index 98%
rename from src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java
rename to src/main/java/org/apache/commons/beanutils2/sql/ResultSetIterator.java
index cb82c1f6..ee7316e1 100644
--- a/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java
+++ b/src/main/java/org/apache/commons/beanutils2/sql/ResultSetIterator.java
@@ -15,12 +15,16 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2;
+package org.apache.commons.beanutils2.sql;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import org.apache.commons.beanutils2.ConversionException;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.DynaClass;
+
/**
* <p>Implementation of {@code java.util.Iterator} returned by the
* {@code iterator()} method of {@link ResultSetDynaClass}. Each
diff --git a/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java b/src/main/java/org/apache/commons/beanutils2/sql/RowSetDynaClass.java
similarity index 97%
rename from src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
rename to src/main/java/org/apache/commons/beanutils2/sql/RowSetDynaClass.java
index ed54e7f1..9bed0940 100644
--- a/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/sql/RowSetDynaClass.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2;
+package org.apache.commons.beanutils2.sql;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -23,6 +23,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import org.apache.commons.beanutils2.BasicDynaBean;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.DynaClass;
+import org.apache.commons.beanutils2.DynaProperty;
+
/**
* <p>Implementation of {@link DynaClass} that creates an in-memory collection
* of {@link DynaBean}s representing the results of an SQL query. Once the
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/sql/SqlDateConverter.java b/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlDateConverter.java
similarity index 97%
rename from src/main/java/org/apache/commons/beanutils2/converters/sql/SqlDateConverter.java
rename to src/main/java/org/apache/commons/beanutils2/sql/converters/SqlDateConverter.java
index c7ccf92e..f4d55993 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/sql/SqlDateConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlDateConverter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.beanutils2.converters.sql;
+package org.apache.commons.beanutils2.sql.converters;
import java.sql.Date;
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/sql/SqlTimeConverter.java b/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverter.java
similarity index 98%
rename from src/main/java/org/apache/commons/beanutils2/converters/sql/SqlTimeConverter.java
rename to src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverter.java
index 305c74ab..d8b1c654 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/sql/SqlTimeConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.beanutils2.converters.sql;
+package org.apache.commons.beanutils2.sql.converters;
import java.sql.Time;
import java.text.DateFormat;
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/sql/SqlTimestampConverter.java b/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverter.java
similarity index 98%
rename from src/main/java/org/apache/commons/beanutils2/converters/sql/SqlTimestampConverter.java
rename to src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverter.java
index c75b4ad9..54d248a4 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/sql/SqlTimestampConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.beanutils2.converters.sql;
+package org.apache.commons.beanutils2.sql.converters;
import java.sql.Timestamp;
import java.text.DateFormat;
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlDateLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/sql/converters/locale/SqlDateLocaleConverter.java
similarity index 99%
rename from src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlDateLocaleConverter.java
rename to src/main/java/org/apache/commons/beanutils2/sql/converters/locale/SqlDateLocaleConverter.java
index e5b37cc2..47505689 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlDateLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/sql/converters/locale/SqlDateLocaleConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters.sql;
+package org.apache.commons.beanutils2.sql.converters.locale;
import java.sql.Date;
import java.text.ParseException;
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlTimeLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/sql/converters/locale/SqlTimeLocaleConverter.java
similarity index 99%
rename from src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlTimeLocaleConverter.java
rename to src/main/java/org/apache/commons/beanutils2/sql/converters/locale/SqlTimeLocaleConverter.java
index baf71786..7b6270fd 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlTimeLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/sql/converters/locale/SqlTimeLocaleConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters.sql;
+package org.apache.commons.beanutils2.sql.converters.locale;
import java.sql.Time;
import java.text.ParseException;
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlTimestampLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/sql/converters/locale/SqlTimestampLocaleConverter.java
similarity index 99%
rename from src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlTimestampLocaleConverter.java
rename to src/main/java/org/apache/commons/beanutils2/sql/converters/locale/SqlTimestampLocaleConverter.java
index 0478c9bd..a4ec5220 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlTimestampLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/sql/converters/locale/SqlTimestampLocaleConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters.sql;
+package org.apache.commons.beanutils2.sql.converters.locale;
import java.sql.Timestamp;
import java.text.ParseException;
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/BaseLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java
similarity index 99%
rename from src/test/java/org/apache/commons/beanutils2/locale/converters/BaseLocaleConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java
index 27922f08..0f8a632c 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/BaseLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.converters;
import java.util.Locale;
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalLocaleConverterTestCase.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/BigDecimalLocaleConverterTestCase.java
index c8ca47d9..d119b79c 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalLocaleConverterTestCase.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.converters;
import java.math.BigDecimal;
+import org.apache.commons.beanutils2.locale.converters.BigDecimalLocaleConverter;
+
/**
* Test Case for the BigDecimalLocaleConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerLocaleConverterTestCase.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/BigIntegerLocaleConverterTestCase.java
index 137714e0..74cc6274 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerLocaleConverterTestCase.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.converters;
import java.math.BigInteger;
+import org.apache.commons.beanutils2.locale.converters.BigIntegerLocaleConverter;
+
/**
* Test Case for the BigIntegerLocaleConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ByteLocaleConverterTestCase.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/ByteLocaleConverterTestCase.java
index e5d7f84d..1f641735 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ByteLocaleConverterTestCase.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.converters;
+
+import org.apache.commons.beanutils2.locale.converters.ByteLocaleConverter;
/**
* Test Case for the ByteLocaleConverter class.
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java
similarity index 99%
rename from src/test/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java
index 606ea0cb..90044a05 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DateLocaleConverterTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.converters;
import java.text.DateFormatSymbols;
import java.text.ParseException;
@@ -24,6 +24,7 @@ import java.util.Date;
import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
+import org.apache.commons.beanutils2.locale.converters.DateLocaleConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTestCase.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTestCase.java
index ecb5d26a..46877a3a 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTestCase.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.converters;
+
+import org.apache.commons.beanutils2.locale.converters.DoubleLocaleConverter;
/**
* Test Case for the DoubleLocaleConverter class.
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/FloatLocaleConverterTestCase.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/FloatLocaleConverterTestCase.java
index 8166c077..2d1dfde6 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/FloatLocaleConverterTestCase.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.converters;
import java.text.DecimalFormat;
import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
import org.apache.commons.beanutils2.locale.LocaleConvertUtils;
+import org.apache.commons.beanutils2.locale.converters.FloatLocaleConverter;
/**
* Test Case for the FloatLocaleConverter class.
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/IntegerLocaleConverterTestCase.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/IntegerLocaleConverterTestCase.java
index f3e786c3..aa2e797d 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/IntegerLocaleConverterTestCase.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.converters;
+
+import org.apache.commons.beanutils2.locale.converters.IntegerLocaleConverter;
/**
* Test Case for the IntegerLocaleConverter class.
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/LongLocaleConverterTestCase.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/LongLocaleConverterTestCase.java
index e5b95d94..8c61f675 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/LongLocaleConverterTestCase.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.converters;
+
+import org.apache.commons.beanutils2.locale.converters.LongLocaleConverter;
/**
* Test Case for the LongLocaleConverter class.
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ShortLocaleConverterTestCase.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/ShortLocaleConverterTestCase.java
index 3a0d8911..bd7434ce 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ShortLocaleConverterTestCase.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.converters;
+
+import org.apache.commons.beanutils2.locale.converters.ShortLocaleConverter;
/**
* Test Case for the ShortLocaleConverter class.
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java b/src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java
similarity index 96%
rename from src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java
index 2133d556..1a57597e 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java
@@ -15,11 +15,15 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2;
+package org.apache.commons.beanutils2.sql;
import java.math.BigDecimal;
import java.util.Iterator;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.DynaProperty;
+import org.apache.commons.beanutils2.sql.ResultSetDynaClass;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -100,7 +104,7 @@ public class DynaResultSetTestCase extends TestCase {
public void testGetName() {
assertEquals("DynaClass name",
- "org.apache.commons.beanutils2.ResultSetDynaClass",
+ "org.apache.commons.beanutils2.sql.ResultSetDynaClass",
dynaClass.getName());
}
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java b/src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java
index 3f451b6d..61ea2db3 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2;
+package org.apache.commons.beanutils2.sql;
import java.math.BigDecimal;
import java.sql.ResultSet;
@@ -23,6 +23,10 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.List;
+import org.apache.commons.beanutils2.DynaBean;
+import org.apache.commons.beanutils2.DynaProperty;
+import org.apache.commons.beanutils2.sql.RowSetDynaClass;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -103,7 +107,7 @@ public class DynaRowSetTestCase extends TestCase {
public void testGetName() {
assertEquals("DynaClass name",
- "org.apache.commons.beanutils2.RowSetDynaClass",
+ "org.apache.commons.beanutils2.sql.RowSetDynaClass",
dynaClass.getName());
}
diff --git a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java b/src/test/java/org/apache/commons/beanutils2/sql/TestResultSet.java
similarity index 99%
rename from src/test/java/org/apache/commons/beanutils2/TestResultSet.java
rename to src/test/java/org/apache/commons/beanutils2/sql/TestResultSet.java
index 5126050b..fc97855d 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
+++ b/src/test/java/org/apache/commons/beanutils2/sql/TestResultSet.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2;
+package org.apache.commons.beanutils2.sql;
import java.io.InputStream;
import java.io.Reader;
@@ -39,6 +39,8 @@ import java.sql.Timestamp;
import java.util.Calendar;
import java.util.Map;
+import org.apache.commons.beanutils2.sql.ResultSetDynaClass;
+
/**
* <p>Mock object that implements enough of {@code java.sql.ResultSet}
* to exercise the {@link ResultSetDynaClass} functionality.</p>
diff --git a/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java b/src/test/java/org/apache/commons/beanutils2/sql/TestResultSetMetaData.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
rename to src/test/java/org/apache/commons/beanutils2/sql/TestResultSetMetaData.java
index 8aa657c6..25bb26ed 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
+++ b/src/test/java/org/apache/commons/beanutils2/sql/TestResultSetMetaData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2;
+package org.apache.commons.beanutils2.sql;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
@@ -24,6 +24,8 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Types;
+import org.apache.commons.beanutils2.sql.ResultSetDynaClass;
+
/**
* <p>Mock object that implements enough of
* {@code java.sql.ResultSetMetaData}
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/sql/SqlDateConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlDateConverterTestCase.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils2/converters/sql/SqlDateConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/sql/converters/SqlDateConverterTestCase.java
index b408bf54..fe2cb5f5 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/sql/SqlDateConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlDateConverterTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.converters.sql;
+package org.apache.commons.beanutils2.sql.converters;
import java.sql.Date;
import java.util.Calendar;
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/sql/SqlTimeConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverterTestCase.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils2/converters/sql/SqlTimeConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverterTestCase.java
index dce4571f..07e552d9 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/sql/SqlTimeConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverterTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.converters.sql;
+package org.apache.commons.beanutils2.sql.converters;
import java.sql.Time;
import java.util.Calendar;
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/sql/SqlTimestampConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverterTestCase.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils2/converters/sql/SqlTimestampConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverterTestCase.java
index 61e61f1d..c59c4f13 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/sql/SqlTimestampConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverterTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.converters.sql;
+package org.apache.commons.beanutils2.sql.converters;
import java.sql.Timestamp;
import java.text.DateFormat;