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

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;
 
 /**
  * <p>Operations on arrays, primitive arrays (like <code>int[]</code>) and

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;
 
 /**
  * <p>Operations on bit-mapped fields.</p>

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;
 
 /**
  * <p>Operations on boolean primitives and Boolean objects.</p>

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;
 

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;
 

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;

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;
 
 /**
  * <p>Operations on <code>CharSet</code>s.</p>

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;
 
 /**
  * <p>Operations on char primitives and Character objects.</p>

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;

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;

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;

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;
 

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;
 /**

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;

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;
 
 /**
  * <p>Exception thrown when the Serialization process fails.</p>

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;

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.*;
 
 /**
  * <p>Escapes and unescapes <code>String</code>s for

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;

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;
 

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;

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;
 
 /**
  * <p>Operations on Strings that contain words.</p>

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;

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;

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;

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
 

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;
 
 /**
  * <p>

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;
 
 /**
  * <p>Works with {@link ToStringBuilder} to create a <code>toString</code>.</p>

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;
 
 /**
  * <p>Assists in implementing {@link Object#toString()} methods.</p>

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;
 
 /**
  * <p>Controls <code>String</code> formatting for {@link ToStringBuilder}.

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;

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;

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;
 
 /**
  * <p>

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;

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;
 
 /**
  * <p>

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;

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;
 

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;
 

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.

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;
 

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;
 
 /**
  * <p>Provides utilities for manipulating and examining 

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;
 

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;
 
 /**
  * <p>Provides IEEE-754r variants of NumberUtils methods. </p>

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;
 
 /**
  * <p>Provides extra functionality for Java Number classes.</p>

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.

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;
 

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 <code>byte</code> wrapper.

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 <code>double</code> wrapper.

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 <code>float</code> wrapper.

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 <code>int</code> wrapper.

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 <code>long</code> wrapper.

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;
 

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 <code>short</code> wrapper.

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;
 
 /**
  * <p> Utility reflection methods focussed on constructors, modelled after {@link MethodUtils}. </p>

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

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

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;
 
 /**
  * <p> Utility reflection methods focused on methods, originally from Commons BeanUtils.

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;
 
 /**
  * <p>Utility methods focusing on type inspection, particularly with regard to

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;

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 <code>java.text.MessageFormat</code> to allow pluggable/additional formatting

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;

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

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;
 

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;
 

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;

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)

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 

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;

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;

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 

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;

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;

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;

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;

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;

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;

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;

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;
 
 /**
  * <p>Duration formatting utilities and constants. The following table describes the tokens 

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;
 
 /**
  * <p>FastDateFormat is a fast and thread-safe version of

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;
 
 /**
  * <p>

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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(), "<null>"));
-        assertEquals("org.apache.commons.lang", ClassUtils.getPackageName(new Inner(), "<null>"));
+        assertEquals("org.apache.commons.lang3", ClassUtils.getPackageName(new ClassUtils(), "<null>"));
+        assertEquals("org.apache.commons.lang3", ClassUtils.getPackageName(new Inner(), "<null>"));
         assertEquals("<null>", ClassUtils.getPackageName(null, "<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("<null>", ClassUtils.getPackageCanonicalName(null, "<null>"));
-        assertEquals("org.apache.commons.lang", ClassUtils.getPackageCanonicalName(new ClassUtils(), "<null>"));
-        assertEquals("org.apache.commons.lang", ClassUtils.getPackageCanonicalName(new ClassUtils[0], "<null>"));
-        assertEquals("org.apache.commons.lang", ClassUtils.getPackageCanonicalName(new ClassUtils[0][0], "<null>"));
+        assertEquals("org.apache.commons.lang3", ClassUtils.getPackageCanonicalName(new ClassUtils(), "<null>"));
+        assertEquals("org.apache.commons.lang3", ClassUtils.getPackageCanonicalName(new ClassUtils[0], "<null>"));
+        assertEquals("org.apache.commons.lang3", ClassUtils.getPackageCanonicalName(new ClassUtils[0][0], "<null>"));
         assertEquals("", ClassUtils.getPackageCanonicalName(new int[0], "<null>"));
         assertEquals("", ClassUtils.getPackageCanonicalName(new int[0][0], "<null>"));
     }
 
     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[]"));

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;

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;

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;

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;

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;
 

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;

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;