You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by pk...@apache.org on 2006/03/25 12:38:04 UTC
svn commit: r388745 - in /lucene/nutch/branches/branch-0.7: ./ src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/

Author: pkosiorowski
Date: Sat Mar 25 03:37:59 2006
New Revision: 388745

URL: http://svn.apache.org/viewcvs?rev=388745&view=rev
Log:
NUTCH-239 -  I changed httpclient to use javax.net.ssl instead of com.sun.net.ssl. (Jake Vanderdray)

Modified:
    lucene/nutch/branches/branch-0.7/CHANGES.txt
    lucene/nutch/branches/branch-0.7/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java
    lucene/nutch/branches/branch-0.7/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java

Modified: lucene/nutch/branches/branch-0.7/CHANGES.txt
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/branch-0.7/CHANGES.txt?rev=388745&r1=388744&r2=388745&view=diff
==============================================================================
--- lucene/nutch/branches/branch-0.7/CHANGES.txt (original)
+++ lucene/nutch/branches/branch-0.7/CHANGES.txt Sat Mar 25 03:37:59 2006
@@ -24,6 +24,9 @@
 
 10. Skipping "post" and "nofollow" outlinks.
 
+11. NUTCH-239 - I changed httpclient to use javax.net.ssl instead of
+com.sun.net.ssl. (Jake Vanderdray).
+
 
 Release 0.7.1 - 2005-10-01
 

Modified: lucene/nutch/branches/branch-0.7/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/branch-0.7/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java?rev=388745&r1=388744&r2=388745&view=diff
==============================================================================
--- lucene/nutch/branches/branch-0.7/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java (original)
+++ lucene/nutch/branches/branch-0.7/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java Sat Mar 25 03:37:59 2006
@@ -22,8 +22,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.sun.net.ssl.SSLContext;
-import com.sun.net.ssl.TrustManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
 
 public class DummySSLProtocolSocketFactory implements ProtocolSocketFactory {
 

Modified: lucene/nutch/branches/branch-0.7/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java
URL: http://svn.apache.org/viewcvs/lucene/nutch/branches/branch-0.7/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java?rev=388745&r1=388744&r2=388745&view=diff
==============================================================================
--- lucene/nutch/branches/branch-0.7/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java (original)
+++ lucene/nutch/branches/branch-0.7/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java Sat Mar 25 03:37:59 2006
@@ -10,9 +10,9 @@
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
-import com.sun.net.ssl.TrustManagerFactory;
-import com.sun.net.ssl.TrustManager;
-import com.sun.net.ssl.X509TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
 import org.apache.commons.logging.Log; 
 import org.apache.commons.logging.LogFactory;
 
@@ -38,23 +38,33 @@
     }
 
     /**
-     * @see com.sun.net.ssl.X509TrustManager#isClientTrusted(X509Certificate[])
+     * @see javax.net.ssl.X509TrustManager#isClientTrusted(X509Certificate[])
      */
     public boolean isClientTrusted(X509Certificate[] certificates) {
         return true;
     }
 
     /**
-     * @see com.sun.net.ssl.X509TrustManager#isServerTrusted(X509Certificate[])
+     * @see javax.net.ssl.X509TrustManager#isServerTrusted(X509Certificate[])
      */
     public boolean isServerTrusted(X509Certificate[] certificates) {
       return true;
     }
 
     /**
-     * @see com.sun.net.ssl.X509TrustManager#getAcceptedIssuers()
+     * @see javax.net.ssl.X509TrustManager#getAcceptedIssuers()
      */
     public X509Certificate[] getAcceptedIssuers() {
         return this.standardTrustManager.getAcceptedIssuers();
+    }
+
+    public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
+      // do nothing
+      
+    }
+
+    public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
+      // do nothing
+      
     }
 }