From c6e8f706dc7a236cc2a49f979d857ee92d0abd7c Mon Sep 17 00:00:00 2001 From: Henri Yandell Date: Thu, 10 Dec 2009 11:56:38 +0000 Subject: [PATCH] Renaming class package names and unit test data to use org.apache.commons.lang3. LANG-563 git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@889215 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/commons/lang3/ArrayUtils.java | 8 +-- .../org/apache/commons/lang3/BitField.java | 2 +- .../apache/commons/lang3/BooleanUtils.java | 4 +- .../apache/commons/lang3/CharEncoding.java | 2 +- .../org/apache/commons/lang3/CharRange.java | 2 +- .../org/apache/commons/lang3/CharSet.java | 2 +- .../apache/commons/lang3/CharSetUtils.java | 2 +- .../org/apache/commons/lang3/CharUtils.java | 2 +- .../org/apache/commons/lang3/ClassUtils.java | 2 +- .../org/apache/commons/lang3/EnumUtils.java | 2 +- .../org/apache/commons/lang3/LocaleUtils.java | 2 +- .../org/apache/commons/lang3/ObjectUtils.java | 2 +- .../commons/lang3/RandomStringUtils.java | 2 +- src/java/org/apache/commons/lang3/Range.java | 2 +- .../commons/lang3/SerializationException.java | 2 +- .../commons/lang3/SerializationUtils.java | 2 +- .../commons/lang3/StringEscapeUtils.java | 4 +- .../org/apache/commons/lang3/StringUtils.java | 2 +- .../org/apache/commons/lang3/SystemUtils.java | 2 +- .../org/apache/commons/lang3/Validate.java | 2 +- .../org/apache/commons/lang3/WordUtils.java | 2 +- .../lang3/builder/CompareToBuilder.java | 2 +- .../commons/lang3/builder/EqualsBuilder.java | 2 +- .../lang3/builder/HashCodeBuilder.java | 2 +- .../apache/commons/lang3/builder/IDKey.java | 2 +- .../builder/ReflectionToStringBuilder.java | 6 +- .../lang3/builder/StandardToStringStyle.java | 2 +- .../lang3/builder/ToStringBuilder.java | 4 +- .../commons/lang3/builder/ToStringStyle.java | 8 +-- .../concurrent/BackgroundInitializer.java | 2 +- .../CallableBackgroundInitializer.java | 2 +- .../lang3/concurrent/ConcurrentException.java | 2 +- .../lang3/concurrent/ConcurrentUtils.java | 2 +- .../lang3/concurrent/LazyInitializer.java | 2 +- .../MultiBackgroundInitializer.java | 2 +- .../lang3/exception/ContextedException.java | 2 +- .../exception/ContextedRuntimeException.java | 2 +- .../exception/DefaultExceptionContext.java | 4 +- .../lang3/exception/ExceptionContext.java | 2 +- .../lang3/exception/ExceptionUtils.java | 10 ++-- .../apache/commons/lang3/math/Fraction.java | 2 +- .../commons/lang3/math/IEEE754rUtils.java | 2 +- .../commons/lang3/math/NumberUtils.java | 4 +- .../apache/commons/lang3/mutable/Mutable.java | 2 +- .../commons/lang3/mutable/MutableBoolean.java | 2 +- .../commons/lang3/mutable/MutableByte.java | 2 +- .../commons/lang3/mutable/MutableDouble.java | 2 +- .../commons/lang3/mutable/MutableFloat.java | 2 +- .../commons/lang3/mutable/MutableInt.java | 2 +- .../commons/lang3/mutable/MutableLong.java | 2 +- .../commons/lang3/mutable/MutableObject.java | 2 +- .../commons/lang3/mutable/MutableShort.java | 2 +- .../lang3/reflect/ConstructorUtils.java | 6 +- .../commons/lang3/reflect/FieldUtils.java | 4 +- .../commons/lang3/reflect/MemberUtils.java | 8 +-- .../commons/lang3/reflect/MethodUtils.java | 6 +- .../commons/lang3/reflect/TypeUtils.java | 4 +- .../commons/lang3/text/CompositeFormat.java | 2 +- .../lang3/text/ExtendedMessageFormat.java | 4 +- .../commons/lang3/text/FormatFactory.java | 2 +- .../apache/commons/lang3/text/StrBuilder.java | 6 +- .../apache/commons/lang3/text/StrLookup.java | 2 +- .../apache/commons/lang3/text/StrMatcher.java | 2 +- .../commons/lang3/text/StrSubstitutor.java | 2 +- .../commons/lang3/text/StrTokenizer.java | 4 +- .../text/translate/AggregateTranslator.java | 4 +- .../translate/CharSequenceTranslator.java | 2 +- .../text/translate/CodePointTranslator.java | 2 +- .../lang3/text/translate/EntityArrays.java | 2 +- .../text/translate/LookupTranslator.java | 2 +- .../text/translate/NumericEntityEscaper.java | 2 +- .../translate/NumericEntityUnescaper.java | 2 +- .../lang3/text/translate/UnicodeEscaper.java | 2 +- .../text/translate/UnicodeUnescaper.java | 2 +- .../commons/lang3/time/DateFormatUtils.java | 2 +- .../apache/commons/lang3/time/DateUtils.java | 2 +- .../lang3/time/DurationFormatUtils.java | 4 +- .../commons/lang3/time/FastDateFormat.java | 4 +- .../apache/commons/lang3/time/StopWatch.java | 2 +- src/pending/DateFormatter.java | 2 +- src/pending/DateFormatterTest.java | 2 +- .../commons/lang3/ArrayUtilsAddTest.java | 2 +- .../commons/lang3/ArrayUtilsRemoveTest.java | 2 +- .../apache/commons/lang3/ArrayUtilsTest.java | 2 +- .../apache/commons/lang3/BitFieldTest.java | 2 +- .../commons/lang3/BooleanUtilsTest.java | 2 +- .../commons/lang3/CharEncodingTest.java | 2 +- .../apache/commons/lang3/CharRangeTest.java | 2 +- .../org/apache/commons/lang3/CharSetTest.java | 2 +- .../commons/lang3/CharSetUtilsTest.java | 2 +- .../commons/lang3/CharUtilsPerfRun.java | 2 +- .../apache/commons/lang3/CharUtilsTest.java | 2 +- .../apache/commons/lang3/ClassUtilsTest.java | 56 +++++++++---------- .../apache/commons/lang3/EnumUtilsTest.java | 2 +- .../apache/commons/lang3/LocaleUtilsTest.java | 2 +- .../apache/commons/lang3/ObjectUtilsTest.java | 2 +- .../commons/lang3/RandomStringUtilsTest.java | 2 +- .../org/apache/commons/lang3/RangeTest.java | 2 +- .../commons/lang3/SerializationUtilsTest.java | 2 +- .../commons/lang3/StringEscapeUtilsTest.java | 2 +- .../lang3/StringUtilsEqualsIndexOfTest.java | 2 +- .../commons/lang3/StringUtilsIsTest.java | 2 +- .../lang3/StringUtilsStartsEndsWithTest.java | 2 +- .../lang3/StringUtilsSubstringTest.java | 2 +- .../apache/commons/lang3/StringUtilsTest.java | 2 +- .../lang3/StringUtilsTrimEmptyTest.java | 2 +- .../apache/commons/lang3/SystemUtilsTest.java | 2 +- .../apache/commons/lang3/ValidateTest.java | 2 +- .../apache/commons/lang3/WordUtilsTest.java | 2 +- .../lang3/builder/CompareToBuilderTest.java | 2 +- .../builder/DefaultToStringStyleTest.java | 4 +- .../lang3/builder/EqualsBuilderTest.java | 2 +- .../HashCodeBuilderAndEqualsBuilderTest.java | 2 +- .../lang3/builder/HashCodeBuilderTest.java | 2 +- .../builder/MultiLineToStringStyleTest.java | 6 +- .../NoFieldNamesToStringStyleTest.java | 4 +- .../ReflectionToStringBuilderExcludeTest.java | 4 +- .../builder/ShortPrefixToStringStyleTest.java | 4 +- .../builder/SimpleToStringStyleTest.java | 4 +- .../builder/StandardToStringStyleTest.java | 4 +- .../lang3/builder/ToStringBuilderTest.java | 2 +- .../lang3/builder/ToStringStyleTest.java | 2 +- .../concurrent/BackgroundInitializerTest.java | 2 +- .../CallableBackgroundInitializerTest.java | 2 +- .../lang3/concurrent/ConcurrentUtilsTest.java | 2 +- .../lang3/concurrent/LazyInitializerTest.java | 2 +- .../MultiBackgroundInitializerTest.java | 2 +- .../exception/ContextedExceptionTest.java | 4 +- .../ContextedRuntimeExceptionTest.java | 6 +- .../DefaultExceptionContextTest.java | 4 +- .../lang3/exception/ExceptionUtilsTest.java | 4 +- .../commons/lang3/math/FractionTest.java | 2 +- .../commons/lang3/math/IEEE754rUtilsTest.java | 2 +- .../commons/lang3/math/NumberUtilsTest.java | 4 +- .../lang3/mutable/MutableBooleanTest.java | 2 +- .../lang3/mutable/MutableByteTest.java | 2 +- .../lang3/mutable/MutableDoubleTest.java | 2 +- .../lang3/mutable/MutableFloatTest.java | 2 +- .../commons/lang3/mutable/MutableIntTest.java | 2 +- .../lang3/mutable/MutableLongTest.java | 2 +- .../lang3/mutable/MutableObjectTest.java | 2 +- .../lang3/mutable/MutableShortTest.java | 2 +- .../lang3/reflect/ConstructorUtilsTest.java | 6 +- .../commons/lang3/reflect/FieldUtilsTest.java | 16 +++--- .../lang3/reflect/MethodUtilsTest.java | 10 ++-- .../commons/lang3/reflect/TypeUtilsTest.java | 4 +- .../commons/lang3/reflect/testbed/Ambig.java | 2 +- .../commons/lang3/reflect/testbed/Bar.java | 2 +- .../commons/lang3/reflect/testbed/Foo.java | 2 +- .../lang3/reflect/testbed/GenericParent.java | 2 +- .../reflect/testbed/GenericTypeHolder.java | 2 +- .../commons/lang3/reflect/testbed/Parent.java | 2 +- .../testbed/PrivatelyShadowedChild.java | 2 +- .../lang3/reflect/testbed/PublicChild.java | 2 +- .../testbed/PubliclyShadowedChild.java | 2 +- .../reflect/testbed/StaticContainer.java | 2 +- .../reflect/testbed/StaticContainerChild.java | 2 +- .../testbed/StringParameterizedChild.java | 2 +- .../lang3/text/CompositeFormatTest.java | 2 +- .../lang3/text/ExtendedMessageFormatTest.java | 4 +- .../text/StrBuilderAppendInsertTest.java | 4 +- .../commons/lang3/text/StrBuilderTest.java | 4 +- .../commons/lang3/text/StrLookupTest.java | 2 +- .../commons/lang3/text/StrMatcherTest.java | 2 +- .../lang3/text/StrSubstitutorTest.java | 4 +- .../commons/lang3/text/StrTokenizerTest.java | 6 +- .../text/translate/EntityArraysTest.java | 2 +- .../text/translate/LookupTranslatorTest.java | 2 +- .../translate/NumericEntityEscaperTest.java | 2 +- .../text/translate/UnicodeEscaperTest.java | 2 +- .../text/translate/UnicodeUnescaperTest.java | 2 +- .../lang3/time/DateFormatUtilsTest.java | 2 +- .../lang3/time/DateUtilsFragmentTest.java | 2 +- .../lang3/time/DateUtilsRoundingTest.java | 2 +- .../commons/lang3/time/DateUtilsTest.java | 4 +- .../lang3/time/DurationFormatUtilsTest.java | 2 +- .../lang3/time/FastDateFormatTest.java | 4 +- .../commons/lang3/time/StopWatchTest.java | 2 +- 178 files changed, 274 insertions(+), 274 deletions(-) diff --git a/src/java/org/apache/commons/lang3/ArrayUtils.java b/src/java/org/apache/commons/lang3/ArrayUtils.java index 389a69d34..409cf76a2 100644 --- a/src/java/org/apache/commons/lang3/ArrayUtils.java +++ b/src/java/org/apache/commons/lang3/ArrayUtils.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Array; import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** *

Operations on arrays, primitive arrays (like int[]) and diff --git a/src/java/org/apache/commons/lang3/BitField.java b/src/java/org/apache/commons/lang3/BitField.java index 4693155bd..b6e513c68 100644 --- a/src/java/org/apache/commons/lang3/BitField.java +++ b/src/java/org/apache/commons/lang3/BitField.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; /** *

Operations on bit-mapped fields.

diff --git a/src/java/org/apache/commons/lang3/BooleanUtils.java b/src/java/org/apache/commons/lang3/BooleanUtils.java index 45e199542..80f4f3198 100644 --- a/src/java/org/apache/commons/lang3/BooleanUtils.java +++ b/src/java/org/apache/commons/lang3/BooleanUtils.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; /** *

Operations on boolean primitives and Boolean objects.

diff --git a/src/java/org/apache/commons/lang3/CharEncoding.java b/src/java/org/apache/commons/lang3/CharEncoding.java index 3cb1ba5ac..c363e294a 100644 --- a/src/java/org/apache/commons/lang3/CharEncoding.java +++ b/src/java/org/apache/commons/lang3/CharEncoding.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.io.UnsupportedEncodingException; diff --git a/src/java/org/apache/commons/lang3/CharRange.java b/src/java/org/apache/commons/lang3/CharRange.java index d4b230d1c..f74aa4406 100644 --- a/src/java/org/apache/commons/lang3/CharRange.java +++ b/src/java/org/apache/commons/lang3/CharRange.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.io.Serializable; diff --git a/src/java/org/apache/commons/lang3/CharSet.java b/src/java/org/apache/commons/lang3/CharSet.java index 450144152..2dde55a9c 100644 --- a/src/java/org/apache/commons/lang3/CharSet.java +++ b/src/java/org/apache/commons/lang3/CharSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.io.Serializable; import java.util.HashMap; diff --git a/src/java/org/apache/commons/lang3/CharSetUtils.java b/src/java/org/apache/commons/lang3/CharSetUtils.java index b3b82859f..6add0e2fa 100644 --- a/src/java/org/apache/commons/lang3/CharSetUtils.java +++ b/src/java/org/apache/commons/lang3/CharSetUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; /** *

Operations on CharSets.

diff --git a/src/java/org/apache/commons/lang3/CharUtils.java b/src/java/org/apache/commons/lang3/CharUtils.java index f8d1d4e13..e144f50e5 100644 --- a/src/java/org/apache/commons/lang3/CharUtils.java +++ b/src/java/org/apache/commons/lang3/CharUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; /** *

Operations on char primitives and Character objects.

diff --git a/src/java/org/apache/commons/lang3/ClassUtils.java b/src/java/org/apache/commons/lang3/ClassUtils.java index cf26dd177..b8a9cf267 100644 --- a/src/java/org/apache/commons/lang3/ClassUtils.java +++ b/src/java/org/apache/commons/lang3/ClassUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/src/java/org/apache/commons/lang3/EnumUtils.java b/src/java/org/apache/commons/lang3/EnumUtils.java index 3abb57a7e..90c1a4747 100644 --- a/src/java/org/apache/commons/lang3/EnumUtils.java +++ b/src/java/org/apache/commons/lang3/EnumUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/java/org/apache/commons/lang3/LocaleUtils.java b/src/java/org/apache/commons/lang3/LocaleUtils.java index 5a3b5841b..d32b211f7 100644 --- a/src/java/org/apache/commons/lang3/LocaleUtils.java +++ b/src/java/org/apache/commons/lang3/LocaleUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/java/org/apache/commons/lang3/ObjectUtils.java b/src/java/org/apache/commons/lang3/ObjectUtils.java index e821846fb..fdfc468f9 100644 --- a/src/java/org/apache/commons/lang3/ObjectUtils.java +++ b/src/java/org/apache/commons/lang3/ObjectUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.io.Serializable; diff --git a/src/java/org/apache/commons/lang3/RandomStringUtils.java b/src/java/org/apache/commons/lang3/RandomStringUtils.java index 9d92d4fdc..d61fa31f1 100644 --- a/src/java/org/apache/commons/lang3/RandomStringUtils.java +++ b/src/java/org/apache/commons/lang3/RandomStringUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.util.Random; /** diff --git a/src/java/org/apache/commons/lang3/Range.java b/src/java/org/apache/commons/lang3/Range.java index e48efa8da..69d3fc78a 100644 --- a/src/java/org/apache/commons/lang3/Range.java +++ b/src/java/org/apache/commons/lang3/Range.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.io.Serializable; import java.util.Comparator; diff --git a/src/java/org/apache/commons/lang3/SerializationException.java b/src/java/org/apache/commons/lang3/SerializationException.java index ce945eec6..dc6334314 100644 --- a/src/java/org/apache/commons/lang3/SerializationException.java +++ b/src/java/org/apache/commons/lang3/SerializationException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; /** *

Exception thrown when the Serialization process fails.

diff --git a/src/java/org/apache/commons/lang3/SerializationUtils.java b/src/java/org/apache/commons/lang3/SerializationUtils.java index 07ce3aacf..b9370f24a 100644 --- a/src/java/org/apache/commons/lang3/SerializationUtils.java +++ b/src/java/org/apache/commons/lang3/SerializationUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/java/org/apache/commons/lang3/StringEscapeUtils.java b/src/java/org/apache/commons/lang3/StringEscapeUtils.java index d9205e91e..b5a96fef3 100644 --- a/src/java/org/apache/commons/lang3/StringEscapeUtils.java +++ b/src/java/org/apache/commons/lang3/StringEscapeUtils.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.io.IOException; import java.io.Writer; -import org.apache.commons.lang.text.translate.*; +import org.apache.commons.lang3.text.translate.*; /** *

Escapes and unescapes Strings for diff --git a/src/java/org/apache/commons/lang3/StringUtils.java b/src/java/org/apache/commons/lang3/StringUtils.java index 05e0b3b4f..1b7214368 100644 --- a/src/java/org/apache/commons/lang3/StringUtils.java +++ b/src/java/org/apache/commons/lang3/StringUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/java/org/apache/commons/lang3/SystemUtils.java b/src/java/org/apache/commons/lang3/SystemUtils.java index 9f252d52e..2927a2710 100644 --- a/src/java/org/apache/commons/lang3/SystemUtils.java +++ b/src/java/org/apache/commons/lang3/SystemUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.io.File; diff --git a/src/java/org/apache/commons/lang3/Validate.java b/src/java/org/apache/commons/lang3/Validate.java index a38e0eeea..36672315b 100644 --- a/src/java/org/apache/commons/lang3/Validate.java +++ b/src/java/org/apache/commons/lang3/Validate.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.util.Collection; import java.util.Iterator; diff --git a/src/java/org/apache/commons/lang3/WordUtils.java b/src/java/org/apache/commons/lang3/WordUtils.java index faf4ccf4f..f72b5980c 100644 --- a/src/java/org/apache/commons/lang3/WordUtils.java +++ b/src/java/org/apache/commons/lang3/WordUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; /** *

Operations on Strings that contain words.

diff --git a/src/java/org/apache/commons/lang3/builder/CompareToBuilder.java b/src/java/org/apache/commons/lang3/builder/CompareToBuilder.java index 9556cb818..e2c4043fe 100644 --- a/src/java/org/apache/commons/lang3/builder/CompareToBuilder.java +++ b/src/java/org/apache/commons/lang3/builder/CompareToBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; diff --git a/src/java/org/apache/commons/lang3/builder/EqualsBuilder.java b/src/java/org/apache/commons/lang3/builder/EqualsBuilder.java index 3200306c0..af33dde61 100644 --- a/src/java/org/apache/commons/lang3/builder/EqualsBuilder.java +++ b/src/java/org/apache/commons/lang3/builder/EqualsBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; diff --git a/src/java/org/apache/commons/lang3/builder/HashCodeBuilder.java b/src/java/org/apache/commons/lang3/builder/HashCodeBuilder.java index ada99ac51..717caa49a 100644 --- a/src/java/org/apache/commons/lang3/builder/HashCodeBuilder.java +++ b/src/java/org/apache/commons/lang3/builder/HashCodeBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; diff --git a/src/java/org/apache/commons/lang3/builder/IDKey.java b/src/java/org/apache/commons/lang3/builder/IDKey.java index 078217a7b..7e686a176 100644 --- a/src/java/org/apache/commons/lang3/builder/IDKey.java +++ b/src/java/org/apache/commons/lang3/builder/IDKey.java @@ -16,7 +16,7 @@ * */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; // adapted from org.apache.axis.utils.IDKey diff --git a/src/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java b/src/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java index 0fb4fdc2b..30fabf116 100644 --- a/src/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java +++ b/src/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; @@ -26,8 +26,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.ClassUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ClassUtils; /** *

diff --git a/src/java/org/apache/commons/lang3/builder/StandardToStringStyle.java b/src/java/org/apache/commons/lang3/builder/StandardToStringStyle.java index 70e839d0f..3da17bb27 100644 --- a/src/java/org/apache/commons/lang3/builder/StandardToStringStyle.java +++ b/src/java/org/apache/commons/lang3/builder/StandardToStringStyle.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; /** *

Works with {@link ToStringBuilder} to create a toString.

diff --git a/src/java/org/apache/commons/lang3/builder/ToStringBuilder.java b/src/java/org/apache/commons/lang3/builder/ToStringBuilder.java index 2a7ba8c37..c368126b6 100644 --- a/src/java/org/apache/commons/lang3/builder/ToStringBuilder.java +++ b/src/java/org/apache/commons/lang3/builder/ToStringBuilder.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; /** *

Assists in implementing {@link Object#toString()} methods.

diff --git a/src/java/org/apache/commons/lang3/builder/ToStringStyle.java b/src/java/org/apache/commons/lang3/builder/ToStringStyle.java index 97e8acab1..9f2096bb7 100644 --- a/src/java/org/apache/commons/lang3/builder/ToStringStyle.java +++ b/src/java/org/apache/commons/lang3/builder/ToStringStyle.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.io.Serializable; import java.lang.reflect.Array; @@ -23,9 +23,9 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.ClassUtils; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.ClassUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.SystemUtils; /** *

Controls String formatting for {@link ToStringBuilder}. diff --git a/src/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java b/src/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java index 9aec68590..3b062d27f 100644 --- a/src/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java +++ b/src/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.concurrent; +package org.apache.commons.lang3.concurrent; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; diff --git a/src/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java b/src/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java index be34d4b19..138ff7c98 100644 --- a/src/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java +++ b/src/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.concurrent; +package org.apache.commons.lang3.concurrent; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; diff --git a/src/java/org/apache/commons/lang3/concurrent/ConcurrentException.java b/src/java/org/apache/commons/lang3/concurrent/ConcurrentException.java index 9bc459155..5d5831f3e 100644 --- a/src/java/org/apache/commons/lang3/concurrent/ConcurrentException.java +++ b/src/java/org/apache/commons/lang3/concurrent/ConcurrentException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.concurrent; +package org.apache.commons.lang3.concurrent; /** *

diff --git a/src/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java b/src/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java index 032bfdaca..20c060963 100644 --- a/src/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java +++ b/src/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.concurrent; +package org.apache.commons.lang3.concurrent; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/src/java/org/apache/commons/lang3/concurrent/LazyInitializer.java b/src/java/org/apache/commons/lang3/concurrent/LazyInitializer.java index 047db8113..e87ee87ca 100644 --- a/src/java/org/apache/commons/lang3/concurrent/LazyInitializer.java +++ b/src/java/org/apache/commons/lang3/concurrent/LazyInitializer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.concurrent; +package org.apache.commons.lang3.concurrent; /** *

diff --git a/src/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java b/src/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java index c5771cb98..47659a45e 100644 --- a/src/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java +++ b/src/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.concurrent; +package org.apache.commons.lang3.concurrent; import java.util.Collections; import java.util.HashMap; diff --git a/src/java/org/apache/commons/lang3/exception/ContextedException.java b/src/java/org/apache/commons/lang3/exception/ContextedException.java index 99a79c986..b63821e30 100644 --- a/src/java/org/apache/commons/lang3/exception/ContextedException.java +++ b/src/java/org/apache/commons/lang3/exception/ContextedException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.exception; +package org.apache.commons.lang3.exception; import java.util.Set; diff --git a/src/java/org/apache/commons/lang3/exception/ContextedRuntimeException.java b/src/java/org/apache/commons/lang3/exception/ContextedRuntimeException.java index 67fc0b0bb..fca8d19f3 100644 --- a/src/java/org/apache/commons/lang3/exception/ContextedRuntimeException.java +++ b/src/java/org/apache/commons/lang3/exception/ContextedRuntimeException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.exception; +package org.apache.commons.lang3.exception; import java.util.Set; diff --git a/src/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java b/src/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java index 90956503d..4a1f371ce 100644 --- a/src/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java +++ b/src/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.exception; +package org.apache.commons.lang3.exception; import java.io.Serializable; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; /** * Default implementation of the context storing the label-value pairs for contexted exceptions. diff --git a/src/java/org/apache/commons/lang3/exception/ExceptionContext.java b/src/java/org/apache/commons/lang3/exception/ExceptionContext.java index 4d43f6cc8..4901cce7c 100644 --- a/src/java/org/apache/commons/lang3/exception/ExceptionContext.java +++ b/src/java/org/apache/commons/lang3/exception/ExceptionContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.exception; +package org.apache.commons.lang3.exception; import java.util.Set; diff --git a/src/java/org/apache/commons/lang3/exception/ExceptionUtils.java b/src/java/org/apache/commons/lang3/exception/ExceptionUtils.java index f78a4dbc8..43defd966 100644 --- a/src/java/org/apache/commons/lang3/exception/ExceptionUtils.java +++ b/src/java/org/apache/commons/lang3/exception/ExceptionUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.exception; +package org.apache.commons.lang3.exception; import java.io.PrintStream; import java.io.PrintWriter; @@ -28,10 +28,10 @@ import java.util.Arrays; import java.util.List; import java.util.StringTokenizer; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.ClassUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ClassUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.SystemUtils; /** *

Provides utilities for manipulating and examining diff --git a/src/java/org/apache/commons/lang3/math/Fraction.java b/src/java/org/apache/commons/lang3/math/Fraction.java index 5665aa8f7..cdb2493b0 100644 --- a/src/java/org/apache/commons/lang3/math/Fraction.java +++ b/src/java/org/apache/commons/lang3/math/Fraction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.math; +package org.apache.commons.lang3.math; import java.math.BigInteger; diff --git a/src/java/org/apache/commons/lang3/math/IEEE754rUtils.java b/src/java/org/apache/commons/lang3/math/IEEE754rUtils.java index c82f8bf90..8d29925d1 100644 --- a/src/java/org/apache/commons/lang3/math/IEEE754rUtils.java +++ b/src/java/org/apache/commons/lang3/math/IEEE754rUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.math; +package org.apache.commons.lang3.math; /** *

Provides IEEE-754r variants of NumberUtils methods.

diff --git a/src/java/org/apache/commons/lang3/math/NumberUtils.java b/src/java/org/apache/commons/lang3/math/NumberUtils.java index dbde87aa8..d3054f3fb 100644 --- a/src/java/org/apache/commons/lang3/math/NumberUtils.java +++ b/src/java/org/apache/commons/lang3/math/NumberUtils.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.math; +package org.apache.commons.lang3.math; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** *

Provides extra functionality for Java Number classes.

diff --git a/src/java/org/apache/commons/lang3/mutable/Mutable.java b/src/java/org/apache/commons/lang3/mutable/Mutable.java index 962868e74..5c67a46b4 100644 --- a/src/java/org/apache/commons/lang3/mutable/Mutable.java +++ b/src/java/org/apache/commons/lang3/mutable/Mutable.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; /** * Provides mutable access to a value. diff --git a/src/java/org/apache/commons/lang3/mutable/MutableBoolean.java b/src/java/org/apache/commons/lang3/mutable/MutableBoolean.java index 777eddabe..b989fe12e 100644 --- a/src/java/org/apache/commons/lang3/mutable/MutableBoolean.java +++ b/src/java/org/apache/commons/lang3/mutable/MutableBoolean.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; import java.io.Serializable; diff --git a/src/java/org/apache/commons/lang3/mutable/MutableByte.java b/src/java/org/apache/commons/lang3/mutable/MutableByte.java index eafea1f35..d7df23ef9 100644 --- a/src/java/org/apache/commons/lang3/mutable/MutableByte.java +++ b/src/java/org/apache/commons/lang3/mutable/MutableByte.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; /** * A mutable byte wrapper. diff --git a/src/java/org/apache/commons/lang3/mutable/MutableDouble.java b/src/java/org/apache/commons/lang3/mutable/MutableDouble.java index 668eb3816..0c834c185 100644 --- a/src/java/org/apache/commons/lang3/mutable/MutableDouble.java +++ b/src/java/org/apache/commons/lang3/mutable/MutableDouble.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; /** * A mutable double wrapper. diff --git a/src/java/org/apache/commons/lang3/mutable/MutableFloat.java b/src/java/org/apache/commons/lang3/mutable/MutableFloat.java index 03f6facd1..1b5a29aa5 100644 --- a/src/java/org/apache/commons/lang3/mutable/MutableFloat.java +++ b/src/java/org/apache/commons/lang3/mutable/MutableFloat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; /** * A mutable float wrapper. diff --git a/src/java/org/apache/commons/lang3/mutable/MutableInt.java b/src/java/org/apache/commons/lang3/mutable/MutableInt.java index 268fdfb0b..558a7f11b 100644 --- a/src/java/org/apache/commons/lang3/mutable/MutableInt.java +++ b/src/java/org/apache/commons/lang3/mutable/MutableInt.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; /** * A mutable int wrapper. diff --git a/src/java/org/apache/commons/lang3/mutable/MutableLong.java b/src/java/org/apache/commons/lang3/mutable/MutableLong.java index 3c0c267c2..2b2be0403 100644 --- a/src/java/org/apache/commons/lang3/mutable/MutableLong.java +++ b/src/java/org/apache/commons/lang3/mutable/MutableLong.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; /** * A mutable long wrapper. diff --git a/src/java/org/apache/commons/lang3/mutable/MutableObject.java b/src/java/org/apache/commons/lang3/mutable/MutableObject.java index 8fef0ace9..52cc6be8d 100644 --- a/src/java/org/apache/commons/lang3/mutable/MutableObject.java +++ b/src/java/org/apache/commons/lang3/mutable/MutableObject.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; import java.io.Serializable; diff --git a/src/java/org/apache/commons/lang3/mutable/MutableShort.java b/src/java/org/apache/commons/lang3/mutable/MutableShort.java index aeb425b2a..8d7789dca 100644 --- a/src/java/org/apache/commons/lang3/mutable/MutableShort.java +++ b/src/java/org/apache/commons/lang3/mutable/MutableShort.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; /** * A mutable short wrapper. diff --git a/src/java/org/apache/commons/lang3/reflect/ConstructorUtils.java b/src/java/org/apache/commons/lang3/reflect/ConstructorUtils.java index a7e9e4844..e485b92f3 100644 --- a/src/java/org/apache/commons/lang3/reflect/ConstructorUtils.java +++ b/src/java/org/apache/commons/lang3/reflect/ConstructorUtils.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect; +package org.apache.commons.lang3.reflect; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.ClassUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ClassUtils; /** *

Utility reflection methods focussed on constructors, modelled after {@link MethodUtils}.

diff --git a/src/java/org/apache/commons/lang3/reflect/FieldUtils.java b/src/java/org/apache/commons/lang3/reflect/FieldUtils.java index 7390249fa..a3d0da16c 100644 --- a/src/java/org/apache/commons/lang3/reflect/FieldUtils.java +++ b/src/java/org/apache/commons/lang3/reflect/FieldUtils.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect; +package org.apache.commons.lang3.reflect; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Iterator; -import org.apache.commons.lang.ClassUtils; +import org.apache.commons.lang3.ClassUtils; /** * Utilities for working with fields by reflection. Adapted and refactored diff --git a/src/java/org/apache/commons/lang3/reflect/MemberUtils.java b/src/java/org/apache/commons/lang3/reflect/MemberUtils.java index e919b6433..efcebbb06 100644 --- a/src/java/org/apache/commons/lang3/reflect/MemberUtils.java +++ b/src/java/org/apache/commons/lang3/reflect/MemberUtils.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect; +package org.apache.commons.lang3.reflect; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Member; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.ClassUtils; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ClassUtils; +import org.apache.commons.lang3.SystemUtils; /** * Contains common code for working with Methods/Constructors, extracted and diff --git a/src/java/org/apache/commons/lang3/reflect/MethodUtils.java b/src/java/org/apache/commons/lang3/reflect/MethodUtils.java index 44b2c0526..a2b8ef261 100644 --- a/src/java/org/apache/commons/lang3/reflect/MethodUtils.java +++ b/src/java/org/apache/commons/lang3/reflect/MethodUtils.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect; +package org.apache.commons.lang3.reflect; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.ClassUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ClassUtils; /** *

Utility reflection methods focused on methods, originally from Commons BeanUtils. diff --git a/src/java/org/apache/commons/lang3/reflect/TypeUtils.java b/src/java/org/apache/commons/lang3/reflect/TypeUtils.java index 79d3a4d4e..9e1b78de5 100644 --- a/src/java/org/apache/commons/lang3/reflect/TypeUtils.java +++ b/src/java/org/apache/commons/lang3/reflect/TypeUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect; +package org.apache.commons.lang3.reflect; import java.lang.reflect.Array; import java.lang.reflect.GenericArrayType; @@ -22,7 +22,7 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** *

Utility methods focusing on type inspection, particularly with regard to diff --git a/src/java/org/apache/commons/lang3/text/CompositeFormat.java b/src/java/org/apache/commons/lang3/text/CompositeFormat.java index ba74d9b10..7a3a31b16 100644 --- a/src/java/org/apache/commons/lang3/text/CompositeFormat.java +++ b/src/java/org/apache/commons/lang3/text/CompositeFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.text.FieldPosition; import java.text.Format; diff --git a/src/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java b/src/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java index 1e01a0673..d275f3cdc 100644 --- a/src/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java +++ b/src/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.text.Format; import java.text.MessageFormat; @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.Locale; import java.util.Map; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Extends java.text.MessageFormat to allow pluggable/additional formatting diff --git a/src/java/org/apache/commons/lang3/text/FormatFactory.java b/src/java/org/apache/commons/lang3/text/FormatFactory.java index 6a9614f39..8693039c7 100644 --- a/src/java/org/apache/commons/lang3/text/FormatFactory.java +++ b/src/java/org/apache/commons/lang3/text/FormatFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.text.Format; import java.util.Locale; diff --git a/src/java/org/apache/commons/lang3/text/StrBuilder.java b/src/java/org/apache/commons/lang3/text/StrBuilder.java index 402a6853a..52ff59507 100644 --- a/src/java/org/apache/commons/lang3/text/StrBuilder.java +++ b/src/java/org/apache/commons/lang3/text/StrBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.io.Reader; import java.io.Writer; @@ -22,8 +22,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.SystemUtils; /** * Builds a string from constituent parts providing a more flexible and powerful API diff --git a/src/java/org/apache/commons/lang3/text/StrLookup.java b/src/java/org/apache/commons/lang3/text/StrLookup.java index cd5286cc0..2f1cef85b 100644 --- a/src/java/org/apache/commons/lang3/text/StrLookup.java +++ b/src/java/org/apache/commons/lang3/text/StrLookup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.util.Map; diff --git a/src/java/org/apache/commons/lang3/text/StrMatcher.java b/src/java/org/apache/commons/lang3/text/StrMatcher.java index 15e4832c5..aaea987f4 100644 --- a/src/java/org/apache/commons/lang3/text/StrMatcher.java +++ b/src/java/org/apache/commons/lang3/text/StrMatcher.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.util.Arrays; diff --git a/src/java/org/apache/commons/lang3/text/StrSubstitutor.java b/src/java/org/apache/commons/lang3/text/StrSubstitutor.java index e0bf5196d..e828c1e3f 100644 --- a/src/java/org/apache/commons/lang3/text/StrSubstitutor.java +++ b/src/java/org/apache/commons/lang3/text/StrSubstitutor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.util.ArrayList; import java.util.List; diff --git a/src/java/org/apache/commons/lang3/text/StrTokenizer.java b/src/java/org/apache/commons/lang3/text/StrTokenizer.java index 5870a1fbb..5e45f08a5 100644 --- a/src/java/org/apache/commons/lang3/text/StrTokenizer.java +++ b/src/java/org/apache/commons/lang3/text/StrTokenizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.util.ArrayList; import java.util.Collections; @@ -22,7 +22,7 @@ import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; /** * Tokenizes a string based based on delimiters (separators) diff --git a/src/java/org/apache/commons/lang3/text/translate/AggregateTranslator.java b/src/java/org/apache/commons/lang3/text/translate/AggregateTranslator.java index db5c0f3a0..9b66b54bb 100644 --- a/src/java/org/apache/commons/lang3/text/translate/AggregateTranslator.java +++ b/src/java/org/apache/commons/lang3/text/translate/AggregateTranslator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import java.io.IOException; import java.io.Writer; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; /** * Executes a sequence of translators one after the other. Execution ends whenever diff --git a/src/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java b/src/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java index f1e2212e3..ecf46560b 100644 --- a/src/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java +++ b/src/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import java.io.IOException; import java.io.Writer; diff --git a/src/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java b/src/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java index 27ec94cb8..ab13e65f8 100644 --- a/src/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java +++ b/src/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import java.io.IOException; import java.io.Writer; diff --git a/src/java/org/apache/commons/lang3/text/translate/EntityArrays.java b/src/java/org/apache/commons/lang3/text/translate/EntityArrays.java index 1fcb0df41..bde51adb0 100644 --- a/src/java/org/apache/commons/lang3/text/translate/EntityArrays.java +++ b/src/java/org/apache/commons/lang3/text/translate/EntityArrays.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; /** * Class holding various entity data for HTML and XML - generally for use with diff --git a/src/java/org/apache/commons/lang3/text/translate/LookupTranslator.java b/src/java/org/apache/commons/lang3/text/translate/LookupTranslator.java index f228c25c0..01dd14c66 100644 --- a/src/java/org/apache/commons/lang3/text/translate/LookupTranslator.java +++ b/src/java/org/apache/commons/lang3/text/translate/LookupTranslator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import java.io.IOException; import java.io.Writer; diff --git a/src/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java b/src/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java index 169781653..44efb7cd7 100644 --- a/src/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java +++ b/src/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import java.io.IOException; import java.io.Writer; diff --git a/src/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java b/src/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java index 7180bc80a..12a066387 100644 --- a/src/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java +++ b/src/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import java.io.IOException; import java.io.Writer; diff --git a/src/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java b/src/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java index a5a7c10ce..002a25f2d 100644 --- a/src/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java +++ b/src/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import java.io.IOException; import java.io.Writer; diff --git a/src/java/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java b/src/java/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java index 68711c2e4..c739aab89 100644 --- a/src/java/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java +++ b/src/java/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import java.io.IOException; import java.io.Writer; diff --git a/src/java/org/apache/commons/lang3/time/DateFormatUtils.java b/src/java/org/apache/commons/lang3/time/DateFormatUtils.java index 3d29b4e94..227904165 100644 --- a/src/java/org/apache/commons/lang3/time/DateFormatUtils.java +++ b/src/java/org/apache/commons/lang3/time/DateFormatUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.time; +package org.apache.commons.lang3.time; import java.util.Calendar; import java.util.Date; diff --git a/src/java/org/apache/commons/lang3/time/DateUtils.java b/src/java/org/apache/commons/lang3/time/DateUtils.java index 790ded6b1..6581638af 100644 --- a/src/java/org/apache/commons/lang3/time/DateUtils.java +++ b/src/java/org/apache/commons/lang3/time/DateUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.time; +package org.apache.commons.lang3.time; import java.text.ParseException; import java.text.ParsePosition; diff --git a/src/java/org/apache/commons/lang3/time/DurationFormatUtils.java b/src/java/org/apache/commons/lang3/time/DurationFormatUtils.java index 48e7dbee1..2664cb157 100644 --- a/src/java/org/apache/commons/lang3/time/DurationFormatUtils.java +++ b/src/java/org/apache/commons/lang3/time/DurationFormatUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.time; +package org.apache.commons.lang3.time; import java.util.ArrayList; import java.util.Calendar; @@ -22,7 +22,7 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.TimeZone; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** *

Duration formatting utilities and constants. The following table describes the tokens diff --git a/src/java/org/apache/commons/lang3/time/FastDateFormat.java b/src/java/org/apache/commons/lang3/time/FastDateFormat.java index 8e4c0b86d..6b10a94f0 100644 --- a/src/java/org/apache/commons/lang3/time/FastDateFormat.java +++ b/src/java/org/apache/commons/lang3/time/FastDateFormat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.time; +package org.apache.commons.lang3.time; import java.io.IOException; import java.io.ObjectInputStream; @@ -34,7 +34,7 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** *

FastDateFormat is a fast and thread-safe version of diff --git a/src/java/org/apache/commons/lang3/time/StopWatch.java b/src/java/org/apache/commons/lang3/time/StopWatch.java index 347c5a893..e14186f89 100644 --- a/src/java/org/apache/commons/lang3/time/StopWatch.java +++ b/src/java/org/apache/commons/lang3/time/StopWatch.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.time; +package org.apache.commons.lang3.time; /** *

diff --git a/src/pending/DateFormatter.java b/src/pending/DateFormatter.java index 29f7b1571..411da8e38 100644 --- a/src/pending/DateFormatter.java +++ b/src/pending/DateFormatter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.text.DateFormat; import java.text.DateFormatSymbols; diff --git a/src/pending/DateFormatterTest.java b/src/pending/DateFormatterTest.java index 05035a31b..5e948d41e 100644 --- a/src/pending/DateFormatterTest.java +++ b/src/pending/DateFormatterTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/src/test/org/apache/commons/lang3/ArrayUtilsAddTest.java b/src/test/org/apache/commons/lang3/ArrayUtilsAddTest.java index 23ab9ce7b..6fe6ef798 100644 --- a/src/test/org/apache/commons/lang3/ArrayUtilsAddTest.java +++ b/src/test/org/apache/commons/lang3/ArrayUtilsAddTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.util.Arrays; diff --git a/src/test/org/apache/commons/lang3/ArrayUtilsRemoveTest.java b/src/test/org/apache/commons/lang3/ArrayUtilsRemoveTest.java index 93848db2c..2833fb8aa 100644 --- a/src/test/org/apache/commons/lang3/ArrayUtilsRemoveTest.java +++ b/src/test/org/apache/commons/lang3/ArrayUtilsRemoveTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.util.Arrays; diff --git a/src/test/org/apache/commons/lang3/ArrayUtilsTest.java b/src/test/org/apache/commons/lang3/ArrayUtilsTest.java index 1f12fea19..e5126b99b 100644 --- a/src/test/org/apache/commons/lang3/ArrayUtilsTest.java +++ b/src/test/org/apache/commons/lang3/ArrayUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/BitFieldTest.java b/src/test/org/apache/commons/lang3/BitFieldTest.java index 5cde68e19..135aa1849 100644 --- a/src/test/org/apache/commons/lang3/BitFieldTest.java +++ b/src/test/org/apache/commons/lang3/BitFieldTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/BooleanUtilsTest.java b/src/test/org/apache/commons/lang3/BooleanUtilsTest.java index 972503569..04ae92dce 100644 --- a/src/test/org/apache/commons/lang3/BooleanUtilsTest.java +++ b/src/test/org/apache/commons/lang3/BooleanUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/CharEncodingTest.java b/src/test/org/apache/commons/lang3/CharEncodingTest.java index 2a2c24d71..91cbb945c 100644 --- a/src/test/org/apache/commons/lang3/CharEncodingTest.java +++ b/src/test/org/apache/commons/lang3/CharEncodingTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/CharRangeTest.java b/src/test/org/apache/commons/lang3/CharRangeTest.java index 6c2640cca..d4e772967 100644 --- a/src/test/org/apache/commons/lang3/CharRangeTest.java +++ b/src/test/org/apache/commons/lang3/CharRangeTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/CharSetTest.java b/src/test/org/apache/commons/lang3/CharSetTest.java index 2a74f9037..51ef6b5b3 100644 --- a/src/test/org/apache/commons/lang3/CharSetTest.java +++ b/src/test/org/apache/commons/lang3/CharSetTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/CharSetUtilsTest.java b/src/test/org/apache/commons/lang3/CharSetUtilsTest.java index 3be17fc23..218bc11aa 100644 --- a/src/test/org/apache/commons/lang3/CharSetUtilsTest.java +++ b/src/test/org/apache/commons/lang3/CharSetUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/CharUtilsPerfRun.java b/src/test/org/apache/commons/lang3/CharUtilsPerfRun.java index b410ef432..fad99a365 100644 --- a/src/test/org/apache/commons/lang3/CharUtilsPerfRun.java +++ b/src/test/org/apache/commons/lang3/CharUtilsPerfRun.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.text.NumberFormat; import java.util.Calendar; diff --git a/src/test/org/apache/commons/lang3/CharUtilsTest.java b/src/test/org/apache/commons/lang3/CharUtilsTest.java index 19b607716..a293577ef 100644 --- a/src/test/org/apache/commons/lang3/CharUtilsTest.java +++ b/src/test/org/apache/commons/lang3/CharUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/ClassUtilsTest.java b/src/test/org/apache/commons/lang3/ClassUtilsTest.java index 12f63355e..f0ebf1b6f 100644 --- a/src/test/org/apache/commons/lang3/ClassUtilsTest.java +++ b/src/test/org/apache/commons/lang3/ClassUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -34,7 +34,7 @@ import junit.textui.TestRunner; /** - * Unit tests {@link org.apache.commons.lang.ClassUtils}. + * Unit tests {@link org.apache.commons.lang3.ClassUtils}. * * @author Apache Software Foundation * @author Gary D. Gregory @@ -132,8 +132,8 @@ public class ClassUtilsTest extends TestCase { // ------------------------------------------------------------------------- public void test_getPackageName_Object() { - assertEquals("org.apache.commons.lang", ClassUtils.getPackageName(new ClassUtils(), "")); - assertEquals("org.apache.commons.lang", ClassUtils.getPackageName(new Inner(), "")); + assertEquals("org.apache.commons.lang3", ClassUtils.getPackageName(new ClassUtils(), "")); + assertEquals("org.apache.commons.lang3", ClassUtils.getPackageName(new Inner(), "")); assertEquals("", ClassUtils.getPackageName(null, "")); } @@ -162,7 +162,7 @@ public class ClassUtilsTest extends TestCase { } public void test_getPackageName_String() { - assertEquals("org.apache.commons.lang", ClassUtils.getPackageName(ClassUtils.class.getName())); + assertEquals("org.apache.commons.lang3", ClassUtils.getPackageName(ClassUtils.class.getName())); assertEquals("java.util", ClassUtils.getPackageName(Map.Entry.class.getName())); assertEquals("", ClassUtils.getPackageName((String)null)); assertEquals("", ClassUtils.getPackageName("")); @@ -511,8 +511,8 @@ public class ClassUtilsTest extends TestCase { assertEquals("String.class -> String.class", String.class, ClassUtils.primitiveToWrapper(String.class)); assertEquals("ClassUtils.class -> ClassUtils.class", - org.apache.commons.lang.ClassUtils.class, - ClassUtils.primitiveToWrapper(org.apache.commons.lang.ClassUtils.class)); + org.apache.commons.lang3.ClassUtils.class, + ClassUtils.primitiveToWrapper(org.apache.commons.lang3.ClassUtils.class)); assertEquals("Void.TYPE -> Void.TYPE", Void.TYPE, ClassUtils.primitiveToWrapper(Void.TYPE)); @@ -773,11 +773,11 @@ public class ClassUtilsTest extends TestCase { } public void test_getShortCanonicalName_String() { - assertEquals("ClassUtils", ClassUtils.getShortCanonicalName("org.apache.commons.lang.ClassUtils")); - assertEquals("ClassUtils[]", ClassUtils.getShortCanonicalName("[Lorg.apache.commons.lang.ClassUtils;")); - assertEquals("ClassUtils[][]", ClassUtils.getShortCanonicalName("[[Lorg.apache.commons.lang.ClassUtils;")); - assertEquals("ClassUtils[]", ClassUtils.getShortCanonicalName("org.apache.commons.lang.ClassUtils[]")); - assertEquals("ClassUtils[][]", ClassUtils.getShortCanonicalName("org.apache.commons.lang.ClassUtils[][]")); + assertEquals("ClassUtils", ClassUtils.getShortCanonicalName("org.apache.commons.lang3.ClassUtils")); + assertEquals("ClassUtils[]", ClassUtils.getShortCanonicalName("[Lorg.apache.commons.lang3.ClassUtils;")); + assertEquals("ClassUtils[][]", ClassUtils.getShortCanonicalName("[[Lorg.apache.commons.lang3.ClassUtils;")); + assertEquals("ClassUtils[]", ClassUtils.getShortCanonicalName("org.apache.commons.lang3.ClassUtils[]")); + assertEquals("ClassUtils[][]", ClassUtils.getShortCanonicalName("org.apache.commons.lang3.ClassUtils[][]")); assertEquals("int[]", ClassUtils.getShortCanonicalName("[I")); assertEquals("int[][]", ClassUtils.getShortCanonicalName("[[I")); assertEquals("int[]", ClassUtils.getShortCanonicalName("int[]")); @@ -786,32 +786,32 @@ public class ClassUtilsTest extends TestCase { public void test_getPackageCanonicalName_Object() { assertEquals("", ClassUtils.getPackageCanonicalName(null, "")); - assertEquals("org.apache.commons.lang", ClassUtils.getPackageCanonicalName(new ClassUtils(), "")); - assertEquals("org.apache.commons.lang", ClassUtils.getPackageCanonicalName(new ClassUtils[0], "")); - assertEquals("org.apache.commons.lang", ClassUtils.getPackageCanonicalName(new ClassUtils[0][0], "")); + assertEquals("org.apache.commons.lang3", ClassUtils.getPackageCanonicalName(new ClassUtils(), "")); + assertEquals("org.apache.commons.lang3", ClassUtils.getPackageCanonicalName(new ClassUtils[0], "")); + assertEquals("org.apache.commons.lang3", ClassUtils.getPackageCanonicalName(new ClassUtils[0][0], "")); assertEquals("", ClassUtils.getPackageCanonicalName(new int[0], "")); assertEquals("", ClassUtils.getPackageCanonicalName(new int[0][0], "")); } public void test_getPackageCanonicalName_Class() { - assertEquals("org.apache.commons.lang", ClassUtils.getPackageCanonicalName(ClassUtils.class)); - assertEquals("org.apache.commons.lang", ClassUtils.getPackageCanonicalName(ClassUtils[].class)); - assertEquals("org.apache.commons.lang", ClassUtils.getPackageCanonicalName(ClassUtils[][].class)); + assertEquals("org.apache.commons.lang3", ClassUtils.getPackageCanonicalName(ClassUtils.class)); + assertEquals("org.apache.commons.lang3", ClassUtils.getPackageCanonicalName(ClassUtils[].class)); + assertEquals("org.apache.commons.lang3", ClassUtils.getPackageCanonicalName(ClassUtils[][].class)); assertEquals("", ClassUtils.getPackageCanonicalName(int[].class)); assertEquals("", ClassUtils.getPackageCanonicalName(int[][].class)); } public void test_getPackageCanonicalName_String() { - assertEquals("org.apache.commons.lang", - ClassUtils.getPackageCanonicalName("org.apache.commons.lang.ClassUtils")); - assertEquals("org.apache.commons.lang", - ClassUtils.getPackageCanonicalName("[Lorg.apache.commons.lang.ClassUtils;")); - assertEquals("org.apache.commons.lang", - ClassUtils.getPackageCanonicalName("[[Lorg.apache.commons.lang.ClassUtils;")); - assertEquals("org.apache.commons.lang", - ClassUtils.getPackageCanonicalName("org.apache.commons.lang.ClassUtils[]")); - assertEquals("org.apache.commons.lang", - ClassUtils.getPackageCanonicalName("org.apache.commons.lang.ClassUtils[][]")); + assertEquals("org.apache.commons.lang3", + ClassUtils.getPackageCanonicalName("org.apache.commons.lang3.ClassUtils")); + assertEquals("org.apache.commons.lang3", + ClassUtils.getPackageCanonicalName("[Lorg.apache.commons.lang3.ClassUtils;")); + assertEquals("org.apache.commons.lang3", + ClassUtils.getPackageCanonicalName("[[Lorg.apache.commons.lang3.ClassUtils;")); + assertEquals("org.apache.commons.lang3", + ClassUtils.getPackageCanonicalName("org.apache.commons.lang3.ClassUtils[]")); + assertEquals("org.apache.commons.lang3", + ClassUtils.getPackageCanonicalName("org.apache.commons.lang3.ClassUtils[][]")); assertEquals("", ClassUtils.getPackageCanonicalName("[I")); assertEquals("", ClassUtils.getPackageCanonicalName("[[I")); assertEquals("", ClassUtils.getPackageCanonicalName("int[]")); diff --git a/src/test/org/apache/commons/lang3/EnumUtilsTest.java b/src/test/org/apache/commons/lang3/EnumUtilsTest.java index 960806479..fca795a03 100644 --- a/src/test/org/apache/commons/lang3/EnumUtilsTest.java +++ b/src/test/org/apache/commons/lang3/EnumUtilsTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.util.List; import java.util.Map; diff --git a/src/test/org/apache/commons/lang3/LocaleUtilsTest.java b/src/test/org/apache/commons/lang3/LocaleUtilsTest.java index 1fd3e1808..c822b3a37 100644 --- a/src/test/org/apache/commons/lang3/LocaleUtilsTest.java +++ b/src/test/org/apache/commons/lang3/LocaleUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/ObjectUtilsTest.java b/src/test/org/apache/commons/lang3/ObjectUtilsTest.java index 7ae225cd1..5b643ab1e 100644 --- a/src/test/org/apache/commons/lang3/ObjectUtilsTest.java +++ b/src/test/org/apache/commons/lang3/ObjectUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/RandomStringUtilsTest.java b/src/test/org/apache/commons/lang3/RandomStringUtilsTest.java index 45662a653..c5109a619 100644 --- a/src/test/org/apache/commons/lang3/RandomStringUtilsTest.java +++ b/src/test/org/apache/commons/lang3/RandomStringUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/RangeTest.java b/src/test/org/apache/commons/lang3/RangeTest.java index fa24744c0..f3859628c 100644 --- a/src/test/org/apache/commons/lang3/RangeTest.java +++ b/src/test/org/apache/commons/lang3/RangeTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.util.Comparator; diff --git a/src/test/org/apache/commons/lang3/SerializationUtilsTest.java b/src/test/org/apache/commons/lang3/SerializationUtilsTest.java index 5ae5c6cd1..1d6366d87 100644 --- a/src/test/org/apache/commons/lang3/SerializationUtilsTest.java +++ b/src/test/org/apache/commons/lang3/SerializationUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/test/org/apache/commons/lang3/StringEscapeUtilsTest.java b/src/test/org/apache/commons/lang3/StringEscapeUtilsTest.java index b6ddcc9ad..208083458 100644 --- a/src/test/org/apache/commons/lang3/StringEscapeUtilsTest.java +++ b/src/test/org/apache/commons/lang3/StringEscapeUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.io.IOException; import java.io.StringWriter; diff --git a/src/test/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java b/src/test/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java index 77da1c57a..0ba946ef4 100644 --- a/src/test/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java +++ b/src/test/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.util.Locale; diff --git a/src/test/org/apache/commons/lang3/StringUtilsIsTest.java b/src/test/org/apache/commons/lang3/StringUtilsIsTest.java index c8df47846..45d71a7f8 100644 --- a/src/test/org/apache/commons/lang3/StringUtilsIsTest.java +++ b/src/test/org/apache/commons/lang3/StringUtilsIsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/StringUtilsStartsEndsWithTest.java b/src/test/org/apache/commons/lang3/StringUtilsStartsEndsWithTest.java index 0a77eff50..1fafba971 100644 --- a/src/test/org/apache/commons/lang3/StringUtilsStartsEndsWithTest.java +++ b/src/test/org/apache/commons/lang3/StringUtilsStartsEndsWithTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/StringUtilsSubstringTest.java b/src/test/org/apache/commons/lang3/StringUtilsSubstringTest.java index 3b0b5f97d..7f6e272e6 100644 --- a/src/test/org/apache/commons/lang3/StringUtilsSubstringTest.java +++ b/src/test/org/apache/commons/lang3/StringUtilsSubstringTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/StringUtilsTest.java b/src/test/org/apache/commons/lang3/StringUtilsTest.java index 870aed7fe..e99db8c8d 100644 --- a/src/test/org/apache/commons/lang3/StringUtilsTest.java +++ b/src/test/org/apache/commons/lang3/StringUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/StringUtilsTrimEmptyTest.java b/src/test/org/apache/commons/lang3/StringUtilsTrimEmptyTest.java index ebbbd196a..c17794e1e 100644 --- a/src/test/org/apache/commons/lang3/StringUtilsTrimEmptyTest.java +++ b/src/test/org/apache/commons/lang3/StringUtilsTrimEmptyTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/SystemUtilsTest.java b/src/test/org/apache/commons/lang3/SystemUtilsTest.java index 017eddf5d..71dfd7724 100644 --- a/src/test/org/apache/commons/lang3/SystemUtilsTest.java +++ b/src/test/org/apache/commons/lang3/SystemUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.io.File; import java.lang.reflect.Constructor; diff --git a/src/test/org/apache/commons/lang3/ValidateTest.java b/src/test/org/apache/commons/lang3/ValidateTest.java index 9b04f530f..e45ad36b9 100644 --- a/src/test/org/apache/commons/lang3/ValidateTest.java +++ b/src/test/org/apache/commons/lang3/ValidateTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/WordUtilsTest.java b/src/test/org/apache/commons/lang3/WordUtilsTest.java index 9e6258c84..d847fd34b 100644 --- a/src/test/org/apache/commons/lang3/WordUtilsTest.java +++ b/src/test/org/apache/commons/lang3/WordUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang; +package org.apache.commons.lang3; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/builder/CompareToBuilderTest.java b/src/test/org/apache/commons/lang3/builder/CompareToBuilderTest.java index 9f0dd1ba3..53fc7d89c 100644 --- a/src/test/org/apache/commons/lang3/builder/CompareToBuilderTest.java +++ b/src/test/org/apache/commons/lang3/builder/CompareToBuilderTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.math.BigInteger; diff --git a/src/test/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java b/src/test/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java index 1e0ec2030..3f363f2d0 100644 --- a/src/test/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java +++ b/src/test/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.util.ArrayList; import java.util.HashMap; -import org.apache.commons.lang.builder.ToStringStyleTest.Person; +import org.apache.commons.lang3.builder.ToStringStyleTest.Person; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/builder/EqualsBuilderTest.java b/src/test/org/apache/commons/lang3/builder/EqualsBuilderTest.java index e959d4583..73c015513 100644 --- a/src/test/org/apache/commons/lang3/builder/EqualsBuilderTest.java +++ b/src/test/org/apache/commons/lang3/builder/EqualsBuilderTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.util.Arrays; diff --git a/src/test/org/apache/commons/lang3/builder/HashCodeBuilderAndEqualsBuilderTest.java b/src/test/org/apache/commons/lang3/builder/HashCodeBuilderAndEqualsBuilderTest.java index e5d5a61b8..8fc8ab200 100644 --- a/src/test/org/apache/commons/lang3/builder/HashCodeBuilderAndEqualsBuilderTest.java +++ b/src/test/org/apache/commons/lang3/builder/HashCodeBuilderAndEqualsBuilderTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/builder/HashCodeBuilderTest.java b/src/test/org/apache/commons/lang3/builder/HashCodeBuilderTest.java index e06ea1d16..fbae075bb 100644 --- a/src/test/org/apache/commons/lang3/builder/HashCodeBuilderTest.java +++ b/src/test/org/apache/commons/lang3/builder/HashCodeBuilderTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/builder/MultiLineToStringStyleTest.java b/src/test/org/apache/commons/lang3/builder/MultiLineToStringStyleTest.java index 4bb4030f4..72ba90ac2 100644 --- a/src/test/org/apache/commons/lang3/builder/MultiLineToStringStyleTest.java +++ b/src/test/org/apache/commons/lang3/builder/MultiLineToStringStyleTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.util.ArrayList; import java.util.HashMap; @@ -24,8 +24,8 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.commons.lang.SystemUtils; -import org.apache.commons.lang.builder.ToStringStyleTest.Person; +import org.apache.commons.lang3.SystemUtils; +import org.apache.commons.lang3.builder.ToStringStyleTest.Person; /** * Unit tests {@link org.apache.commons.lang.builder.MultiLineToStringStyleTest}. diff --git a/src/test/org/apache/commons/lang3/builder/NoFieldNamesToStringStyleTest.java b/src/test/org/apache/commons/lang3/builder/NoFieldNamesToStringStyleTest.java index 48ff2f361..04a353e52 100644 --- a/src/test/org/apache/commons/lang3/builder/NoFieldNamesToStringStyleTest.java +++ b/src/test/org/apache/commons/lang3/builder/NoFieldNamesToStringStyleTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.util.ArrayList; import java.util.HashMap; -import org.apache.commons.lang.builder.ToStringStyleTest.Person; +import org.apache.commons.lang3.builder.ToStringStyleTest.Person; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeTest.java b/src/test/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeTest.java index 171f880b7..2d3d73ab4 100644 --- a/src/test/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeTest.java +++ b/src/test/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +24,7 @@ import java.util.List; import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; /** * @author ggregory diff --git a/src/test/org/apache/commons/lang3/builder/ShortPrefixToStringStyleTest.java b/src/test/org/apache/commons/lang3/builder/ShortPrefixToStringStyleTest.java index f5edb1eaf..027ac388a 100644 --- a/src/test/org/apache/commons/lang3/builder/ShortPrefixToStringStyleTest.java +++ b/src/test/org/apache/commons/lang3/builder/ShortPrefixToStringStyleTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.util.ArrayList; import java.util.HashMap; -import org.apache.commons.lang.builder.ToStringStyleTest.Person; +import org.apache.commons.lang3.builder.ToStringStyleTest.Person; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/builder/SimpleToStringStyleTest.java b/src/test/org/apache/commons/lang3/builder/SimpleToStringStyleTest.java index 87fd73608..65c3a2df6 100644 --- a/src/test/org/apache/commons/lang3/builder/SimpleToStringStyleTest.java +++ b/src/test/org/apache/commons/lang3/builder/SimpleToStringStyleTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.util.ArrayList; import java.util.HashMap; -import org.apache.commons.lang.builder.ToStringStyleTest.Person; +import org.apache.commons.lang3.builder.ToStringStyleTest.Person; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/builder/StandardToStringStyleTest.java b/src/test/org/apache/commons/lang3/builder/StandardToStringStyleTest.java index 9fd6ba06a..1d94590de 100644 --- a/src/test/org/apache/commons/lang3/builder/StandardToStringStyleTest.java +++ b/src/test/org/apache/commons/lang3/builder/StandardToStringStyleTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.util.ArrayList; import java.util.HashMap; -import org.apache.commons.lang.builder.ToStringStyleTest.Person; +import org.apache.commons.lang3.builder.ToStringStyleTest.Person; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/builder/ToStringBuilderTest.java b/src/test/org/apache/commons/lang3/builder/ToStringBuilderTest.java index 442fc6b1e..3e4b997c4 100644 --- a/src/test/org/apache/commons/lang3/builder/ToStringBuilderTest.java +++ b/src/test/org/apache/commons/lang3/builder/ToStringBuilderTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/test/org/apache/commons/lang3/builder/ToStringStyleTest.java b/src/test/org/apache/commons/lang3/builder/ToStringStyleTest.java index 7810d7154..6aa46aac4 100644 --- a/src/test/org/apache/commons/lang3/builder/ToStringStyleTest.java +++ b/src/test/org/apache/commons/lang3/builder/ToStringStyleTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.builder; +package org.apache.commons.lang3.builder; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/concurrent/BackgroundInitializerTest.java b/src/test/org/apache/commons/lang3/concurrent/BackgroundInitializerTest.java index b6a88e96a..487228087 100644 --- a/src/test/org/apache/commons/lang3/concurrent/BackgroundInitializerTest.java +++ b/src/test/org/apache/commons/lang3/concurrent/BackgroundInitializerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.concurrent; +package org.apache.commons.lang3.concurrent; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; diff --git a/src/test/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java b/src/test/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java index a394fd1ce..640af89a3 100644 --- a/src/test/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java +++ b/src/test/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.concurrent; +package org.apache.commons.lang3.concurrent; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; diff --git a/src/test/org/apache/commons/lang3/concurrent/ConcurrentUtilsTest.java b/src/test/org/apache/commons/lang3/concurrent/ConcurrentUtilsTest.java index 879b0cb71..0b122cfaf 100644 --- a/src/test/org/apache/commons/lang3/concurrent/ConcurrentUtilsTest.java +++ b/src/test/org/apache/commons/lang3/concurrent/ConcurrentUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.concurrent; +package org.apache.commons.lang3.concurrent; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/src/test/org/apache/commons/lang3/concurrent/LazyInitializerTest.java b/src/test/org/apache/commons/lang3/concurrent/LazyInitializerTest.java index ccbe59c68..6a5b15cd3 100644 --- a/src/test/org/apache/commons/lang3/concurrent/LazyInitializerTest.java +++ b/src/test/org/apache/commons/lang3/concurrent/LazyInitializerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.concurrent; +package org.apache.commons.lang3.concurrent; import java.util.concurrent.CountDownLatch; diff --git a/src/test/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerTest.java b/src/test/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerTest.java index df2ed3644..5cb043d30 100644 --- a/src/test/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerTest.java +++ b/src/test/org/apache/commons/lang3/concurrent/MultiBackgroundInitializerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.concurrent; +package org.apache.commons.lang3.concurrent; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/src/test/org/apache/commons/lang3/exception/ContextedExceptionTest.java b/src/test/org/apache/commons/lang3/exception/ContextedExceptionTest.java index 8e3881b3a..e1a851b7f 100644 --- a/src/test/org/apache/commons/lang3/exception/ContextedExceptionTest.java +++ b/src/test/org/apache/commons/lang3/exception/ContextedExceptionTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.exception; +package org.apache.commons.lang3.exception; import java.io.Serializable; import java.util.Date; import junit.framework.TestCase; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * JUnit tests for ContextedException. diff --git a/src/test/org/apache/commons/lang3/exception/ContextedRuntimeExceptionTest.java b/src/test/org/apache/commons/lang3/exception/ContextedRuntimeExceptionTest.java index 9d5b3530b..192d94f6b 100644 --- a/src/test/org/apache/commons/lang3/exception/ContextedRuntimeExceptionTest.java +++ b/src/test/org/apache/commons/lang3/exception/ContextedRuntimeExceptionTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.exception; +package org.apache.commons.lang3.exception; import java.util.Date; import junit.framework.TestCase; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ContextedExceptionTest.ObjectWithFaultyToString; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ContextedExceptionTest.ObjectWithFaultyToString; /** * JUnit tests for ContextedRuntimeException. diff --git a/src/test/org/apache/commons/lang3/exception/DefaultExceptionContextTest.java b/src/test/org/apache/commons/lang3/exception/DefaultExceptionContextTest.java index 24cd73835..95ab7d9c1 100644 --- a/src/test/org/apache/commons/lang3/exception/DefaultExceptionContextTest.java +++ b/src/test/org/apache/commons/lang3/exception/DefaultExceptionContextTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.exception; +package org.apache.commons.lang3.exception; import java.util.Date; -import org.apache.commons.lang.exception.ContextedExceptionTest.ObjectWithFaultyToString; +import org.apache.commons.lang3.exception.ContextedExceptionTest.ObjectWithFaultyToString; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/exception/ExceptionUtilsTest.java b/src/test/org/apache/commons/lang3/exception/ExceptionUtilsTest.java index 015da5e0b..b63d74e99 100644 --- a/src/test/org/apache/commons/lang3/exception/ExceptionUtilsTest.java +++ b/src/test/org/apache/commons/lang3/exception/ExceptionUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.exception; +package org.apache.commons.lang3.exception; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -32,7 +32,7 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; /** * Tests {@link org.apache.commons.lang.exception.ExceptionUtils}. diff --git a/src/test/org/apache/commons/lang3/math/FractionTest.java b/src/test/org/apache/commons/lang3/math/FractionTest.java index 19783c0a5..13628805d 100644 --- a/src/test/org/apache/commons/lang3/math/FractionTest.java +++ b/src/test/org/apache/commons/lang3/math/FractionTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.commons.lang.math; +package org.apache.commons.lang3.math; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/math/IEEE754rUtilsTest.java b/src/test/org/apache/commons/lang3/math/IEEE754rUtilsTest.java index 89495f4c1..62215bb92 100644 --- a/src/test/org/apache/commons/lang3/math/IEEE754rUtilsTest.java +++ b/src/test/org/apache/commons/lang3/math/IEEE754rUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.math; +package org.apache.commons.lang3.math; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/math/NumberUtilsTest.java b/src/test/org/apache/commons/lang3/math/NumberUtilsTest.java index 93254669d..71321284b 100644 --- a/src/test/org/apache/commons/lang3/math/NumberUtilsTest.java +++ b/src/test/org/apache/commons/lang3/math/NumberUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.math; +package org.apache.commons.lang3.math; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; @@ -26,7 +26,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; /** * Unit tests {@link org.apache.commons.lang.math.NumberUtils}. diff --git a/src/test/org/apache/commons/lang3/mutable/MutableBooleanTest.java b/src/test/org/apache/commons/lang3/mutable/MutableBooleanTest.java index e8f19de69..acd2d1da2 100644 --- a/src/test/org/apache/commons/lang3/mutable/MutableBooleanTest.java +++ b/src/test/org/apache/commons/lang3/mutable/MutableBooleanTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/mutable/MutableByteTest.java b/src/test/org/apache/commons/lang3/mutable/MutableByteTest.java index 907c98d75..e4c324db2 100644 --- a/src/test/org/apache/commons/lang3/mutable/MutableByteTest.java +++ b/src/test/org/apache/commons/lang3/mutable/MutableByteTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/mutable/MutableDoubleTest.java b/src/test/org/apache/commons/lang3/mutable/MutableDoubleTest.java index eef280f33..c584a5c99 100644 --- a/src/test/org/apache/commons/lang3/mutable/MutableDoubleTest.java +++ b/src/test/org/apache/commons/lang3/mutable/MutableDoubleTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/mutable/MutableFloatTest.java b/src/test/org/apache/commons/lang3/mutable/MutableFloatTest.java index 53d1835a5..f4fb0dff6 100644 --- a/src/test/org/apache/commons/lang3/mutable/MutableFloatTest.java +++ b/src/test/org/apache/commons/lang3/mutable/MutableFloatTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/mutable/MutableIntTest.java b/src/test/org/apache/commons/lang3/mutable/MutableIntTest.java index 9a6a957f9..8172c6854 100644 --- a/src/test/org/apache/commons/lang3/mutable/MutableIntTest.java +++ b/src/test/org/apache/commons/lang3/mutable/MutableIntTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/mutable/MutableLongTest.java b/src/test/org/apache/commons/lang3/mutable/MutableLongTest.java index 1de71af5d..2bd77d307 100644 --- a/src/test/org/apache/commons/lang3/mutable/MutableLongTest.java +++ b/src/test/org/apache/commons/lang3/mutable/MutableLongTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/mutable/MutableObjectTest.java b/src/test/org/apache/commons/lang3/mutable/MutableObjectTest.java index d746d4f71..98a2c25c0 100644 --- a/src/test/org/apache/commons/lang3/mutable/MutableObjectTest.java +++ b/src/test/org/apache/commons/lang3/mutable/MutableObjectTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/mutable/MutableShortTest.java b/src/test/org/apache/commons/lang3/mutable/MutableShortTest.java index b18eef0c3..d81930883 100644 --- a/src/test/org/apache/commons/lang3/mutable/MutableShortTest.java +++ b/src/test/org/apache/commons/lang3/mutable/MutableShortTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.mutable; +package org.apache.commons.lang3.mutable; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/reflect/ConstructorUtilsTest.java b/src/test/org/apache/commons/lang3/reflect/ConstructorUtilsTest.java index 5d00195cc..8a9ef55d3 100644 --- a/src/test/org/apache/commons/lang3/reflect/ConstructorUtilsTest.java +++ b/src/test/org/apache/commons/lang3/reflect/ConstructorUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect; +package org.apache.commons.lang3.reflect; import java.lang.reflect.Constructor; import java.util.Arrays; @@ -25,8 +25,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.math.NumberUtils; /** * Unit tests ConstructorUtils diff --git a/src/test/org/apache/commons/lang3/reflect/FieldUtilsTest.java b/src/test/org/apache/commons/lang3/reflect/FieldUtilsTest.java index 2b8bf35f6..1ce9d3417 100644 --- a/src/test/org/apache/commons/lang3/reflect/FieldUtilsTest.java +++ b/src/test/org/apache/commons/lang3/reflect/FieldUtilsTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect; +package org.apache.commons.lang3.reflect; import java.lang.reflect.Field; -import org.apache.commons.lang.reflect.testbed.Ambig; -import org.apache.commons.lang.reflect.testbed.Foo; -import org.apache.commons.lang.reflect.testbed.PrivatelyShadowedChild; -import org.apache.commons.lang.reflect.testbed.PublicChild; -import org.apache.commons.lang.reflect.testbed.PubliclyShadowedChild; -import org.apache.commons.lang.reflect.testbed.StaticContainer; -import org.apache.commons.lang.reflect.testbed.StaticContainerChild; +import org.apache.commons.lang3.reflect.testbed.Ambig; +import org.apache.commons.lang3.reflect.testbed.Foo; +import org.apache.commons.lang3.reflect.testbed.PrivatelyShadowedChild; +import org.apache.commons.lang3.reflect.testbed.PublicChild; +import org.apache.commons.lang3.reflect.testbed.PubliclyShadowedChild; +import org.apache.commons.lang3.reflect.testbed.StaticContainer; +import org.apache.commons.lang3.reflect.testbed.StaticContainerChild; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/reflect/MethodUtilsTest.java b/src/test/org/apache/commons/lang3/reflect/MethodUtilsTest.java index dac6aeb4c..99cf61e94 100644 --- a/src/test/org/apache/commons/lang3/reflect/MethodUtilsTest.java +++ b/src/test/org/apache/commons/lang3/reflect/MethodUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect; +package org.apache.commons.lang3.reflect; import java.lang.reflect.Method; import java.util.Arrays; @@ -25,10 +25,10 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.math.NumberUtils; -import org.apache.commons.lang.mutable.Mutable; -import org.apache.commons.lang.mutable.MutableObject; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.commons.lang3.mutable.Mutable; +import org.apache.commons.lang3.mutable.MutableObject; /** * Unit tests MethodUtils diff --git a/src/test/org/apache/commons/lang3/reflect/TypeUtilsTest.java b/src/test/org/apache/commons/lang3/reflect/TypeUtilsTest.java index dc67cbd3a..338ff8385 100644 --- a/src/test/org/apache/commons/lang3/reflect/TypeUtilsTest.java +++ b/src/test/org/apache/commons/lang3/reflect/TypeUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect; +package org.apache.commons.lang3.reflect; import static junit.framework.Assert.*; @@ -22,7 +22,7 @@ import java.lang.reflect.Field; import java.lang.reflect.TypeVariable; import java.util.List; -import org.apache.commons.lang.reflect.testbed.*; +import org.apache.commons.lang3.reflect.testbed.*; import org.junit.Before; import org.junit.Test; diff --git a/src/test/org/apache/commons/lang3/reflect/testbed/Ambig.java b/src/test/org/apache/commons/lang3/reflect/testbed/Ambig.java index 5d1f7dc6d..10031e616 100644 --- a/src/test/org/apache/commons/lang3/reflect/testbed/Ambig.java +++ b/src/test/org/apache/commons/lang3/reflect/testbed/Ambig.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect.testbed; +package org.apache.commons.lang3.reflect.testbed; /** * @author mbenson diff --git a/src/test/org/apache/commons/lang3/reflect/testbed/Bar.java b/src/test/org/apache/commons/lang3/reflect/testbed/Bar.java index dbf87b602..34ae2d256 100644 --- a/src/test/org/apache/commons/lang3/reflect/testbed/Bar.java +++ b/src/test/org/apache/commons/lang3/reflect/testbed/Bar.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect.testbed; +package org.apache.commons.lang3.reflect.testbed; /** * @author mbenson diff --git a/src/test/org/apache/commons/lang3/reflect/testbed/Foo.java b/src/test/org/apache/commons/lang3/reflect/testbed/Foo.java index 6e3513f66..b38654b90 100644 --- a/src/test/org/apache/commons/lang3/reflect/testbed/Foo.java +++ b/src/test/org/apache/commons/lang3/reflect/testbed/Foo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect.testbed; +package org.apache.commons.lang3.reflect.testbed; /** * @author mbenson diff --git a/src/test/org/apache/commons/lang3/reflect/testbed/GenericParent.java b/src/test/org/apache/commons/lang3/reflect/testbed/GenericParent.java index 092b69704..b25475b04 100644 --- a/src/test/org/apache/commons/lang3/reflect/testbed/GenericParent.java +++ b/src/test/org/apache/commons/lang3/reflect/testbed/GenericParent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect.testbed; +package org.apache.commons.lang3.reflect.testbed; /** * Class declaring a parameter variable. diff --git a/src/test/org/apache/commons/lang3/reflect/testbed/GenericTypeHolder.java b/src/test/org/apache/commons/lang3/reflect/testbed/GenericTypeHolder.java index d969003c4..b0bb0127f 100644 --- a/src/test/org/apache/commons/lang3/reflect/testbed/GenericTypeHolder.java +++ b/src/test/org/apache/commons/lang3/reflect/testbed/GenericTypeHolder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect.testbed; +package org.apache.commons.lang3.reflect.testbed; import java.util.List; diff --git a/src/test/org/apache/commons/lang3/reflect/testbed/Parent.java b/src/test/org/apache/commons/lang3/reflect/testbed/Parent.java index 13c045e0a..03cdec0dc 100644 --- a/src/test/org/apache/commons/lang3/reflect/testbed/Parent.java +++ b/src/test/org/apache/commons/lang3/reflect/testbed/Parent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect.testbed; +package org.apache.commons.lang3.reflect.testbed; /** * @author mbenson diff --git a/src/test/org/apache/commons/lang3/reflect/testbed/PrivatelyShadowedChild.java b/src/test/org/apache/commons/lang3/reflect/testbed/PrivatelyShadowedChild.java index 8bca6c47b..70bfa5a81 100644 --- a/src/test/org/apache/commons/lang3/reflect/testbed/PrivatelyShadowedChild.java +++ b/src/test/org/apache/commons/lang3/reflect/testbed/PrivatelyShadowedChild.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect.testbed; +package org.apache.commons.lang3.reflect.testbed; /** * @author mbenson diff --git a/src/test/org/apache/commons/lang3/reflect/testbed/PublicChild.java b/src/test/org/apache/commons/lang3/reflect/testbed/PublicChild.java index cfbe555ed..1a4c2994e 100644 --- a/src/test/org/apache/commons/lang3/reflect/testbed/PublicChild.java +++ b/src/test/org/apache/commons/lang3/reflect/testbed/PublicChild.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect.testbed; +package org.apache.commons.lang3.reflect.testbed; /** * @author mbenson diff --git a/src/test/org/apache/commons/lang3/reflect/testbed/PubliclyShadowedChild.java b/src/test/org/apache/commons/lang3/reflect/testbed/PubliclyShadowedChild.java index f5cf8493d..eb6ae2f4e 100644 --- a/src/test/org/apache/commons/lang3/reflect/testbed/PubliclyShadowedChild.java +++ b/src/test/org/apache/commons/lang3/reflect/testbed/PubliclyShadowedChild.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect.testbed; +package org.apache.commons.lang3.reflect.testbed; /** * @author mbenson diff --git a/src/test/org/apache/commons/lang3/reflect/testbed/StaticContainer.java b/src/test/org/apache/commons/lang3/reflect/testbed/StaticContainer.java index 85c9dbb03..d55428fd1 100644 --- a/src/test/org/apache/commons/lang3/reflect/testbed/StaticContainer.java +++ b/src/test/org/apache/commons/lang3/reflect/testbed/StaticContainer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect.testbed; +package org.apache.commons.lang3.reflect.testbed; /** * @author mbenson diff --git a/src/test/org/apache/commons/lang3/reflect/testbed/StaticContainerChild.java b/src/test/org/apache/commons/lang3/reflect/testbed/StaticContainerChild.java index 2f97e0be9..4f4440873 100644 --- a/src/test/org/apache/commons/lang3/reflect/testbed/StaticContainerChild.java +++ b/src/test/org/apache/commons/lang3/reflect/testbed/StaticContainerChild.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect.testbed; +package org.apache.commons.lang3.reflect.testbed; /** * @author mbenson diff --git a/src/test/org/apache/commons/lang3/reflect/testbed/StringParameterizedChild.java b/src/test/org/apache/commons/lang3/reflect/testbed/StringParameterizedChild.java index 1bc1a2473..9e06fd54a 100644 --- a/src/test/org/apache/commons/lang3/reflect/testbed/StringParameterizedChild.java +++ b/src/test/org/apache/commons/lang3/reflect/testbed/StringParameterizedChild.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.reflect.testbed; +package org.apache.commons.lang3.reflect.testbed; /** * {@link GenericParent} subclass that explicitly specifies as {@link String}. diff --git a/src/test/org/apache/commons/lang3/text/CompositeFormatTest.java b/src/test/org/apache/commons/lang3/text/CompositeFormatTest.java index 1bdd37089..9d7e6cc83 100644 --- a/src/test/org/apache/commons/lang3/text/CompositeFormatTest.java +++ b/src/test/org/apache/commons/lang3/text/CompositeFormatTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.text.FieldPosition; import java.text.Format; diff --git a/src/test/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java b/src/test/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java index 6fd41d033..b45e80331 100644 --- a/src/test/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java +++ b/src/test/org/apache/commons/lang3/text/ExtendedMessageFormatTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.text.ChoiceFormat; import java.text.DateFormat; @@ -32,7 +32,7 @@ import java.util.Iterator; import java.util.Locale; import java.util.Map; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java b/src/test/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java index 1ad83499e..de2000a5e 100644 --- a/src/test/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java +++ b/src/test/org/apache/commons/lang3/text/StrBuilderAppendInsertTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.util.Arrays; import java.util.Collection; @@ -27,7 +27,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; /** * Unit tests for {@link org.apache.commons.lang.text.StrBuilder}. diff --git a/src/test/org/apache/commons/lang3/text/StrBuilderTest.java b/src/test/org/apache/commons/lang3/text/StrBuilderTest.java index cdb304aab..539ab13ac 100644 --- a/src/test/org/apache/commons/lang3/text/StrBuilderTest.java +++ b/src/test/org/apache/commons/lang3/text/StrBuilderTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.io.Reader; import java.io.Writer; @@ -26,7 +26,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; /** * Unit tests for {@link org.apache.commons.lang.text.StrBuilder}. diff --git a/src/test/org/apache/commons/lang3/text/StrLookupTest.java b/src/test/org/apache/commons/lang3/text/StrLookupTest.java index 50065e8b2..fe1a0dfa8 100644 --- a/src/test/org/apache/commons/lang3/text/StrLookupTest.java +++ b/src/test/org/apache/commons/lang3/text/StrLookupTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.util.HashMap; import java.util.Map; diff --git a/src/test/org/apache/commons/lang3/text/StrMatcherTest.java b/src/test/org/apache/commons/lang3/text/StrMatcherTest.java index 9fb1c3779..03c61e12d 100644 --- a/src/test/org/apache/commons/lang3/text/StrMatcherTest.java +++ b/src/test/org/apache/commons/lang3/text/StrMatcherTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import junit.framework.Test; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/text/StrSubstitutorTest.java b/src/test/org/apache/commons/lang3/text/StrSubstitutorTest.java index 89d83c53b..5ba00c5bc 100644 --- a/src/test/org/apache/commons/lang3/text/StrSubstitutorTest.java +++ b/src/test/org/apache/commons/lang3/text/StrSubstitutorTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.util.HashMap; import java.util.Map; @@ -25,7 +25,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.commons.lang.mutable.MutableObject; +import org.apache.commons.lang3.mutable.MutableObject; /** * Test class for StrSubstitutor. diff --git a/src/test/org/apache/commons/lang3/text/StrTokenizerTest.java b/src/test/org/apache/commons/lang3/text/StrTokenizerTest.java index 3a73fec6f..2178f2d6f 100644 --- a/src/test/org/apache/commons/lang3/text/StrTokenizerTest.java +++ b/src/test/org/apache/commons/lang3/text/StrTokenizerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.text; +package org.apache.commons.lang3.text; import java.util.Arrays; import java.util.Collections; @@ -27,8 +27,8 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ObjectUtils; /** * Unit test for Tokenizer. diff --git a/src/test/org/apache/commons/lang3/text/translate/EntityArraysTest.java b/src/test/org/apache/commons/lang3/text/translate/EntityArraysTest.java index e116d6d4d..e8b37031b 100644 --- a/src/test/org/apache/commons/lang3/text/translate/EntityArraysTest.java +++ b/src/test/org/apache/commons/lang3/text/translate/EntityArraysTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/text/translate/LookupTranslatorTest.java b/src/test/org/apache/commons/lang3/text/translate/LookupTranslatorTest.java index ca351fdc9..a89be3e30 100644 --- a/src/test/org/apache/commons/lang3/text/translate/LookupTranslatorTest.java +++ b/src/test/org/apache/commons/lang3/text/translate/LookupTranslatorTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/text/translate/NumericEntityEscaperTest.java b/src/test/org/apache/commons/lang3/text/translate/NumericEntityEscaperTest.java index af8a3602c..3e46c84ad 100644 --- a/src/test/org/apache/commons/lang3/text/translate/NumericEntityEscaperTest.java +++ b/src/test/org/apache/commons/lang3/text/translate/NumericEntityEscaperTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/text/translate/UnicodeEscaperTest.java b/src/test/org/apache/commons/lang3/text/translate/UnicodeEscaperTest.java index d926b7186..46366c787 100644 --- a/src/test/org/apache/commons/lang3/text/translate/UnicodeEscaperTest.java +++ b/src/test/org/apache/commons/lang3/text/translate/UnicodeEscaperTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/text/translate/UnicodeUnescaperTest.java b/src/test/org/apache/commons/lang3/text/translate/UnicodeUnescaperTest.java index 44586238c..e882440b9 100644 --- a/src/test/org/apache/commons/lang3/text/translate/UnicodeUnescaperTest.java +++ b/src/test/org/apache/commons/lang3/text/translate/UnicodeUnescaperTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.text.translate; +package org.apache.commons.lang3.text.translate; import junit.framework.TestCase; diff --git a/src/test/org/apache/commons/lang3/time/DateFormatUtilsTest.java b/src/test/org/apache/commons/lang3/time/DateFormatUtilsTest.java index 23e7a5133..6a0ea9b1d 100644 --- a/src/test/org/apache/commons/lang3/time/DateFormatUtilsTest.java +++ b/src/test/org/apache/commons/lang3/time/DateFormatUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.time; +package org.apache.commons.lang3.time; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/time/DateUtilsFragmentTest.java b/src/test/org/apache/commons/lang3/time/DateUtilsFragmentTest.java index 7f5a2a567..605a26c4d 100644 --- a/src/test/org/apache/commons/lang3/time/DateUtilsFragmentTest.java +++ b/src/test/org/apache/commons/lang3/time/DateUtilsFragmentTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.time; +package org.apache.commons.lang3.time; import java.util.Calendar; import java.util.Date; diff --git a/src/test/org/apache/commons/lang3/time/DateUtilsRoundingTest.java b/src/test/org/apache/commons/lang3/time/DateUtilsRoundingTest.java index d76715339..565dd8525 100644 --- a/src/test/org/apache/commons/lang3/time/DateUtilsRoundingTest.java +++ b/src/test/org/apache/commons/lang3/time/DateUtilsRoundingTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.time; +package org.apache.commons.lang3.time; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/src/test/org/apache/commons/lang3/time/DateUtilsTest.java b/src/test/org/apache/commons/lang3/time/DateUtilsTest.java index 77aa10276..d7fdd039b 100644 --- a/src/test/org/apache/commons/lang3/time/DateUtilsTest.java +++ b/src/test/org/apache/commons/lang3/time/DateUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.time; +package org.apache.commons.lang3.time; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; @@ -35,7 +35,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; /** * Unit tests {@link org.apache.commons.lang.time.DateUtils}. diff --git a/src/test/org/apache/commons/lang3/time/DurationFormatUtilsTest.java b/src/test/org/apache/commons/lang3/time/DurationFormatUtilsTest.java index 81366930a..2627fc178 100644 --- a/src/test/org/apache/commons/lang3/time/DurationFormatUtilsTest.java +++ b/src/test/org/apache/commons/lang3/time/DurationFormatUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.lang.time; +package org.apache.commons.lang3.time; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/src/test/org/apache/commons/lang3/time/FastDateFormatTest.java b/src/test/org/apache/commons/lang3/time/FastDateFormatTest.java index 21d7ae7f0..c5d803eb0 100644 --- a/src/test/org/apache/commons/lang3/time/FastDateFormatTest.java +++ b/src/test/org/apache/commons/lang3/time/FastDateFormatTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.time; +package org.apache.commons.lang3.time; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -28,7 +28,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.commons.lang.SerializationUtils; +import org.apache.commons.lang3.SerializationUtils; /** * Unit tests {@link org.apache.commons.lang.time.FastDateFormat}. diff --git a/src/test/org/apache/commons/lang3/time/StopWatchTest.java b/src/test/org/apache/commons/lang3/time/StopWatchTest.java index 6aab85f32..327f22774 100644 --- a/src/test/org/apache/commons/lang3/time/StopWatchTest.java +++ b/src/test/org/apache/commons/lang3/time/StopWatchTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.lang.time; +package org.apache.commons.lang3.time; import junit.framework.Assert; import junit.framework.Test;