Revert previous commit. update C:/svn/org/apache/commons/trunks-proper/codec -r HEAD --force

    At revision 1157191.
merge --depth=infinity -r1156841:1156840 https://svn.apache.org/repos/asf/commons/proper/codec/trunk C:/svn/org/apache/commons/trunks-proper/codec
    Status against revision: 1157191
    --- Reverse-merging r1156841 through r1156840 into C:/svn/org/apache/commons/trunks-proper/codec
    U   C:/svn/org/apache/commons/trunks-proper/codec/default.properties
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/digest
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/digest/DigestUtilsTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/MetaphoneTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/RefinedSoundexTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/SoundexTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/Caverphone1Test.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/Caverphone2Test.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/DoubleMetaphone2Test.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/bm
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/bm/PhoneticEngineTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/bm/RuleTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/language/bm/LanguageGuessingTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/CharEncodingTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/DecoderExceptionTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/Base32Test.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/Base64InputStreamTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/Base64OutputStreamTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/BinaryCodecTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/Base64Test.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/HexTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/Base64Codec13Test.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/BaseNCodecTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/StringUtilsTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/Base32TestData.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/Codec105ErrorInputStream.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/Base32InputStreamTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/Base32OutputStreamTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/binary/Base64TestData.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/net
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/net/BCodecTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/net/QuotedPrintableCodecTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/net/URLCodecTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/net/UtilsTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/net/RFC1522CodecTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/net/QCodecTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/BinaryEncoderAbstractTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/StringEncoderAbstractTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/EncoderExceptionTest.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java
    D   C:/svn/org/apache/commons/trunks-proper/codec/src/test/org/apache/commons/codec2
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/digest
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/digest/DigestUtils.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/digest/package.html
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/ColognePhonetic.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/Metaphone.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/RefinedSoundex.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/Soundex.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/SoundexUtils.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/Caverphone1.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/DoubleMetaphone.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/Caverphone2.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/AbstractCaverphone.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/bm
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/bm/Lang.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/bm/NameType.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/bm/ResourceConstants.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/bm/Languages.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/bm/Rule.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/bm/RuleType.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/language/package.html
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/Base32.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/Base64InputStream.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/Base64OutputStream.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/BinaryCodec.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/Base64.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/Hex.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/BaseNCodec.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/StringUtils.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/Base32InputStream.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/Base32OutputStream.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/binary/package.html
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/Decoder.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/StringEncoder.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/net
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/net/BCodec.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/net/URLCodec.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/net/Utils.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/net/RFC1522Codec.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/net/QCodec.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/net/package.html
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/BinaryDecoder.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/package.html
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/Encoder.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/BinaryEncoder.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/CharEncoding.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/DecoderException.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/overview.html
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/StringDecoder.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/EncoderException.java
    A   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec/StringEncoderComparator.java
    D   C:/svn/org/apache/commons/trunks-proper/codec/src/java/org/apache/commons/codec2
    U   C:/svn/org/apache/commons/trunks-proper/codec/pom.xml
    Merge complete.
    ===== File Statistics: =====
    Deleted: 2
    Added: 101
    Updated: 2


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1157192 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.codec2
+component.package = org.apache.commons.codec
 
 # 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>org.apache.commons</groupId>
-  <artifactId>commons-codec2</artifactId>
+  <groupId>commons-codec</groupId>
+  <artifactId>commons-codec</artifactId>
   <version>2.0-SNAPSHOT</version>
   <name>Commons Codec</name>
   <inceptionYear>2002</inceptionYear>
@@ -310,13 +310,7 @@ limitations under the License.
         <artifactId>clirr-maven-plugin</artifactId>
         <version>2.3</version>
         <configuration>
-          <comparisonArtifacts>
-            <comparisonArtifact>
-              <groupId>commons-codec</groupId>
-              <artifactId>commons-codec</artifactId>
-              <version>1.5</version>
-            </comparisonArtifact>
-          </comparisonArtifacts>
+          <comparisonVersion>1.5</comparisonVersion>
           <minSeverity>info</minSeverity>
         </configuration>
       </plugin>

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

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

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

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

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

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

…a/org/apache/commons/codec2/Decoder.java …va/org/apache/commons/codec/Decoder.javasrc/java/org/apache/commons/codec2/Decoder.java renamed to src/java/org/apache/commons/codec/Decoder.java src/java/org/apache/commons/codec2/Decoder.java renamed to src/java/org/apache/commons/codec/Decoder.java

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

…che/commons/codec2/DecoderException.java …ache/commons/codec/DecoderException.javasrc/java/org/apache/commons/codec2/DecoderException.java renamed to src/java/org/apache/commons/codec/DecoderException.java src/java/org/apache/commons/codec2/DecoderException.java renamed to src/java/org/apache/commons/codec/DecoderException.java

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

…a/org/apache/commons/codec2/Encoder.java …va/org/apache/commons/codec/Encoder.javasrc/java/org/apache/commons/codec2/Encoder.java renamed to src/java/org/apache/commons/codec/Encoder.java src/java/org/apache/commons/codec2/Encoder.java renamed to src/java/org/apache/commons/codec/Encoder.java

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

…che/commons/codec2/EncoderException.java …ache/commons/codec/EncoderException.javasrc/java/org/apache/commons/codec2/EncoderException.java renamed to src/java/org/apache/commons/codec/EncoderException.java src/java/org/apache/commons/codec2/EncoderException.java renamed to src/java/org/apache/commons/codec/EncoderException.java

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

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

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