Author: dkulp
Date: Fri Mar 28 11:43:10 2008
New Revision: 642331
URL: http://svn.apache.org/viewvc?rev=642331&view=rev
Log:
Merged revisions 642215 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r642215 | gmazza | 2008-03-28 09:02:09 -0400 (Fri, 28 Mar 2008) | 1 line
Fix failed systests.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java?rev=642331&r1=642330&r2=642331&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
Fri Mar 28 11:43:10 2008
@@ -117,6 +117,7 @@
addrMap.put("Abost", "http://localhost:9007/";);
addrMap.put("Hurlon", "http://localhost:9006/";);
addrMap.put("Morpit", "https://localhost:9008/";);
+ tlsClientParameters.setDisableCNCheck(true);
}
static {
@@ -440,8 +441,8 @@
HTTPClientPolicy httpClientPolicy = http.getClient();
assertEquals("the httpClientPolicy's autoRedirect should be true",
true, httpClientPolicy.isAutoRedirect());
- TLSClientParameters tlsParaments = http.getTlsClientParameters();
- assertNotNull("the http conduite's tlsParaments should not be null",
tlsParaments);
+ TLSClientParameters tlsParameters = http.getTlsClientParameters();
+ assertNotNull("the http conduit's tlsParameters should not be null",
tlsParameters);
// If we set any name, but Edward, Mary, or George,
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf?rev=642331&r1=642330&r2=642331&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
Fri Mar 28 11:43:10 2008
@@ -35,7 +35,7 @@
<http:conduit name="{http://apache.org/hello_world}Bethal.http-conduit";>
- <http:tlsClientParameters>
+ <http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password"
file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml?rev=642331&r1=642330&r2=642331&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
Fri Mar 28 11:43:10 2008
@@ -77,7 +77,7 @@
<!-- HTTP/S configuration for clients -->
<!-- -->
<http:conduit
name="{http://apache.org/hello_world/services}HttpsPort.http-conduit";>
- <http:tlsClientParameters>
+ <http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password"
file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml?rev=642331&r1=642330&r2=642331&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
Fri Mar 28 11:43:10 2008
@@ -80,7 +80,7 @@
<!-- HTTP/S configuration for clients -->
<!-- -->
<http:conduit
name="{http://apache.org/hello_world/services}HttpsPort.http-conduit";>
- <http:tlsClientParameters>
+ <http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password"
file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml?rev=642331&r1=642330&r2=642331&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
Fri Mar 28 11:43:10 2008
@@ -82,7 +82,7 @@
<!-- HTTP/S configuration for clients -->
<!-- -->
<http:conduit
name="{http://apache.org/hello_world/services}HttpsPort.http-conduit";>
- <http:tlsClientParameters>
+ <http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
<sec:keyStore type="pkcs12" password="password"
file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.p12"/>
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml?rev=642331&r1=642330&r2=642331&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
Fri Mar 28 11:43:10 2008
@@ -81,7 +81,7 @@
<!-- This test exercises the resource attribute in a keyStore and
certStore element -->
<!-- -->
<http:conduit
name="{http://apache.org/hello_world/services}HttpsPort.http-conduit";>
- <http:tlsClientParameters>
+ <http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
<sec:keyStore type="pkcs12" password="password"
resource="org/apache/cxf/systest/http/resources/Morpit.p12"/>
