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 2014/12/12 18:49:24 UTC
[2/8] cxf git commit: Another refactor of systests/transports to make
the https tests more manageable
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad015a4/systests/transports/src/test/resources/org/apache/cxf/systest/https/jaxws-server-constraints.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/jaxws-server-constraints.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/jaxws-server-constraints.xml
deleted file mode 100644
index 753e0a4..0000000
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/jaxws-server-constraints.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <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 -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-0" address="https://localhost:${testutil.ports.BusServer.0}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.0-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-1" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.1-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-2" address="https://localhost:${testutil.ports.BusServer.2}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.2-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-3" address="https://localhost:${testutil.ports.BusServer.3}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.3-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-4" address="https://localhost:${testutil.ports.BusServer.4}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.4-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-5" address="https://localhost:${testutil.ports.BusServer.5}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.5-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-6" address="https://localhost:${testutil.ports.BusServer.6}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.6-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint-testutil-ports-BusServer-7" address="https://localhost:${testutil.ports.BusServer.7}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-testutil.ports.BusServer.7-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9000 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.0-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.0}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:SubjectDNConstraints>
- <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
- <sec:RegularExpression>.*OU=Morpit.*</sec:RegularExpression>
- </sec:SubjectDNConstraints>
- </sec:certConstraints>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9007 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.1-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.1}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:SubjectDNConstraints>
- <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
- </sec:SubjectDNConstraints>
- </sec:certConstraints>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9008 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.2-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.2}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:SubjectDNConstraints>
- <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
- <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
- </sec:SubjectDNConstraints>
- </sec:certConstraints>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9009 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.3-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.3}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:SubjectDNConstraints combinator="ANY">
- <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
- <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
- </sec:SubjectDNConstraints>
- </sec:certConstraints>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9010 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.4-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.4}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:IssuerDNConstraints combinator="ALL">
- <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
- <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
- </sec:IssuerDNConstraints>
- </sec:certConstraints>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9011 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.5-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.5}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:IssuerDNConstraints combinator="ANY">
- <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
- <sec:RegularExpression>.*O=BadApacheTest.*</sec:RegularExpression>
- </sec:IssuerDNConstraints>
- </sec:certConstraints>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9012 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.6-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.6}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:clientAuthentication required="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9013 -->
- <!-- -->
- <httpj:engine-factory id="port-testutil.ports.BusServer.7-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.7}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Gordy.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:clientAuthentication required="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certConstraints>
- <sec:SubjectDNConstraints>
- <sec:RegularExpression>.*CN=(Bethal|Gordy).*</sec:RegularExpression>
- <sec:RegularExpression>.*O=ApacheTest.*</sec:RegularExpression>
- </sec:SubjectDNConstraints>
- <sec:IssuerDNConstraints combinator="ANY">
- <sec:RegularExpression>.*CN=Bethal.*</sec:RegularExpression>
- <sec:RegularExpression>.*OU=Morpit.*</sec:RegularExpression>
- </sec:IssuerDNConstraints>
- </sec:certConstraints>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad015a4/systests/transports/src/test/resources/org/apache/cxf/systest/https/jaxws-server.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/jaxws-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/jaxws-server.xml
deleted file mode 100644
index 2ded663..0000000
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/jaxws-server.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <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 -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" address="https://localhost:${testutil.ports.BusServer.2}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9002-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <!-- Non http endpoint -->
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpEndpoint" address="http://localhost:${testutil.ports.BusServer.3}/SoapContext/HttpPort" serviceName="s:SOAPService" endpointName="e:HttpsPort">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9002 -->
- <!-- -->
- <httpj:engine-factory id="port-9002-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.2}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:clientAuthentication want="true" required="true"/>
- <sec:certAlias>bethal</sec:certAlias>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Morpit.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:certAlias>morpit</sec:certAlias>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad015a4/systests/transports/src/test/resources/org/apache/cxf/systest/https/jaxws-tlsrefs-publish.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/jaxws-tlsrefs-publish.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/jaxws-tlsrefs-publish.xml
deleted file mode 100644
index a9a73fd..0000000
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/jaxws-tlsrefs-publish.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <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 -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9001-tls-config"/>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9001 -->
- <!-- -->
- <bean id="serverKeyManagers" class="org.apache.cxf.systest.https.HTTPSClientTest$ServerManagersFactory" factory-method="getKeyManagers"/>
- <bean id="serverTrustManagers" class="org.apache.cxf.systest.https.HTTPSClientTest$ServerManagersFactory" factory-method="getTrustManagers"/>
- <httpj:engine-factory id="port-9001-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.1}">
- <httpj:tlsServerParameters>
- <sec:keyManagers ref="serverKeyManagers"/>
- <sec:trustManagers ref="serverTrustManagers"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <bean id="clientKeyManagers" class="org.apache.cxf.systest.https.HTTPSClientTest$ClientManagersFactory" factory-method="getKeyManagers"/>
- <bean id="clientTrustManagers" class="org.apache.cxf.systest.https.HTTPSClientTest$ClientManagersFactory" factory-method="getTrustManagers"/>
- <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers ref="clientKeyManagers"/>
- <sec:trustManagers ref="clientTrustManagers"/>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad015a4/systests/transports/src/test/resources/org/apache/cxf/systest/https/pkcs12.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/pkcs12.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/pkcs12.xml
deleted file mode 100644
index d01a2a0..0000000
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/pkcs12.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <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 -->
- <!-- -->
- <!-- This test ensures we can use PKCS12 keystores and PEM truststores -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:server xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" address="https://localhost:${testutil.ports.BusServer.6}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9006-tls-config">
- <jaxws:serviceBean>
- <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
- </jaxws:serviceBean>
- </jaxws:server>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9006 -->
- <!-- -->
- <httpj:engine-factory id="port-9006-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.6}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="pkcs12" password="password" resource="keys/Bethal.p12"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:certStore resource="keys/Truststore.pem"/>
- </sec:trustManagers>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <http:conduit name="{http://apache.org/hello_world/services}HttpsPort.http-conduit">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="pkcs12" password="password" resource="keys/Morpit.p12"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:certStore resource="keys/Truststore.pem"/>
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad015a4/systests/transports/src/test/resources/org/apache/cxf/systest/https/resource-key-spec-url.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/resource-key-spec-url.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/resource-key-spec-url.xml
deleted file mode 100644
index 0e70d13..0000000
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/resource-key-spec-url.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apach
e.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <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 -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.5}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" wsdlLocation="/wsdl/hello_world_services.wsdl" depends-on="port-9005-tls-config">
- <jaxws:features>
- <cxf:logging/>
- </jaxws:features>
- </jaxws:endpoint>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9005 -->
- <!-- -->
- <!-- This test exercises the resource attribute in a keyStore element -->
- <!-- -->
- <httpj:engine-factory id="port-9005-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.5}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <!-- This test exercises the resource attribute in a keyStore and certStore element -->
- <!-- -->
- <http:conduit name="https://localhost:.*/SoapContext/HttpsPort">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="pkcs12" password="password" resource="keys/Morpit.p12"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:certStore resource="keys/Truststore.pem"/>
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad015a4/systests/transports/src/test/resources/org/apache/cxf/systest/https/resource-key-spec.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/resource-key-spec.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/resource-key-spec.xml
deleted file mode 100644
index a1f9bba..0000000
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/resource-key-spec.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <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 -->
- <!-- -->
- <!-- -->
- <!-- Spring-load an HTTPS servant -->
- <!-- -->
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services" xmlns:s="http://apache.org/hello_world/services" id="JaxwsHttpsEndpoint" implementor="org.apache.cxf.systest.http.GreeterImpl" address="https://localhost:${testutil.ports.BusServer.4}/SoapContext/HttpsPort" serviceName="s:SOAPService" endpointName="e:HttpsPort" depends-on="port-9004-tls-config"/>
- <!-- -->
- <!-- TLS Port configuration parameters for port 9004 -->
- <!-- -->
- <!-- This test exercises the resource attribute in a keyStore element -->
- <!-- -->
- <httpj:engine-factory id="port-9004-tls-config">
- <httpj:engine port="${testutil.ports.BusServer.4}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" resource="keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <!-- -->
- <!-- HTTP/S configuration for clients -->
- <!-- -->
- <!-- 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 disableCNCheck="true">
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="pkcs12" password="password" resource="keys/Morpit.p12"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:certStore resource="keys/Truststore.pem"/>
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad015a4/systests/transports/src/test/resources/org/apache/cxf/systest/https/ssl3/sslv3-client-allow.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ssl3/sslv3-client-allow.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ssl3/sslv3-client-allow.xml
new file mode 100644
index 0000000..aff363c
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ssl3/sslv3-client-allow.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/poli
cy.xsd">
+ <cxf:bus>
+ <cxf:features>
+ <p:policies/>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+ <http:conduit name="https://localhost:.*">
+ <http:tlsClientParameters disableCNCheck="true" secureSocketProtocol="SSLv3">
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad015a4/systests/transports/src/test/resources/org/apache/cxf/systest/https/ssl3/sslv3-client.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ssl3/sslv3-client.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ssl3/sslv3-client.xml
new file mode 100644
index 0000000..00400cf
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ssl3/sslv3-client.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/poli
cy.xsd">
+ <cxf:bus>
+ <cxf:features>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+ <http:conduit name="https://localhost:.*">
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad015a4/systests/transports/src/test/resources/org/apache/cxf/systest/https/ssl3/sslv3-server.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ssl3/sslv3-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ssl3/sslv3-server.xml
new file mode 100644
index 0000000..e9f8f36
--- /dev/null
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ssl3/sslv3-server.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apa
che.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <cxf:bus>
+ <cxf:features>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <httpj:engine-factory id="default-tls-settings">
+ <httpj:engine port="${testutil.ports.SSLv3Server}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:clientAuthentication want="true" required="false"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services"
+ xmlns:s="http://apache.org/hello_world/services"
+ id="SSLv3NotAllowedByDefaultEndpoint"
+ implementor="org.apache.cxf.systest.http.GreeterImpl"
+ address="https://localhost:${testutil.ports.SSLv3Server}/SoapContext/HttpsPort"
+ serviceName="s:SOAPService"
+ endpointName="e:HttpsPort" depends-on="default-tls-settings"/>
+
+ <httpj:engine-factory id="allow-sslv3-settings">
+ <httpj:engine port="${testutil.ports.SSLv3Server.2}">
+ <httpj:tlsServerParameters secureSocketProtocol="SSLv3" >
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:clientAuthentication want="true" required="false"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services"
+ xmlns:s="http://apache.org/hello_world/services"
+ id="SSLv3AllowedByDefaultEndpoint"
+ implementor="org.apache.cxf.systest.http.GreeterImpl"
+ address="https://localhost:${testutil.ports.SSLv3Server.2}/SoapContext/HttpsPort"
+ serviceName="s:SOAPService"
+ endpointName="e:HttpsPort" depends-on="allow-sslv3-settings"/>
+
+ <httpj:engine-factory id="disallow-tls-via-configuration">
+ <httpj:engine port="${testutil.ports.SSLv3Server.3}">
+ <httpj:tlsServerParameters>
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:clientAuthentication want="true" required="false"/>
+ <sec:excludeProtocols>
+ <sec:excludeProtocol>TLS</sec:excludeProtocol>
+ <sec:excludeProtocol>TLSv1</sec:excludeProtocol>
+ <sec:excludeProtocol>TLSv1.1</sec:excludeProtocol>
+ <sec:excludeProtocol>TLSv1.2</sec:excludeProtocol>
+ </sec:excludeProtocols>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services"
+ xmlns:s="http://apache.org/hello_world/services"
+ id="TLSNotAllowedByEndpoint"
+ implementor="org.apache.cxf.systest.http.GreeterImpl"
+ address="https://localhost:${testutil.ports.SSLv3Server.3}/SoapContext/HttpsPort"
+ serviceName="s:SOAPService"
+ endpointName="e:HttpsPort" depends-on="disallow-tls-via-configuration"/>
+
+</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad015a4/systests/transports/src/test/resources/org/apache/cxf/systest/https/sslv3-client-allow.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/sslv3-client-allow.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/sslv3-client-allow.xml
deleted file mode 100644
index aff363c..0000000
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/sslv3-client-allow.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/poli
cy.xsd">
- <cxf:bus>
- <cxf:features>
- <p:policies/>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
- <http:conduit name="https://localhost:.*">
- <http:tlsClientParameters disableCNCheck="true" secureSocketProtocol="SSLv3">
- <sec:trustManagers>
- <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad015a4/systests/transports/src/test/resources/org/apache/cxf/systest/https/sslv3-client.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/sslv3-client.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/sslv3-client.xml
deleted file mode 100644
index 00400cf..0000000
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/sslv3-client.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/poli
cy.xsd">
- <cxf:bus>
- <cxf:features>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
- <http:conduit name="https://localhost:.*">
- <http:tlsClientParameters disableCNCheck="true">
- <sec:trustManagers>
- <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- </http:tlsClientParameters>
- </http:conduit>
-</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad015a4/systests/transports/src/test/resources/org/apache/cxf/systest/https/sslv3-server.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/sslv3-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/sslv3-server.xml
deleted file mode 100644
index e9f8f36..0000000
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/sslv3-server.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apa
che.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd ">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <cxf:bus>
- <cxf:features>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
-
- <httpj:engine-factory id="default-tls-settings">
- <httpj:engine port="${testutil.ports.SSLv3Server}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:clientAuthentication want="true" required="false"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
-
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services"
- xmlns:s="http://apache.org/hello_world/services"
- id="SSLv3NotAllowedByDefaultEndpoint"
- implementor="org.apache.cxf.systest.http.GreeterImpl"
- address="https://localhost:${testutil.ports.SSLv3Server}/SoapContext/HttpsPort"
- serviceName="s:SOAPService"
- endpointName="e:HttpsPort" depends-on="default-tls-settings"/>
-
- <httpj:engine-factory id="allow-sslv3-settings">
- <httpj:engine port="${testutil.ports.SSLv3Server.2}">
- <httpj:tlsServerParameters secureSocketProtocol="SSLv3" >
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:clientAuthentication want="true" required="false"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
-
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services"
- xmlns:s="http://apache.org/hello_world/services"
- id="SSLv3AllowedByDefaultEndpoint"
- implementor="org.apache.cxf.systest.http.GreeterImpl"
- address="https://localhost:${testutil.ports.SSLv3Server.2}/SoapContext/HttpsPort"
- serviceName="s:SOAPService"
- endpointName="e:HttpsPort" depends-on="allow-sslv3-settings"/>
-
- <httpj:engine-factory id="disallow-tls-via-configuration">
- <httpj:engine port="${testutil.ports.SSLv3Server.3}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
- </sec:trustManagers>
- <sec:clientAuthentication want="true" required="false"/>
- <sec:excludeProtocols>
- <sec:excludeProtocol>TLS</sec:excludeProtocol>
- <sec:excludeProtocol>TLSv1</sec:excludeProtocol>
- <sec:excludeProtocol>TLSv1.1</sec:excludeProtocol>
- <sec:excludeProtocol>TLSv1.2</sec:excludeProtocol>
- </sec:excludeProtocols>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
-
- <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services"
- xmlns:s="http://apache.org/hello_world/services"
- id="TLSNotAllowedByEndpoint"
- implementor="org.apache.cxf.systest.http.GreeterImpl"
- address="https://localhost:${testutil.ports.SSLv3Server.3}/SoapContext/HttpsPort"
- serviceName="s:SOAPService"
- endpointName="e:HttpsPort" depends-on="disallow-tls-via-configuration"/>
-
-</beans>