hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject svn commit: r1662569 - in /httpcomponents/httpclient/trunk: ./ fluent-hc/ httpclient-cache/ httpclient-win/ httpclient/ httpclient/src/main/java/org/apache/http/conn/ssl/ httpclient/src/main/java/org/apache/http/impl/auth/ httpmime/ src/docbkx/
Date Thu, 26 Feb 2015 20:59:57 GMT
Author: michaelo
Date: Thu Feb 26 20:59:56 2015
New Revision: 1662569

URL: http://svn.apache.org/r1662569
Log:
HTTPCLIENT-1623: Several files still refer to Java 1.5

Modified:
    httpcomponents/httpclient/trunk/README.txt
    httpcomponents/httpclient/trunk/fluent-hc/pom.xml
    httpcomponents/httpclient/trunk/httpclient-cache/pom.xml
    httpcomponents/httpclient/trunk/httpclient-win/pom.xml
    httpcomponents/httpclient/trunk/httpclient/pom.xml
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
    httpcomponents/httpclient/trunk/httpmime/pom.xml
    httpcomponents/httpclient/trunk/src/docbkx/connmgmt.xml

Modified: httpcomponents/httpclient/trunk/README.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/README.txt?rev=1662569&r1=1662568&r2=1662569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/README.txt (original)
+++ httpcomponents/httpclient/trunk/README.txt Thu Feb 26 20:59:56 2015
@@ -11,7 +11,7 @@ For building from source instructions pl
 Dependencies
 ------------
 
-HttpClient main module requires Java 5.0 compatible runtime and
+HttpClient main module requires Java 6 compatible runtime and
 depends on the following external libraries:
 
 * Apache HttpComponents HttpCore
@@ -20,7 +20,7 @@ depends on the following external librar
 
 (for detailed information on external dependencies please see pom.xml)
 
-HttpMime module is optional and requires Java 5.0 compatible runtime
+HttpMime module is optional and requires Java 6 compatible runtime
 and depends on the following external libraries:
 
 * Apache HttpComponents HttpCore

Modified: httpcomponents/httpclient/trunk/fluent-hc/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/pom.xml?rev=1662569&r1=1662568&r2=1662569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/pom.xml (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/pom.xml Thu Feb 26 20:59:56 2015
@@ -94,7 +94,7 @@
           <quiet>true</quiet>
           <source>${maven.compiler.source}</source>
           <links>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
+            <link>http://docs.oracle.com/javase/6/docs/api/</link>
             <link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
             <link>http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/</link>
           </links>

Modified: httpcomponents/httpclient/trunk/httpclient-cache/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/pom.xml?rev=1662569&r1=1662568&r2=1662569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/pom.xml Thu Feb 26 20:59:56 2015
@@ -153,7 +153,7 @@
           <quiet>true</quiet>
           <source>${maven.compiler.source}</source>
           <links>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
+            <link>http://docs.oracle.com/javase/6/docs/api/</link>
             <link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
             <link>http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/</link>
           </links>

Modified: httpcomponents/httpclient/trunk/httpclient-win/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/pom.xml?rev=1662569&r1=1662568&r2=1662569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/pom.xml Thu Feb 26 20:59:56 2015
@@ -80,7 +80,7 @@
           <quiet>true</quiet>
           <source>${maven.compiler.source}</source>
           <links>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
+            <link>http://docs.oracle.com/javase/6/docs/api/</link>
             <link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
           </links>
         </configuration>

Modified: httpcomponents/httpclient/trunk/httpclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/pom.xml?rev=1662569&r1=1662568&r2=1662569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient/pom.xml Thu Feb 26 20:59:56 2015
@@ -139,7 +139,7 @@
           <quiet>true</quiet>
           <source>${maven.compiler.source}</source>
           <links>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
+            <link>http://docs.oracle.com/javase/6/docs/api/</link>
             <link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
           </links>
         </configuration>

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java?rev=1662569&r1=1662568&r2=1662569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
Thu Feb 26 20:59:56 2015
@@ -182,9 +182,8 @@ public class SSLConnectionSocketFactory
     /**
      * Obtains default SSL socket factory with an SSL context based on system properties
      * as described in
-     * <a href="http://docs.oracle.com/javase/1.5.0/docs/guide/security/jsse/JSSERefGuide.html">
-     * "JavaTM Secure Socket Extension (JSSE) Reference Guide for the JavaTM 2 Platform
-     * Standard Edition 5</a>
+     * <a href="http://docs.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html">
+     * Java&#x2122; Secure Socket Extension (JSSE) Reference Guide</a>.
      *
      * @return default system SSL socket factory
      */

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java?rev=1662569&r1=1662568&r2=1662569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java
Thu Feb 26 20:59:56 2015
@@ -33,9 +33,8 @@ import org.apache.http.annotation.Immuta
 
 /**
  * The Strict HostnameVerifier works the same way as Sun Java 1.4, Sun
- * Java 5, Sun Java 6-rc.  It's also pretty close to IE6.  This
- * implementation appears to be compliant with RFC 2818 for dealing with
- * wildcards.
+ * Java 5, Sun Java 6.  It's also pretty close to IE6.  This implementation
+ * appears to be compliant with RFC 2818 for dealing with wildcards.
  * <p>
  * The hostname must match either the first CN, or any of the subject-alts.
  * A wildcard can occur in the CN, and in any of the subject-alts.  The

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java?rev=1662569&r1=1662568&r2=1662569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
Thu Feb 26 20:59:56 2015
@@ -554,19 +554,6 @@ final class NTLMEngineImpl implements NT
     static byte[] ntlm2SessionResponse(final byte[] ntlmHash, final byte[] challenge,
             final byte[] clientChallenge) throws NTLMEngineException {
         try {
-            // Look up MD5 algorithm (was necessary on jdk 1.4.2)
-            // This used to be needed, but java 1.5.0_07 includes the MD5
-            // algorithm (finally)
-            // Class x = Class.forName("gnu.crypto.hash.MD5");
-            // Method updateMethod = x.getMethod("update",new
-            // Class[]{byte[].class});
-            // Method digestMethod = x.getMethod("digest",new Class[0]);
-            // Object mdInstance = x.newInstance();
-            // updateMethod.invoke(mdInstance,new Object[]{challenge});
-            // updateMethod.invoke(mdInstance,new Object[]{clientChallenge});
-            // byte[] digest = (byte[])digestMethod.invoke(mdInstance,new
-            // Object[0]);
-
             final MessageDigest md5 = MessageDigest.getInstance("MD5");
             md5.update(challenge);
             md5.update(clientChallenge);

Modified: httpcomponents/httpclient/trunk/httpmime/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/pom.xml?rev=1662569&r1=1662568&r2=1662569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpmime/pom.xml Thu Feb 26 20:59:56 2015
@@ -103,7 +103,7 @@
           <quiet>true</quiet>
           <source>${maven.compiler.source}</source>
           <links>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
+            <link>http://docs.oracle.com/javase/6/docs/api/</link>
             <link>http://hc.apache.org/httpcomponents-core-ga/httpcore/apidocs/</link>
           </links>
         </configuration>

Modified: httpcomponents/httpclient/trunk/src/docbkx/connmgmt.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/src/docbkx/connmgmt.xml?rev=1662569&r1=1662568&r2=1662569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/src/docbkx/connmgmt.xml (original)
+++ httpcomponents/httpclient/trunk/src/docbkx/connmgmt.xml Thu Feb 26 20:59:56 2015
@@ -445,8 +445,8 @@ SSLConnectionSocketFactory sslsf = new S
                 a certain degree of familiarity with the concepts of the SSL/TLS protocol,
                 a detailed explanation of which is out of scope for this document. Please
refer
                 to the <ulink
-                url="http://java.sun.com/j2se/1.5.0/docs/guide/security/jsse/JSSERefGuide.html">
-                Java Secure Socket Extension</ulink> for a detailed description of
+                url="http://docs.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html">
+                Java&#x2122; Secure Socket Extension (JSSE) Reference Guide</ulink>
for a detailed description of
                 <interfacename>javax.net.ssl.SSLContext</interfacename> and related
                 tools.</para>
         </section>



Mime
View raw message