Author: jsc Date: Mon Jun 16 08:22:43 2014 New Revision: 1602821 URL: http://svn.apache.org/r1602821 Log: #124442# adapt patch to make it buildable
Modified: openoffice/branches/AOO410/main/apache-commons/patches/httpclient.patch Modified: openoffice/branches/AOO410/main/apache-commons/patches/httpclient.patch URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/apache-commons/patches/httpclient.patch?rev=1602821&r1=1602820&r2=1602821&view=diff ============================================================================== --- openoffice/branches/AOO410/main/apache-commons/patches/httpclient.patch (original) +++ openoffice/branches/AOO410/main/apache-commons/patches/httpclient.patch Mon Jun 16 08:22:43 2014 @@ -1,120 +1,31 @@ -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:mbow...@gargoylesoftware.com">Mike Bowler</a> - * @author <a href="mailto:o...@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:rwaldh...@apache.org">Rodney Waldhoff</a> - * @author Sean C. Sullivan - * @author <a href="mailto:d...@apache.org">dIon Gillard</a> -- * @author Ortwin Gl?ck -+ * @author Ortwin Glueck - * @author <a href="mailto:be...@u.washington.edu">Michael Becke</a> - * @author <a href="mailto:mbow...@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:mbow...@gargoylesoftware.com">Mike Bowler</a> - * @author <a href="mailto:o...@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:r...@apache.org">Remy Maucherat</a> - * @author Rodney Waldhoff - * @author <a href="mailto:jsde...@apache.org">Jeff Dever</a> -- * @author Ortwin Gl?ck -+ * @author Ortwin Glueck - * @author Sean C. Sullivan - * @author <a href="mailto:adr...@ephox.com">Adrian Sutton</a> - * @author <a href="mailto:mbow...@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:r...@apache.org">Remy Maucherat</a> - * @author Rodney Waldhoff - * @author <a href="mailto:jsde...@apache.org">Jeff Dever</a> -- * @author Ortwin Gl?ck -+ * @author Ortwin Glueck - * @author Sean C. Sullivan - * @author <a href="mailto:adr...@ephox.com">Adrian Sutton</a> - * @author <a href="mailto:mbow...@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:r...@apache.org">Remy Maucherat</a> - * @author Rodney Waldhoff - * @author <a href="mailto:jsde...@apache.org">Jeff Dever</a> -- * @author Ortwin Gl�ck -+ * @author Ortwin Glueck - * @author Sean C. Sullivan - * @author <a href="mailto:adr...@ephox.com">Adrian Sutton</a> - * @author <a href="mailto:mbow...@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:r...@apache.org">Remy Maucherat</a> - * @author Rodney Waldhoff - * @author <a href="mailto:jsde...@apache.org">Jeff Dever</a> -- * @author Ortwin Gl???ck -+ * @author Ortwin Glueck - * @author Sean C. Sullivan - * @author <a href="mailto:adr...@ephox.com">Adrian Sutton</a> - * @author <a href="mailto:mbow...@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:r...@apache.org">Remy Maucherat</a> - * @author <a href="mailto:ds...@us.britannica.com">Doug Sale</a> - * @author <a href="mailto:jsde...@apache.org">Jeff Dever</a> -- * @author Ortwin Gl???ck -+ * @author Ortwin Glueck - * @author <a href="mailto:mbow...@gargoylesoftware.com">Mike Bowler</a> - * @author <a href="mailto:o...@ural.ru">Oleg Kalnichevski</a> - * +--- misc/commons-httpclient-3.1/build.xml 2007-08-18 11:02:14.000000000 +0200 ++++ misc/build/commons-httpclient-3.1/build.xml 2014-03-11 15:25:51.000000000 +0100 +@@ -181,14 +181,16 @@ + destdir ="${build.home}/classes" + debug ="${compile.debug}" + deprecation ="${compile.deprecation}" +- optimize ="${compile.optimize}"> ++ optimize ="${compile.optimize}" ++ encoding ="iso8859-1"> + <classpath refid="compile.classpath"/> + </javac> + <javac srcdir ="${source.home}/examples" + destdir ="${build.home}/examples" + debug ="${compile.debug}" + deprecation ="${compile.deprecation}" +- optimize ="${compile.optimize}"> ++ optimize ="${compile.optimize}" ++ encoding ="iso8859-1"> + <classpath refid="compile.classpath"/> + </javac> + </target> +@@ -199,7 +201,8 @@ + destdir ="${build.home}/tests" + debug ="${compile.debug}" + deprecation ="${compile.deprecation}" +- optimize ="${compile.optimize}"> ++ optimize ="${compile.optimize}" ++ encoding ="iso8859-1"> + <classpath refid="test.classpath"/> + </javac> + <copy todir="${build.home}/tests" filtering="on">