Author: ggregory Date: Fri Aug 12 17:27:38 2011 New Revision: 1157192 URL: http://svn.apache.org/viewvc?rev=1157192&view=rev Log: 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
Added: commons/proper/codec/trunk/src/java/org/apache/commons/codec/BinaryDecoder.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/BinaryDecoder.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/BinaryEncoder.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/BinaryEncoder.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/CharEncoding.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/CharEncoding.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/Decoder.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/Decoder.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/DecoderException.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/DecoderException.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/Encoder.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/Encoder.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/EncoderException.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/EncoderException.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringDecoder.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringDecoder.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoder.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoder.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoderComparator.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoderComparator.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/ - copied from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/ commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base32.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base32.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base32InputStream.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base32InputStream.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base32OutputStream.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base32OutputStream.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64InputStream.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64InputStream.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64OutputStream.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64OutputStream.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodec.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodec.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BinaryCodec.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BinaryCodec.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Hex.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Hex.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/StringUtils.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/StringUtils.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/package.html - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/package.html commons/proper/codec/trunk/src/java/org/apache/commons/codec/digest/ - copied from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/digest/ commons/proper/codec/trunk/src/java/org/apache/commons/codec/digest/DigestUtils.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/digest/DigestUtils.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/digest/package.html - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/digest/package.html commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ - copied from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/AbstractCaverphone.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/AbstractCaverphone.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Caverphone1.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Caverphone1.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Caverphone2.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Caverphone2.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/DoubleMetaphone.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/DoubleMetaphone.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Metaphone.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Metaphone.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/RefinedSoundex.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/RefinedSoundex.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Soundex.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Soundex.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/SoundexUtils.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/SoundexUtils.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/ - copied from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/ commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/Lang.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/Lang.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/Languages.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/Languages.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/NameType.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/NameType.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/PhoneticEngine.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/PhoneticEngine.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/ResourceConstants.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/ResourceConstants.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/Rule.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/Rule.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/RuleType.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/bm/RuleType.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/package.html - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/package.html commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/ - copied from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/ commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/BCodec.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/BCodec.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QuotedPrintableCodec.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QuotedPrintableCodec.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/RFC1522Codec.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/RFC1522Codec.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/URLCodec.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/URLCodec.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/Utils.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/Utils.java commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/package.html - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/package.html commons/proper/codec/trunk/src/java/org/apache/commons/codec/overview.html - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/overview.html commons/proper/codec/trunk/src/java/org/apache/commons/codec/package.html - copied unchanged from r1156840, commons/proper/codec/trunk/src/java/org/apache/commons/codec/package.html commons/proper/codec/trunk/src/test/org/apache/commons/codec/BinaryEncoderAbstractTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/BinaryEncoderAbstractTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/CharEncodingTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/CharEncodingTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/DecoderExceptionTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/DecoderExceptionTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/EncoderExceptionTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/EncoderExceptionTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderAbstractTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderAbstractTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/StringEncoderComparatorTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/ - copied from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/ commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base32InputStreamTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base32InputStreamTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base32OutputStreamTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base32OutputStreamTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base32Test.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base32Test.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base32TestData.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base32TestData.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Codec13Test.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Codec13Test.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64InputStreamTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64InputStreamTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64OutputStreamTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64OutputStreamTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64TestData.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64TestData.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/BaseNCodecTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/BaseNCodecTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/BinaryCodecTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/BinaryCodecTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Codec105ErrorInputStream.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Codec105ErrorInputStream.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/HexTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/HexTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/StringUtilsTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/StringUtilsTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/digest/ - copied from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/digest/ commons/proper/codec/trunk/src/test/org/apache/commons/codec/digest/DigestUtilsTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/digest/DigestUtilsTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ - copied from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone1Test.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone1Test.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone2Test.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone2Test.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphone2Test.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphone2Test.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/MetaphoneTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/MetaphoneTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/RefinedSoundexTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/RefinedSoundexTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/bm/ - copied from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/bm/ commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/bm/BeiderMorseEncoderTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/bm/LanguageGuessingTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/bm/LanguageGuessingTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/bm/PhoneticEngineTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/bm/PhoneticEngineTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/bm/RuleTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/bm/RuleTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/ - copied from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/ commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/BCodecTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/BCodecTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/QCodecTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/QCodecTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/QuotedPrintableCodecTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/QuotedPrintableCodecTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/RFC1522CodecTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/RFC1522CodecTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/URLCodecTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/URLCodecTest.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/UtilsTest.java - copied unchanged from r1156840, commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/UtilsTest.java Removed: commons/proper/codec/trunk/src/java/org/apache/commons/codec2/ commons/proper/codec/trunk/src/test/org/apache/commons/codec2/ Modified: commons/proper/codec/trunk/default.properties commons/proper/codec/trunk/pom.xml Modified: commons/proper/codec/trunk/default.properties URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/default.properties?rev=1157192&r1=1157191&r2=1157192&view=diff ============================================================================== --- commons/proper/codec/trunk/default.properties (original) +++ commons/proper/codec/trunk/default.properties Fri Aug 12 17:27:38 2011 @@ -28,7 +28,7 @@ junit.jar = ${junit.home}/junit-4.8.2.ja 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 Modified: commons/proper/codec/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=1157192&r1=1157191&r2=1157192&view=diff ============================================================================== --- commons/proper/codec/trunk/pom.xml (original) +++ commons/proper/codec/trunk/pom.xml Fri Aug 12 17:27:38 2011 @@ -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>