--- ooo300-m5/apache-commons/java/httpclient/makefile.mk.alt 2008-09-11 21:06:14 +0400
+++ ooo300-m5/apache-commons/java/httpclient/makefile.mk 2008-09-11 21:47:47 +0400
@@ -50,7 +50,7 @@ TARFILE_NAME=commons-httpclient-3.1-src
TARFILE_ROOTDIR=commons-httpclient-3.1
-#PATCH_FILE_NAME=$(PRJ)$/patches$/httpclient.patch
+PATCH_FILE_NAME=$(PRJ)$/patches$/httpclient.patch
#CONVERTFILES=build.xml
--- ooo300-m5/apache-commons/patches/httpclient.patch.alt 2008-09-11 21:51:00 +0400
+++ ooo300-m5/apache-commons/patches/httpclient.patch 2008-09-11 21:50:37 +0400
@@ -0,0 +1,154 @@
+--- misc/build/commons-httpclient-3.1/src/examples/ClientApp.java.old-author 2008-09-11 21:39:47 +0400
++++ misc/build/commons-httpclient-3.1/src/examples/ClientApp.java 2008-09-11 21:39:47 +0400
+@@ -61,7 +61,7 @@ import org.apache.commons.httpclient.met
+ * content as text and as rendered HTML.
+ *
+ * @author Sean C. Sullivan
+- * @author Ortwin Glück
++ * @author Ortwin Glueck
+ * @author Michael Becke
+ */
+ public class ClientApp {
+--- misc/build/commons-httpclient-3.1/src/examples/TrivialApp.java.old-author 2008-09-11 21:39:47 +0400
++++ misc/build/commons-httpclient-3.1/src/examples/TrivialApp.java 2008-09-11 21:39:47 +0400
+@@ -47,7 +47,7 @@ import org.apache.commons.httpclient.met
+ * how to use the Jakarta HttpClient API.
+ *
+ * @author Jeff Dever
+- * @author Ortwin Glück
++ * @author Ortwin Glueck
+ */
+ public class TrivialApp
+ {
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java.old-author 2008-09-11 21:39:47 +0400
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/ConnectMethod.java 2008-09-11 21:39:47 +0400
+@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
+ /**
+ * Establishes a tunneled HTTP connection via the CONNECT method.
+ *
+- * @author Ortwin Gl???ck
++ * @author Ortwin Glueck
+ * @author dIon Gillard
+ * @author Mike Bowler
+ * @author Oleg Kalnichevski
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java.old-author 2008-09-11 21:39:47 +0400
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClient.java 2008-09-11 21:39:47 +0400
+@@ -48,7 +48,7 @@ import org.apache.commons.logging.LogFac
+ * @author Rodney Waldhoff
+ * @author Sean C. Sullivan
+ * @author dIon Gillard
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+ * @author Michael Becke
+ * @author Mike Bowler
+ * @author Sam Maloney
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java.old-author 2008-09-11 21:39:48 +0400
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpClientError.java 2008-09-11 21:39:48 +0400
+@@ -33,7 +33,7 @@ package org.apache.commons.httpclient;
+ /**
+ * 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
+ */
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java.old-author 2008-09-11 21:39:47 +0400
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/HttpContentTooLargeException.java 2008-09-11 21:39:48 +0400
+@@ -3,7 +3,7 @@ package org.apache.commons.httpclient;
+ /**
+ * Signals that the response content was larger than anticipated.
+ *
+- * @author Ortwin Glück
++ * @author Ortwin Glueck
+ */
+ public class HttpContentTooLargeException extends HttpException {
+ private int maxlen;
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java.old-author 2008-09-11 21:39:48 +0400
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/WireLogInputStream.java 2008-09-11 21:39:48 +0400
+@@ -37,7 +37,7 @@ import java.io.InputStream;
+ /**
+ * Logs all data read to the wire LOG.
+ *
+- * @author Ortwin Gl�ck
++ * @author Ortwin Glueck
+ * @author Mike Bowler
+ * @author Oleg Kalnichevski
+ *
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java.old-author 2008-09-11 21:39:48 +0400
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/BasicScheme.java 2008-09-11 21:39:48 +0400
+@@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac
+ * @author Remy Maucherat
+ * @author Rodney Waldhoff
+ * @author Jeff Dever
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+ * @author Sean C. Sullivan
+ * @author Adrian Sutton
+ * @author Mike Bowler
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java.old-author 2008-09-11 21:39:48 +0400
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/DigestScheme.java 2008-09-11 21:39:48 +0400
+@@ -67,7 +67,7 @@ import org.apache.commons.logging.LogFac
+ * @author Remy Maucherat
+ * @author Rodney Waldhoff
+ * @author Jeff Dever
+- * @author Ortwin Gl?ck
++ * @author Ortwin Glueck
+ * @author Sean C. Sullivan
+ * @author Adrian Sutton
+ * @author Mike Bowler
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java.old-author 2008-09-11 21:39:48 +0400
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/HttpAuthenticator.java 2008-09-11 21:39:48 +0400
+@@ -62,7 +62,7 @@ import org.apache.commons.logging.LogFac
+ * @author Remy Maucherat
+ * @author Rodney Waldhoff
+ * @author Jeff Dever
+- * @author Ortwin Gl�ck
++ * @author Ortwin Glueck
+ * @author Sean C. Sullivan
+ * @author Adrian Sutton
+ * @author Mike Bowler
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java.old-author 2008-09-11 21:39:48 +0400
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/auth/NTLMScheme.java 2008-09-11 21:39:48 +0400
+@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
+ * @author Remy Maucherat
+ * @author Rodney Waldhoff
+ * @author Jeff Dever
+- * @author Ortwin Gl???ck
++ * @author Ortwin Glueck
+ * @author Sean C. Sullivan
+ * @author Adrian Sutton
+ * @author Mike Bowler
+--- misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java.old-author 2008-09-11 21:39:47 +0400
++++ misc/build/commons-httpclient-3.1/src/java/org/apache/commons/httpclient/methods/PostMethod.java 2008-09-11 21:39:47 +0400
+@@ -62,7 +62,7 @@ import org.apache.commons.logging.LogFac
+ * @author Remy Maucherat
+ * @author Doug Sale
+ * @author Jeff Dever
+- * @author Ortwin Gl???ck
++ * @author Ortwin Glueck
+ * @author Mike Bowler
+ * @author Oleg Kalnichevski
+ *
+--- misc/build/commons-httpclient-3.1/src/test/org/apache/commons/httpclient/TestHttps.java.old-author 2008-09-11 21:39:47 +0400
++++ misc/build/commons-httpclient-3.1/src/test/org/apache/commons/httpclient/TestHttps.java 2008-09-11 21:39:47 +0400
+@@ -49,7 +49,7 @@ import org.apache.commons.httpclient.met
+ * (see build.xml)
+ *
+ * @author Rodney Waldhoff
+- * @author Ortwin Glück
++ * @author Ortwin Glueck
+ * @version $Id: TestHttps.java 480424 2006-11-29 05:56:49Z bayard $
+ */
+ public class TestHttps extends TestCase {
+--- misc/build/commons-httpclient-3.1/src/test/org/apache/commons/httpclient/TestURIUtil2.java.old-author 2008-09-11 21:39:47 +0400
++++ misc/build/commons-httpclient-3.1/src/test/org/apache/commons/httpclient/TestURIUtil2.java 2008-09-11 21:39:47 +0400
+@@ -37,7 +37,7 @@ import junit.framework.*;
+ /**
+ * Tests the util.URIUtil class.
+ *
+- * @author Ortwin Glück
++ * @author Ortwin Glueck
+ *
+ * @since 2.0
+ */