hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1631214 - in /httpcomponents/httpcore/trunk/httpcore/src/test: java/org/apache/http/ java/org/apache/http/ssl/ resources/
Date Sun, 12 Oct 2014 17:06:33 GMT
Author: olegk
Date: Sun Oct 12 17:06:33 2014
New Revision: 1631214

URL: http://svn.apache.org/r1631214
Log:
Copied SSLContextBuilder tests from HttpClient

Added:
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/TestSSLContextBuilder.java
  (contents, props changed)
      - copied, changed from r1631209, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLContextBuilder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/ssl/
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/hc-test-1.truststore   (props
changed)
      - copied unchanged from r1631210, httpcomponents/httpclient/trunk/httpclient/src/test/resources/hc-test-1.truststore
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/hc-test-2.truststore   (props
changed)
      - copied unchanged from r1631210, httpcomponents/httpclient/trunk/httpclient/src/test/resources/hc-test-2.truststore
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-keypasswd.keystore   (props
changed)
      - copied unchanged from r1631210, httpcomponents/httpclient/trunk/httpclient/src/test/resources/test-keypasswd.keystore
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/test.keystore   (props changed)
      - copied unchanged from r1631210, httpcomponents/httpclient/trunk/httpclient/src/test/resources/test.keystore

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/TestSSLContextBuilder.java
(from r1631209, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLContextBuilder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/TestSSLContextBuilder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/TestSSLContextBuilder.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLContextBuilder.java&r1=1631209&r2=1631214&rev=1631214&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLContextBuilder.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/TestSSLContextBuilder.java
Sun Oct 12 17:06:33 2014
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.conn.ssl;
+package org.apache.http.ssl;
 
 import java.io.InputStream;
 import java.net.URL;
@@ -62,8 +62,8 @@ public class TestSSLContextBuilder {
         new SSLContextBuilder()
                 .useProtocol(null)
                 .setSecureRandom(null)
-                .loadTrustMaterial(null)
-                .loadKeyMaterial(null, null)
+                .loadTrustMaterial((KeyStore) null)
+                .loadKeyMaterial((KeyStore) null, null)
                 .build();
     }
 

Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/TestSSLContextBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/TestSSLContextBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/TestSSLContextBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Oct 12 17:06:33 2014
@@ -0,0 +1,6 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLContextBuilder.java:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLContextBuilder.java:1079518-1080165
+/httpcomponents/httpclient/branches/4.2.x/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLContextBuilder.java:1376150-1376151,1447062
+/httpcomponents/httpclient/branches/branch_4_1/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLContextBuilder.java:755593-811107
+/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLContextBuilder.java:1154913-1160573
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLContextBuilder.java:1024348-1031454

Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/TestSSLContextBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/resources/hc-test-1.truststore
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Oct 12 17:06:33 2014
@@ -0,0 +1,6 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/resources/hc-test-1.truststore:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/resources/hc-test-1.truststore:1079518-1080165
+/httpcomponents/httpclient/branches/4.2.x/httpclient/src/test/resources/hc-test-1.truststore:1376150-1376151,1447062
+/httpcomponents/httpclient/branches/branch_4_1/httpclient/src/test/resources/hc-test-1.truststore:755593-811107
+/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient/src/test/resources/hc-test-1.truststore:1154913-1160573
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/test/resources/hc-test-1.truststore:1024348-1031454

Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/resources/hc-test-1.truststore
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/resources/hc-test-2.truststore
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Oct 12 17:06:33 2014
@@ -0,0 +1,6 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/resources/hc-test-2.truststore:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/resources/hc-test-2.truststore:1079518-1080165
+/httpcomponents/httpclient/branches/4.2.x/httpclient/src/test/resources/hc-test-2.truststore:1376150-1376151,1447062
+/httpcomponents/httpclient/branches/branch_4_1/httpclient/src/test/resources/hc-test-2.truststore:755593-811107
+/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient/src/test/resources/hc-test-2.truststore:1154913-1160573
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/test/resources/hc-test-2.truststore:1024348-1031454

Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/resources/hc-test-2.truststore
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-keypasswd.keystore
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Oct 12 17:06:33 2014
@@ -0,0 +1,6 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/resources/test-keypasswd.keystore:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/resources/test-keypasswd.keystore:1079518-1080165
+/httpcomponents/httpclient/branches/4.2.x/httpclient/src/test/resources/test-keypasswd.keystore:1376150-1376151,1447062
+/httpcomponents/httpclient/branches/branch_4_1/httpclient/src/test/resources/test-keypasswd.keystore:755593-811107
+/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient/src/test/resources/test-keypasswd.keystore:1154913-1160573
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/test/resources/test-keypasswd.keystore:1024348-1031454

Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-keypasswd.keystore
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/resources/test.keystore
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Oct 12 17:06:33 2014
@@ -0,0 +1,6 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient/src/test/resources/test.keystore:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient/src/test/resources/test.keystore:1079518-1080165
+/httpcomponents/httpclient/branches/4.2.x/httpclient/src/test/resources/test.keystore:1376150-1376151,1447062
+/httpcomponents/httpclient/branches/branch_4_1/httpclient/src/test/resources/test.keystore:755593-811107
+/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient/src/test/resources/test.keystore:1154913-1160573
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/test/resources/test.keystore:1024348-1031454



Mime
View raw message