Repackage .codec. to .codec2. Change POM grouId from commons-codec to org.apache.commons. Change artifactId from commons-codec to commons-codec2.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1156841 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

default.properties

@@ -28,7 +28,7 @@ junit.jar = ${junit.home}/junit-4.8.2.jar
 component.name = commons-codec
 
 # The primary package name of this component
-component.package = org.apache.commons.codec
+component.package = org.apache.commons.codec2
 
 # The title of this component
 component.title = Encode/Decode Utilities

pom.xml

@@ -23,8 +23,8 @@ limitations under the License.
     <version>21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-codec</groupId>
-  <artifactId>commons-codec</artifactId>
+  <groupId>org.apache.commons</groupId>
+  <artifactId>commons-codec2</artifactId>
   <version>2.0-SNAPSHOT</version>
   <name>Commons Codec</name>
   <inceptionYear>2002</inceptionYear>
@@ -310,7 +310,13 @@ limitations under the License.
         <artifactId>clirr-maven-plugin</artifactId>
         <version>2.3</version>
         <configuration>
-          <comparisonVersion>1.5</comparisonVersion>
+          <comparisonArtifacts>
+            <comparisonArtifact>
+              <groupId>commons-codec</groupId>
+              <artifactId>commons-codec</artifactId>
+              <version>1.5</version>
+            </comparisonArtifact>
+          </comparisonArtifacts>
           <minSeverity>info</minSeverity>
         </configuration>
       </plugin>

src/java/org/apache/commons/codec/BinaryDecoder.java renamed to src/java/org/apache/commons/codec2/BinaryDecoder.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec;
+package org.apache.commons.codec2;
 
 /**
  * Defines common decoding methods for byte array decoders.

src/java/org/apache/commons/codec/BinaryEncoder.java renamed to src/java/org/apache/commons/codec2/BinaryEncoder.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec;
+package org.apache.commons.codec2;
 
 /**
  * Defines common encoding methods for byte array encoders.

src/java/org/apache/commons/codec/CharEncoding.java renamed to src/java/org/apache/commons/codec2/CharEncoding.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec;
+package org.apache.commons.codec2;
 
 /**
  * Character encoding names required of every implementation of the Java platform.

src/java/org/apache/commons/codec/Decoder.java renamed to src/java/org/apache/commons/codec2/Decoder.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec;
+package org.apache.commons.codec2;
 
 /**
  * <p>Provides the highest level of abstraction for Decoders.

src/java/org/apache/commons/codec/DecoderException.java renamed to src/java/org/apache/commons/codec2/DecoderException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec;
+package org.apache.commons.codec2;
 
 /**
  * Thrown when there is a failure condition during the decoding process. This exception is thrown when a {@link Decoder}

src/java/org/apache/commons/codec/Encoder.java renamed to src/java/org/apache/commons/codec2/Encoder.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec;
+package org.apache.commons.codec2;
 
 /**
  * <p>Provides the highest level of abstraction for Encoders.

src/java/org/apache/commons/codec/EncoderException.java renamed to src/java/org/apache/commons/codec2/EncoderException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec;
+package org.apache.commons.codec2;
 
 /**
  * Thrown when there is a failure condition during the encoding process. This exception is thrown when an

src/java/org/apache/commons/codec/StringDecoder.java renamed to src/java/org/apache/commons/codec2/StringDecoder.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec;
+package org.apache.commons.codec2;
 
 /**
  * Defines common decoding methods for String decoders.

src/java/org/apache/commons/codec/StringEncoder.java renamed to src/java/org/apache/commons/codec2/StringEncoder.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec;
+package org.apache.commons.codec2;
 
 /**
  * Defines common encoding methods for String encoders.

src/java/org/apache/commons/codec/StringEncoderComparator.java renamed to src/java/org/apache/commons/codec2/StringEncoderComparator.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec;
+package org.apache.commons.codec2;
 
 import java.util.Comparator;
 

src/java/org/apache/commons/codec/binary/Base32.java renamed to src/java/org/apache/commons/codec2/binary/Base32.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.binary;
+package org.apache.commons.codec2.binary;
 
 /**
  * Provides Base32 encoding and decoding as defined by <a href="http://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>.

src/java/org/apache/commons/codec/binary/Base32InputStream.java renamed to src/java/org/apache/commons/codec2/binary/Base32InputStream.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.binary;
+package org.apache.commons.codec2.binary;
 
 import java.io.InputStream;
 

src/java/org/apache/commons/codec/binary/Base32OutputStream.java renamed to src/java/org/apache/commons/codec2/binary/Base32OutputStream.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.binary;
+package org.apache.commons.codec2.binary;
 
 import java.io.OutputStream;
 

src/java/org/apache/commons/codec/binary/Base64.java renamed to src/java/org/apache/commons/codec2/binary/Base64.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.binary;
+package org.apache.commons.codec2.binary;
 
 import java.math.BigInteger;
 

src/java/org/apache/commons/codec/binary/Base64InputStream.java renamed to src/java/org/apache/commons/codec2/binary/Base64InputStream.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.binary;
+package org.apache.commons.codec2.binary;
 
 import java.io.InputStream;
 

src/java/org/apache/commons/codec/binary/Base64OutputStream.java renamed to src/java/org/apache/commons/codec2/binary/Base64OutputStream.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.binary;
+package org.apache.commons.codec2.binary;
 
 import java.io.OutputStream;
 

src/java/org/apache/commons/codec/binary/BaseNCodec.java renamed to src/java/org/apache/commons/codec2/binary/BaseNCodec.java

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.binary;
+package org.apache.commons.codec2.binary;
 
-import org.apache.commons.codec.BinaryDecoder;
-import org.apache.commons.codec.BinaryEncoder;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.EncoderException;
+import org.apache.commons.codec2.BinaryDecoder;
+import org.apache.commons.codec2.BinaryEncoder;
+import org.apache.commons.codec2.DecoderException;
+import org.apache.commons.codec2.EncoderException;
 
 /**
  * Abstract superclass for Base-N encoders and decoders.

src/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java renamed to src/java/org/apache/commons/codec2/binary/BaseNCodecInputStream.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.binary;
+package org.apache.commons.codec2.binary;
 
 import java.io.FilterInputStream;
 import java.io.IOException;

src/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java renamed to src/java/org/apache/commons/codec2/binary/BaseNCodecOutputStream.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.binary;
+package org.apache.commons.codec2.binary;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

src/java/org/apache/commons/codec/binary/BinaryCodec.java renamed to src/java/org/apache/commons/codec2/binary/BinaryCodec.java

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.binary;
+package org.apache.commons.codec2.binary;
 
-import org.apache.commons.codec.BinaryDecoder;
-import org.apache.commons.codec.BinaryEncoder;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.EncoderException;
+import org.apache.commons.codec2.BinaryDecoder;
+import org.apache.commons.codec2.BinaryEncoder;
+import org.apache.commons.codec2.DecoderException;
+import org.apache.commons.codec2.EncoderException;
 
 /**
  * Converts between byte arrays and strings of "0"s and "1"s.
@@ -75,7 +75,7 @@ public class BinaryCodec implements BinaryDecoder, BinaryEncoder {
      * @param raw
      *                  the raw binary data to convert
      * @return 0 and 1 ASCII character bytes one for each bit of the argument
-     * @see org.apache.commons.codec.BinaryEncoder#encode(byte[])
+     * @see org.apache.commons.codec2.BinaryEncoder#encode(byte[])
      */
     public byte[] encode(byte[] raw) {
         return toAsciiBytes(raw);
@@ -89,7 +89,7 @@ public byte[] encode(byte[] raw) {
      * @return 0 and 1 ASCII character chars one for each bit of the argument
      * @throws EncoderException
      *                  if the argument is not a byte[]
-     * @see org.apache.commons.codec.Encoder#encode(Object)
+     * @see org.apache.commons.codec2.Encoder#encode(Object)
      */
     public Object encode(Object raw) throws EncoderException {
         if (!(raw instanceof byte[])) {
@@ -106,7 +106,7 @@ public Object encode(Object raw) throws EncoderException {
      * @return the raw encoded binary where each bit corresponds to a byte in the byte array argument
      * @throws DecoderException
      *                  if argument is not a byte[], char[] or String
-     * @see org.apache.commons.codec.Decoder#decode(Object)
+     * @see org.apache.commons.codec2.Decoder#decode(Object)
      */
     public Object decode(Object ascii) throws DecoderException {
         if (ascii == null) {
@@ -130,7 +130,7 @@ public Object decode(Object ascii) throws DecoderException {
      * @param ascii
      *                  each byte represents an ASCII '0' or '1'
      * @return the raw encoded binary where each bit corresponds to a byte in the byte array argument
-     * @see org.apache.commons.codec.Decoder#decode(Object)
+     * @see org.apache.commons.codec2.Decoder#decode(Object)
      */
     public byte[] decode(byte[] ascii) {
         return fromAscii(ascii);
@@ -142,7 +142,7 @@ public byte[] decode(byte[] ascii) {
      * @param ascii
      *                  String of '0' and '1' characters
      * @return the raw encoded binary where each bit corresponds to a byte in the byte array argument
-     * @see org.apache.commons.codec.Decoder#decode(Object)
+     * @see org.apache.commons.codec2.Decoder#decode(Object)
      */
     public byte[] toByteArray(String ascii) {
         if (ascii == null) {
@@ -228,7 +228,7 @@ private static boolean isEmpty(byte[] array) {
      * @param raw
      *                  the raw binary data to convert
      * @return an array of 0 and 1 character bytes for each bit of the argument
-     * @see org.apache.commons.codec.BinaryEncoder#encode(byte[])
+     * @see org.apache.commons.codec2.BinaryEncoder#encode(byte[])
      */
     public static byte[] toAsciiBytes(byte[] raw) {
         if (isEmpty(raw)) {
@@ -258,7 +258,7 @@ public static byte[] toAsciiBytes(byte[] raw) {
      * @param raw
      *                  the raw binary data to convert
      * @return an array of 0 and 1 characters for each bit of the argument
-     * @see org.apache.commons.codec.BinaryEncoder#encode(byte[])
+     * @see org.apache.commons.codec2.BinaryEncoder#encode(byte[])
      */
     public static char[] toAsciiChars(byte[] raw) {
         if (isEmpty(raw)) {
@@ -288,7 +288,7 @@ public static char[] toAsciiChars(byte[] raw) {
      * @param raw
      *                  the raw binary data to convert
      * @return a String of 0 and 1 characters representing the binary data
-     * @see org.apache.commons.codec.BinaryEncoder#encode(byte[])
+     * @see org.apache.commons.codec2.BinaryEncoder#encode(byte[])
      */
     public static String toAsciiString(byte[] raw) {
         return new String(toAsciiChars(raw));

src/java/org/apache/commons/codec/binary/Hex.java renamed to src/java/org/apache/commons/codec2/binary/Hex.java

@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.binary;
+package org.apache.commons.codec2.binary;
 
 import java.io.UnsupportedEncodingException;
 
-import org.apache.commons.codec.BinaryDecoder;
-import org.apache.commons.codec.BinaryEncoder;
-import org.apache.commons.codec.CharEncoding;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.EncoderException;
+import org.apache.commons.codec2.BinaryDecoder;
+import org.apache.commons.codec2.BinaryEncoder;
+import org.apache.commons.codec2.CharEncoding;
+import org.apache.commons.codec2.DecoderException;
+import org.apache.commons.codec2.EncoderException;
 
 /**
  * Converts hexadecimal Strings. The charset used for certain operation can be set, the default is set in

src/java/org/apache/commons/codec/binary/StringUtils.java renamed to src/java/org/apache/commons/codec2/binary/StringUtils.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.binary;
+package org.apache.commons.codec2.binary;
 
 import java.io.UnsupportedEncodingException;
 
-import org.apache.commons.codec.CharEncoding;
+import org.apache.commons.codec2.CharEncoding;
 
 /**
  * Converts String to and from bytes using the encodings required by the Java specification. These encodings are specified in <a

src/java/org/apache/commons/codec/binary/package.html renamed to src/java/org/apache/commons/codec2/binary/package.html

@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.digest;
+package org.apache.commons.codec2.digest;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.codec.binary.StringUtils;
+import org.apache.commons.codec2.binary.Hex;
+import org.apache.commons.codec2.binary.StringUtils;
 
 /**
  * Operations to simplify common {@link java.security.MessageDigest} tasks. This class is thread safe.

src/java/org/apache/commons/codec/digest/DigestUtils.java renamed to src/java/org/apache/commons/codec2/digest/DigestUtils.java

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.language;
+package org.apache.commons.codec2.language;
 
-import org.apache.commons.codec.EncoderException;
-import org.apache.commons.codec.StringEncoder;
+import org.apache.commons.codec2.EncoderException;
+import org.apache.commons.codec2.StringEncoder;
 
 /**
  * Encodes a string into a Caverphone value.

src/java/org/apache/commons/codec/digest/package.html renamed to src/java/org/apache/commons/codec2/digest/package.html

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.language;
+package org.apache.commons.codec2.language;
 
 /**
  * Encodes a string into a Caverphone 1.0 value.

src/java/org/apache/commons/codec/language/AbstractCaverphone.java renamed to src/java/org/apache/commons/codec2/language/AbstractCaverphone.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.codec.language;
+package org.apache.commons.codec2.language;
 
 /**
  * Encodes a string into a Caverphone 2.0 value.