You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/05/04 14:07:15 UTC
svn commit: r1333892 - in
/cxf/branches/2.4.x-fixes/systests/ws-security/src/test:
java/org/apache/cxf/systest/ws/security/
resources/org/apache/cxf/systest/ws/security/
Author: coheigea
Date: Fri May 4 12:07:14 2012
New Revision: 1333892
URL: http://svn.apache.org/viewvc?rev=1333892&view=rev
Log:
Fix for sporadically failing systest with JDK 1.7
Added:
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml
- copied, changed from r1333838, cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml
Modified:
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml
Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java?rev=1333892&r1=1333891&r2=1333892&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java Fri May 4 12:07:14 2012
@@ -208,7 +208,8 @@ public class SecurityPolicyTest extends
public void testPolicy() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
- Bus bus = bf.createBus();
+ URL busFile = SecurityPolicyTest.class.getResource("https_config_client.xml");
+ Bus bus = bf.createBus(busFile.toString());
SpringBusFactory.setDefaultBus(bus);
SpringBusFactory.setThreadDefaultBus(bus);
Modified: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml?rev=1333892&r1=1333891&r2=1333892&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml Fri May 4 12:07:14 2012
@@ -74,32 +74,4 @@ under the License.
</httpj:engine>
</httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <http:conduit name="{http://www.example.org/contract/DoubleIt}DoubleItPortHttps.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password"
- resource="org/apache/cxf/systest/ws/security/Morpit.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password"
- resource="org/apache/cxf/systest/ws/security/Truststore.jks"/>
- </sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_DES_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- <sec:include>.*_WITH_NULL_.*</sec:include>
- <sec:exclude>.*_DH_anon_.*</sec:exclude>
- </sec:cipherSuitesFilter>
- </http:tlsClientParameters>
- </http:conduit>
-
-</beans>
\ No newline at end of file
+</beans>
Copied: cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml (from r1333838, cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml)
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml?p2=cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml&p1=cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml&r1=1333838&r2=1333892&rev=1333892&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config_client.xml Fri May 4 12:07:14 2012
@@ -33,48 +33,6 @@ under the License.
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<!-- -->
- <!-- This Spring config file is designed to represent a minimal -->
- <!-- configuration for spring-loading a CXF servant, where the -->
- <!-- servant listens using HTTP/S as the transport protocol. -->
- <!-- -->
- <!-- Note that the service endpoint is spring-loaded. In the -->
- <!-- scenario in which this config is designed to run, the -->
- <!-- server application merely instantiates a Bus, and does not -->
- <!-- publish any services programmatically -->
- <!-- -->
-
-
- <!-- -->
- <!-- TLS Port configuration parameters for port 9009 -->
- <!-- -->
- <httpj:engine-factory id="port-9009-tls-config">
- <httpj:engine port="${testutil.ports.SecurityPolicyTest.1}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password"
- resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password"
- resource="org/apache/cxf/systest/ws/security/Truststore.jks"/>
- </sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_DES_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- <sec:include>.*_WITH_NULL_.*</sec:include>
- <sec:exclude>.*_DH_anon_.*</sec:exclude>
- </sec:cipherSuitesFilter>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
-
- <!-- -->
<!-- HTTP/S configuration for clients -->
<!-- -->
<http:conduit name="{http://www.example.org/contract/DoubleIt}DoubleItPortHttps.http-conduit">
@@ -102,4 +60,4 @@ under the License.
</http:tlsClientParameters>
</http:conduit>
-</beans>
\ No newline at end of file
+</beans>