You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ol...@apache.org on 2005/02/02 19:51:26 UTC
svn commit: r149546 - in jakarta/commons/proper/httpclient/trunk: project.xml
src/test/org/apache/commons/httpclient/ssl/SimpleSSLSocketFactory.java
src/test/org/apache/commons/httpclient/ssl/SimpleSSLTestProtocolSocketFactory.java
Author: olegk
Date: Wed Feb 2 10:51:25 2005
New Revision: 149546
URL: http://svn.apache.org/viewcvs?view=rev&rev=149546
Log:
Fixed the problem with the test server keytstore. Special thanks to Brett Porter <brett -at- apache.org>
Modified:
jakarta/commons/proper/httpclient/trunk/project.xml
jakarta/commons/proper/httpclient/trunk/src/test/org/apache/commons/httpclient/ssl/SimpleSSLSocketFactory.java
jakarta/commons/proper/httpclient/trunk/src/test/org/apache/commons/httpclient/ssl/SimpleSSLTestProtocolSocketFactory.java
Modified: jakarta/commons/proper/httpclient/trunk/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/httpclient/trunk/project.xml?view=diff&r1=149545&r2=149546
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/project.xml (original)
+++ jakarta/commons/proper/httpclient/trunk/project.xml Wed Feb 2 10:51:25 2005
@@ -295,6 +295,14 @@
<includes>
<include>**/TestNoHost.java</include>
</includes>
+ <resources>
+ <resource>
+ <directory>src/test</directory>
+ <includes>
+ <include>**/*.keystore</include>
+ </includes>
+ </resource>
+ </resources>
</unitTest>
</build>
Modified: jakarta/commons/proper/httpclient/trunk/src/test/org/apache/commons/httpclient/ssl/SimpleSSLSocketFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/httpclient/trunk/src/test/org/apache/commons/httpclient/ssl/SimpleSSLSocketFactory.java?view=diff&r1=149545&r2=149546
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/src/test/org/apache/commons/httpclient/ssl/SimpleSSLSocketFactory.java (original)
+++ jakarta/commons/proper/httpclient/trunk/src/test/org/apache/commons/httpclient/ssl/SimpleSSLSocketFactory.java Wed Feb 2 10:51:25 2005
@@ -59,9 +59,6 @@
try {
ClassLoader cl = SimpleSocketFactory.class.getClassLoader();
URL url = cl.getResource("org/apache/commons/httpclient/ssl/simpleserver.keystore");
- if (url == null) {
- url = new URL("file:src/test/org/apache/commons/httpclient/ssl/simpleserver.keystore");
- }
KeyStore keystore = KeyStore.getInstance("jks");
keystore.load(url.openStream(), "nopassword".toCharArray());
KeyManagerFactory kmfactory = KeyManagerFactory.getInstance(
Modified: jakarta/commons/proper/httpclient/trunk/src/test/org/apache/commons/httpclient/ssl/SimpleSSLTestProtocolSocketFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/httpclient/trunk/src/test/org/apache/commons/httpclient/ssl/SimpleSSLTestProtocolSocketFactory.java?view=diff&r1=149545&r2=149546
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/src/test/org/apache/commons/httpclient/ssl/SimpleSSLTestProtocolSocketFactory.java (original)
+++ jakarta/commons/proper/httpclient/trunk/src/test/org/apache/commons/httpclient/ssl/SimpleSSLTestProtocolSocketFactory.java Wed Feb 2 10:51:25 2005
@@ -58,9 +58,6 @@
try {
ClassLoader cl = SimpleSocketFactory.class.getClassLoader();
URL url = cl.getResource("org/apache/commons/httpclient/ssl/simpleserver.keystore");
- if (url == null) {
- url = new URL("file:src/test/org/apache/commons/httpclient/ssl/simpleserver.keystore");
- }
KeyStore keystore = KeyStore.getInstance("jks");
keystore.load(url.openStream(), "nopassword".toCharArray());
TrustManagerFactory tmfactory = TrustManagerFactory.getInstance(
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org