Update Apache Commons

Update commons-codec to version 1.6.
Update commons-lang to version 2.4.
Patch common-httpclient to avoid building issues
with OpenJDK-7.

These versions maintain ABI compatibility while
using features from newer Java versions and
have been tested on the FreeBSD port.

6 files changed, 145 insertions, 22 deletions

diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk
index 571cc5695061..4fab6d18cfba 100644
--- a/apache-commons/java/codec/makefile.mk
+++ b/apache-commons/java/codec/makefile.mk
@@ -38,16 +38,16 @@ ANT_BUILDFILE=build.xml
 .IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=commons-codec-1.3-src
-TARFILE_MD5=af3c3acf618de6108d65fcdc92b492e1
+TARFILE_NAME=commons-codec-1.6-src
+TARFILE_MD5=2e482c7567908d334785ce7d69ddfff7
 
-TARFILE_ROOTDIR=commons-codec-1.3
+TARFILE_ROOTDIR=commons-codec-1.6-src
 
 PATCH_FILES=$(PRJ)$/patches$/codec.patch
 
 #CONVERTFILES=build.xml
                 
-OUT2CLASS=dist$/commons-codec-1.3.jar
+OUT2CLASS=dist$/commons-codec-1.6-SNAPSHOT.jar
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk
index 8769c36e7b47..c506952d72a5 100644
--- a/apache-commons/java/httpclient/makefile.mk
+++ b/apache-commons/java/httpclient/makefile.mk
@@ -45,14 +45,14 @@ TARFILE_MD5=2c9b0f83ed5890af02c0df1c1776f39b
 
 TARFILE_ROOTDIR=commons-httpclient-3.1
 
-#PATCH_FILES=$(PRJ)$/patches$/httpclient.patch
+PATCH_FILES=$(PRJ)$/patches$/httpclient.patch
 
 #CONVERTFILES=build.xml
                 
 OUT2CLASS=dist$/commons-httpclient.jar
 
 COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.1-SNAPSHOT.jar
-COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.3.jar
+COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.6-SNAPSHOT.jar
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
diff --git a/apache-commons/java/lang/makefile.mk b/apache-commons/java/lang/makefile.mk
index 11d144f65ff8..0dceb8bd9ee6 100644
--- a/apache-commons/java/lang/makefile.mk
+++ b/apache-commons/java/lang/makefile.mk
@@ -40,16 +40,16 @@ TAR!:=$(GNUTAR)
 .IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=commons-lang-2.3-src
-TARFILE_MD5=2ae988b339daec234019a7066f96733e
+TARFILE_NAME=commons-lang-2.4-src
+TARFILE_MD5=625ff5f2f968dd908bca43c9469d6e6b
 
-TARFILE_ROOTDIR=commons-lang-2.3-src
+TARFILE_ROOTDIR=commons-lang-2.4-src
 
 #PATCH_FILES=$(PRJ)$/patches$/logging.patch
 
 #CONVERTFILES=build.xml
                 
-OUT2CLASS=dist$/commons-lang-2.3.jar
+OUT2CLASS=dist$/commons-lang-2.4.jar
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
diff --git a/apache-commons/patches/codec.patch b/apache-commons/patches/codec.patch
index dea25ad263d2..6b4b3e14d408 100644
--- a/apache-commons/patches/codec.patch
+++ b/apache-commons/patches/codec.patch
@@ -1,17 +1,20 @@
---- misc/build/commons-codec-1.3/build.xml-old	2008-01-31 15:28:58.000000000 +0100
-+++ misc/build/commons-codec-1.3/build.xml	2008-01-31 15:29:21.000000000 +0100
-@@ -90,14 +90,12 @@
+--- misc/build/commons-codec-1.6-src/build.xml-old	2012-05-05 22:12:32.000000000 -0500
++++ misc/build/commons-codec-1.6-src/build.xml	2012-05-05 22:16:00.000000000 -0500
+@@ -96,7 +96,6 @@
      </target>

-     <target name="dist" depends="compile,javadoc" description="Create binary distribution">

+     <target name="dist" depends="compile, javadoc" description="Create binary distribution">

          <mkdir dir="${dist.home}"/>

--        <copy file="../LICENSE" todir="${dist.home}"/>

+-        <copy file="${basedir}/LICENSE.txt" todir="${dist.home}"/>

+         <copy file="${basedir}/NOTICE.txt" todir="${dist.home}"/>

          <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>

          <antcall target="jar"/>

-     </target>

+@@ -104,8 +103,7 @@
      <target name="jar" depends="compile" description="Create jar">

          <mkdir dir="${dist.home}"/>

          <mkdir dir="${build.home}/classes/META-INF"/>

--        <copy file="../LICENSE" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>

-         <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes" manifest="${build.home}/conf/MANIFEST.MF"/>

-     </target>

-     <target name="install-jar" depends="jar" description="--> Installs jar file in ${lib.repo}">

+-        <copy file="${basedir}/LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>

+-        <copy file="${basedir}/LICENSE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>

++        <copy file="${basedir}/NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>

+         <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes">

+             <manifest>

+                 <attribute name="Specification-Title" value="Commons Codec"/>

diff --git a/apache-commons/patches/httpclient.patch b/apache-commons/patches/httpclient.patch
new file mode 100644
index 000000000000..aa56904fced7
--- /dev/null
+++ b/apache-commons/patches/httpclient.patch
@@ -0,0 +1,120 @@
+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/ConnectMethod.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/ConnectMethod.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java	2012-05-07 12:37:50.000000000 -0500
+@@ -38,7 +38,7 @@
+ /**
+  * Establishes a tunneled HTTP connection via the CONNECT method.
+  *
+- * @author Ortwin Gl???ck
++ * @author Ortwin Glueck
+  * @author dIon Gillard
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+  * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClient.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClient.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java	2012-05-07 12:37:50.000000000 -0500
+@@ -48,7 +48,7 @@
+  * @author <a href="mailto:rwaldhoff@apache.org">Rodney Waldhoff</a>
+  * @author Sean C. Sullivan
+  * @author <a href="mailto:dion@apache.org">dIon Gillard</a>
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+  * @author <a href="mailto:becke@u.washington.edu">Michael Becke</a>
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+  * @author Sam Maloney
+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClientError.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpClientError.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java	2012-05-07 12:37:50.000000000 -0500
+@@ -33,7 +33,7 @@
+ /**
+  * Signals that an error has occurred.
+  * 
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+  * @version $Revision: 480424 $ $Date: 2006-11-29 06:56:49 +0100 (Wed, 29 Nov 2006) $
+  * @since 3.0
+  */
+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpContentTooLargeException.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/HttpContentTooLargeException.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java	2012-05-07 12:37:50.000000000 -0500
+@@ -3,7 +3,7 @@
+ /**
+  * Signals that the response content was larger than anticipated. 
+  * 
+- * @author Ortwin Glück
++ * @author Ortwin Glueck
+  */
+ public class HttpContentTooLargeException extends HttpException {
+     private int maxlen;
+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/WireLogInputStream.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/WireLogInputStream.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java	2012-05-07 12:37:50.000000000 -0500
+@@ -37,7 +37,7 @@
+ /**
+  * Logs all data read to the wire LOG.
+  *
+- * @author Ortwin Gl�ck
++ * @author Ortwin Glueck
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+  * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
+  * 
+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/BasicScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/BasicScheme.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java	2012-05-07 12:37:50.000000000 -0500
+@@ -46,7 +46,7 @@
+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
+  * @author Rodney Waldhoff
+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+  * @author Sean C. Sullivan
+  * @author <a href="mailto:adrian@ephox.com">Adrian Sutton</a>
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/DigestScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/DigestScheme.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java	2012-05-07 12:37:50.000000000 -0500
+@@ -67,7 +67,7 @@
+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
+  * @author Rodney Waldhoff
+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+  * @author Sean C. Sullivan
+  * @author <a href="mailto:adrian@ephox.com">Adrian Sutton</a>
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/HttpAuthenticator.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/HttpAuthenticator.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java	2012-05-07 12:37:50.000000000 -0500
+@@ -62,7 +62,7 @@
+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
+  * @author Rodney Waldhoff
+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
+- * @author Ortwin Gl�ck
++ * @author Ortwin Glueck
+  * @author Sean C. Sullivan
+  * @author <a href="mailto:adrian@ephox.com">Adrian Sutton</a>
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/NTLMScheme.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/auth/NTLMScheme.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java	2012-05-07 12:37:50.000000000 -0500
+@@ -43,7 +43,7 @@
+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
+  * @author Rodney Waldhoff
+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
+- * @author Ortwin Gl???ck
++ * @author Ortwin Glueck
+  * @author Sean C. Sullivan
+  * @author <a href="mailto:adrian@ephox.com">Adrian Sutton</a>
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+diff -ru misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/methods/PostMethod.java misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient.orig/methods/PostMethod.java	2012-05-07 12:34:01.000000000 -0500
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java	2012-05-07 12:37:50.000000000 -0500
+@@ -62,7 +62,7 @@
+  * @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
+  * @author <a href="mailto:dsale@us.britannica.com">Doug Sale</a>
+  * @author <a href="mailto:jsdever@apache.org">Jeff Dever</a>
+- * @author Ortwin Gl???ck
++ * @author Ortwin Glueck
+  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
+  * @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
+  *
diff --git a/apache-commons/prj/d.lst b/apache-commons/prj/d.lst
index 21f6e01700ea..ae3130b4577a 100644
--- a/apache-commons/prj/d.lst
+++ b/apache-commons/prj/d.lst
@@ -1,5 +1,5 @@
 ..\%__SRC%\class\commons-logging-1.1.1-SNAPSHOT.jar %_DEST%\bin%_EXT%\commons-logging-1.1.1.jar
-..\%__SRC%\class\commons-codec-1.3.jar %_DEST%\bin%_EXT%\commons-codec-1.3.jar
+..\%__SRC%\class\commons-codec-1.6-SNAPSHOT.jar %_DEST%\bin%_EXT%\commons-codec-1.6.jar
 ..\%__SRC%\class\commons-httpclient.jar %_DEST%\bin%_EXT%\commons-httpclient-3.1.jar
-..\%__SRC%\class\commons-lang-2.3.jar %_DEST%\bin%_EXT%\commons-lang-2.3.jar
+..\%__SRC%\class\commons-lang-2.6.jar %_DEST%\bin%_EXT%\commons-lang-2.6.jar