Author: coheigea
Date: Fri Mar 22 10:52:10 2013
New Revision: 1459706
URL: http://svn.apache.org/r1459706
Log:
Fixing some TLS stuff in the tests
Modified:
cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml
Modified:
cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml?rev=1459706&r1=1459705&r2=1459706&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
(original)
+++
cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
Fri Mar 22 10:52:10 2013
@@ -76,7 +76,8 @@
address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport";
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/";
- serviceName="ns1:SecurityTokenService"
endpointName="ns1:Transport_Port">
+ serviceName="ns1:SecurityTokenService"
endpointName="ns1:Transport_Port"
+ depends-on="ClientAuthHttpsSettings">
<jaxws:properties>
<entry key="ws-security.callback-handler"
value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
Modified:
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml?rev=1459706&r1=1459705&r2=1459706&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
(original)
+++
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml
Fri Mar 22 10:52:10 2013
@@ -63,6 +63,7 @@
<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>
Modified:
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml?rev=1459706&r1=1459705&r2=1459706&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
(original)
+++
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml
Fri Mar 22 10:52:10 2013
@@ -138,7 +138,7 @@
address="https://localhost:${testutil.ports.Server.2}/DoubleItClientCert";
serviceName="s:DoubleItService"
endpointName="s:DoubleItClientCertPort"
xmlns:s="http://www.example.org/contract/DoubleIt";
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
-
wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl">
+
wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"
depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.callback-handler"
Modified:
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml?rev=1459706&r1=1459705&r2=1459706&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
(original)
+++
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
Fri Mar 22 10:52:10 2013
@@ -134,7 +134,8 @@
endpointName="s:DoubleItSaml1SelfSignedTransportPort"
xmlns:s="http://www.example.org/contract/DoubleIt";
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
- wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"
+ depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -153,7 +154,8 @@
endpointName="s:DoubleItSaml1SelfSignedTransportSP11Port"
xmlns:s="http://www.example.org/contract/DoubleIt";
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
- wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"
+ depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -172,7 +174,8 @@
endpointName="s:DoubleItSaml2EndorsingTransportPort"
xmlns:s="http://www.example.org/contract/DoubleIt";
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
- wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"
+ depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -191,7 +194,8 @@
endpointName="s:DoubleItSaml2EndorsingTransportSP11Port"
xmlns:s="http://www.example.org/contract/DoubleIt";
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
- wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"
+ depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -296,7 +300,8 @@
endpointName="s:DoubleItSaml2EndorsingEncryptedTransportPort"
xmlns:s="http://www.example.org/contract/DoubleIt";
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
- wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"
+ depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -315,7 +320,8 @@
endpointName="s:DoubleItInlinePolicyPort"
xmlns:s="http://www.example.org/contract/DoubleIt";
implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
- wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"
+ depends-on="tls-settings">
<jaxws:properties>
<entry key="ws-security.callback-handler"
Modified:
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml?rev=1459706&r1=1459705&r2=1459706&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml
(original)
+++
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml
Fri Mar 22 10:52:10 2013
@@ -60,14 +60,15 @@
<sec:keyStore type="jks" password="password"
resource="org/apache/cxf/systest/ws/wssec10/certs/alice.jks"/>
</sec:trustManagers>
- <!--
<sec:cipherSuitesFilter>
<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>
+ <!--
<sec:clientAuthentication want="true" required="true"/>
-->
</httpj:tlsServerParameters>
Modified:
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml?rev=1459706&r1=1459705&r2=1459706&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
(original)
+++
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml
Fri Mar 22 10:52:10 2013
@@ -60,14 +60,15 @@
<sec:keyStore type="jks" password="password"
resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks"/>
</sec:trustManagers>
- <!--
<sec:cipherSuitesFilter>
<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>
+ <!--
<sec:clientAuthentication want="true" required="true"/>
-->
</httpj:tlsServerParameters>
@@ -96,8 +97,7 @@
address="http://localhost:${testutil.ports.Server}/UserName";
serviceName="interop:PingService"
endpointName="interop:UserName_IPingService"
-
implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"
- depends-on="tls-settings">
+
implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted">
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
Modified:
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml?rev=1459706&r1=1459705&r2=1459706&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml
(original)
+++
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml
Fri Mar 22 10:52:10 2013
@@ -53,14 +53,15 @@
<sec:keyStore type="jks" password="password"
resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks"/>
</sec:trustManagers>
- <!--
<sec:cipherSuitesFilter>
<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>
+ <!--
<sec:clientAuthentication want="true" required="true"/>
-->
</httpj:tlsServerParameters>
Modified:
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml?rev=1459706&r1=1459705&r2=1459706&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml
(original)
+++
cxf/branches/wss4j2.0-port/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml
Fri Mar 22 10:52:10 2013
@@ -53,14 +53,15 @@
<sec:keyStore type="jks" password="password"
resource="org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks"/>
</sec:trustManagers>
- <!--
<sec:cipherSuitesFilter>
<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>
+ <!--
<sec:clientAuthentication want="true" required="true"/>
-->
</httpj:tlsServerParameters>
