http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/java/org/apache/cxf/systest/https/PushBack401.java ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/PushBack401.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/PushBack401.java new file mode 100644 index 0000000..d0fcac9 --- /dev/null +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/PushBack401.java @@ -0,0 +1,223 @@ +/** + * 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. + */ + +package org.apache.cxf.systest.https; + +import java.io.IOException; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import org.apache.cxf.common.util.Base64Utility; +import org.apache.cxf.endpoint.Endpoint; +import org.apache.cxf.helpers.IOUtils; +import org.apache.cxf.interceptor.Fault; +import org.apache.cxf.message.Exchange; +import org.apache.cxf.message.Message; +import org.apache.cxf.message.MessageImpl; +import org.apache.cxf.phase.AbstractPhaseInterceptor; +import org.apache.cxf.phase.Phase; +import org.apache.cxf.transport.Conduit; +import org.apache.cxf.transport.http.Headers; + +/* + * This interceptor will issue 401s + * No Authorization Header --> 401 Realm=Cronus + * Username Mary --> 401 Realm=Andromeda + * Username Edward --> 401 Realm=Zorantius + * Username George --> 401 Realm=Cronus + * If the password is not "password" a 401 is issued without + * realm. + */ +public class PushBack401 extends AbstractPhaseInterceptor<Message> { + + PushBack401() { + super(Phase.RECEIVE); + } + + /** + * This function extracts the user:pass token from + * the Authorization:Basic header. It returns a two element + * String array, the first being the userid, the second + * being the password. It returns null, if it cannot parse. + */ + private String[] extractUserPass(String token) { + try { + byte[] userpass = Base64Utility.decode(token); + String up = IOUtils.newStringFromBytes(userpass); + String user = up.substring(0, up.indexOf(':')); + String pass = up.substring(up.indexOf(':') + 1); + return new String[] {user, pass}; + } catch (Exception e) { + return null; + } + + } + + /** + * This function returns the realm which depends on + * the user name, as follows: + * <pre> + * Username Mary --> Andromeda + * Username Edward --> Zorantius + * Username George --> Cronus + * </pre> + * However, if the password is not "password" this function + * throws an exception, regardless. + */ + private String checkUserPass( + String user, + String pass + ) throws Exception { + //System.out.println("Got user: " + user + " pass: " + pass); + if (!"password".equals(pass)) { + throw new Exception("bad password"); + } + if ("Mary".equals(user)) { + return "Andromeda"; + } + if ("Edward".equals(user)) { + return "Zorantius"; + } + if ("George".equals(user)) { + return "Cronus"; + } + return null; + } + + @SuppressWarnings("unchecked") + public void handleMessage(Message message) throws Fault { + + Map<String, List<String>> headers = + (Map<String, List<String>>) + message.get(Message.PROTOCOL_HEADERS); + + List<String> auth = headers.get("Authorization"); + if (auth == null) { + // No Auth Header, respond with 401 Realm=Cronus + replyUnauthorized(message, "Cronus"); + return; + } else { + for (String a : auth) { + if (a.startsWith("Basic ")) { + String[] userpass = + extractUserPass(a.substring("Basic ".length())); + if (userpass != null) { + try { + String realm = + checkUserPass(userpass[0], userpass[1]); + if (realm != null) { + replyUnauthorized(message, realm); + return; + } else { + // Password is good and no realm + // We just return for successful fall thru. + return; + } + } catch (Exception e) { + // Bad Password + replyUnauthorized(message, null); + return; + } + } + } + } + // No Authorization: Basic + replyUnauthorized(message, null); + return; + } + } + + /** + * This function issues a 401 response back down the conduit. + * If the realm is not null, a WWW-Authenticate: Basic realm= + * header is sent. The interceptor chain is aborted stopping + * the Message from going to the servant. + */ + private void replyUnauthorized(Message message, String realm) { + Message outMessage = getOutMessage(message); + outMessage.put(Message.RESPONSE_CODE, + HttpURLConnection.HTTP_UNAUTHORIZED); + + if (realm != null) { + setHeader(outMessage, + "WWW-Authenticate", "Basic realm=" + realm); + } + message.getInterceptorChain().abort(); + try { + getConduit(message).prepare(outMessage); + close(outMessage); + } catch (IOException e) { + //System.out.println("Prepare of message not working." + e); + e.printStackTrace(); + } + } + + /** + * Retrieves/creates the corresponding Outbound Message. + */ + private Message getOutMessage(Message message) { + Exchange exchange = message.getExchange(); + Message outMessage = exchange.getOutMessage(); + if (outMessage == null) { + Endpoint endpoint = exchange.get(Endpoint.class); + outMessage = new MessageImpl(); + outMessage.putAll(message); + outMessage.remove(Message.PROTOCOL_HEADERS); + outMessage.setExchange(exchange); + outMessage = endpoint.getBinding().createMessage(outMessage); + exchange.setOutMessage(outMessage); + } + return outMessage; + } + + /** + * This function sets the header in the PROTOCO_HEADERS of + * the message. + */ + private void setHeader(Message message, String key, String value) { + Map<String, List<String>> responseHeaders = Headers.getSetProtocolHeaders(message); + responseHeaders.put(key, Arrays.asList(new String[] {value})); + } + + /** + * This method retrieves/creates the conduit for the response + * message. + */ + private Conduit getConduit(Message message) throws IOException { + Exchange exchange = message.getExchange(); + Conduit conduit = + exchange.getDestination().getBackChannel(message); + exchange.setConduit(conduit); + return conduit; + } + + /** + * This method closes the output stream associated with the + * message. + */ + private void close(Message message) throws IOException { + OutputStream os = message.getContent(OutputStream.class); + os.flush(); + os.close(); + } + +}
http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf index c3cf97f..a250d5d 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf @@ -41,7 +41,7 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <http:destination name="{http://apache.org/hello_world}Abost.http-destination";> - <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.6}/Hurlon"/> + <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.3}/Hurlon"/> </http:destination> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/Bethal.cxf ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Bethal.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Bethal.cxf deleted file mode 100644 index d41cf7a..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Bethal.cxf +++ /dev/null @@ -1,84 +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. ---> - -<!-- - ** This file configures the Bethal Server. - ** It is an https server that conditionally responds - ** with 401s. - --> - -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:cxf="http://cxf.apache.org/core"; - xmlns:sec="http://cxf.apache.org/configuration/security"; - xmlns:http="http://cxf.apache.org/transports/http/configuration"; - xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; - xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"; - xsi:schemaLocation=" - http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd - http://cxf.apache.org/configuration/security - http://cxf.apache.org/schemas/configuration/security.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://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - - <http:destination - name="{http://apache.org/hello_world}Bethal.http-destination";> - </http:destination> - - <httpj:engine-factory bus="cxf"> - <httpj:engine port="${testutil.ports.BusServer.2}"> - <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v"> - <sec:keyStore type="JKS" password="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v" - resource="keys/Bethal.jks"/> - </sec:keyManagers> - <sec:trustManagers> - <sec:keyStore type="JKS" password="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v" - resource="keys/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> - <sec:clientAuthentication want="true" required="true"/> - </httpj:tlsServerParameters> - </httpj:engine> - </httpj:engine-factory> - - <cxf:bus> - <cxf:inInterceptors> - <bean class="org.apache.cxf.systest.http.PushBack401"/> - </cxf:inInterceptors> - </cxf:bus> - -</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientBeans.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientBeans.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientBeans.xml deleted file mode 100644 index 9ed185f..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientBeans.xml +++ /dev/null @@ -1,24 +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:sec="http://cxf.apache.org/configuration/security"; 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"; xsi:schemaLocation=" http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.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://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.xs d"> - <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - <import resource="classpath:org/apache/cxf/systest/http/BethalClientConfig.cxf"/> - <jaxws:client xmlns:s="http://apache.org/hello_world"; id="Bethal" serviceClass="org.apache.hello_world.Greeter" serviceName="s:SOAPService" endpointName="s:Bethal" address="https://localhost:${testutil.ports.BusServer.2}/Bethal"/> -</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientConfig.cxf ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientConfig.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientConfig.cxf deleted file mode 100644 index a3d65e2..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/BethalClientConfig.cxf +++ /dev/null @@ -1,69 +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:sec="http://cxf.apache.org/configuration/security"; - xmlns:http="http://cxf.apache.org/transports/http/configuration"; - xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; - xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"; - xsi:schemaLocation=" - http://cxf.apache.org/configuration/security - http://cxf.apache.org/schemas/configuration/security.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://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - - <http:conduit name="{http://apache.org/hello_world}Bethal.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: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:authorization> - <sec:UserName>Betty</sec:UserName> - <sec:Password>password</sec:Password> - </http:authorization> - <http:client AutoRedirect="true" Connection="Keep-Alive"/> - - </http:conduit> - -</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/Gordy.cxf ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Gordy.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Gordy.cxf deleted file mode 100644 index aada724..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Gordy.cxf +++ /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. ---> - -<!-- - ** This file configures the Gordy Server. - ** It is an https server that redirects to Bethal. - --> - - -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:sec="http://cxf.apache.org/configuration/security"; - xmlns:http="http://cxf.apache.org/transports/http/configuration"; - xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; - xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"; - xsi:schemaLocation=" - http://cxf.apache.org/configuration/security - http://cxf.apache.org/schemas/configuration/security.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://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - - <http:destination - name="{http://apache.org/hello_world}Gordy.http-destination";> - <http:server RedirectURL="https://localhost:${testutil.ports.BusServer.2}/Bethal"/> - </http:destination> - - <httpj:engine-factory bus="cxf"> - <httpj:engine port="${testutil.ports.BusServer.1}"> - <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: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> - <sec:clientAuthentication want="true" required="true"/> - </httpj:tlsServerParameters> - </httpj:engine> - </httpj:engine-factory> - -</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf index 9fe2240..3114e0d 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf @@ -42,7 +42,7 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <http:destination name="{http://apache.org/hello_world}Hurlon.http-destination";> - <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.7}/Abost"/> + <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.2}/Abost"/> </http:destination> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/Morpit.cxf ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Morpit.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Morpit.cxf deleted file mode 100644 index 4c830e7..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Morpit.cxf +++ /dev/null @@ -1,75 +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. ---> - -<!-- - ** This file configures the Morpit Server. It is just an - ** Https server with a name that will kick in the HostnameVerifier. - --> - - -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:sec="http://cxf.apache.org/configuration/security"; - xmlns:http="http://cxf.apache.org/transports/http/configuration"; - xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; - xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"; - xsi:schemaLocation=" - http://cxf.apache.org/configuration/security - http://cxf.apache.org/schemas/configuration/security.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://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - - <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination";> - </http:destination> - - <httpj:engine-factory bus="cxf"> - <httpj:engine port="${testutil.ports.BusServer.8}"> - <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: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> - <sec:clientAuthentication want="true" required="true"/> - </httpj:tlsServerParameters> - </httpj:engine> - </httpj:engine-factory> - -</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/Poltim.cxf ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Poltim.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Poltim.cxf deleted file mode 100644 index b383889..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Poltim.cxf +++ /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. ---> - -<!-- - ** This file configures the Poltim Server. - ** It is an https server that redirects to Mortimer. - --> - - -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:sec="http://cxf.apache.org/configuration/security"; - xmlns:http="http://cxf.apache.org/transports/http/configuration"; - xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; - xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"; - xsi:schemaLocation=" - http://cxf.apache.org/configuration/security - http://cxf.apache.org/schemas/configuration/security.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://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - - <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - - <http:destination name="{http://apache.org/hello_world}Poltim.http-destination";> - <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.0}/Mortimer"/> - </http:destination> - - <httpj:engine-factory bus="cxf"> - <httpj:engine port="${testutil.ports.BusServer.5}"> - <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" - resource="keys/Poltim.jks"/> - </sec:keyManagers> - <sec:trustManagers> - <sec:keyStore type="JKS" password="password" - resource="keys/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> - <sec:clientAuthentication want="true" required="true"/> - </httpj:tlsServerParameters> - </httpj:engine> - </httpj:engine-factory> - -</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/Tarpin.cxf ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Tarpin.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Tarpin.cxf deleted file mode 100644 index bbe6d72..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Tarpin.cxf +++ /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. ---> - -<!-- - ** This file configures the Tarpin Server. - ** It is an https server that redirects to Gordy. - --> - - -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:sec="http://cxf.apache.org/configuration/security"; - xmlns:http="http://cxf.apache.org/transports/http/configuration"; - xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"; - xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"; - xsi:schemaLocation=" - http://cxf.apache.org/configuration/security - http://cxf.apache.org/schemas/configuration/security.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://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - - <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - - <http:destination name="{http://apache.org/hello_world}Tarpin.http-destination";> - <http:server RedirectURL="https://localhost:${testutil.ports.BusServer.1}/Gordy"/> - </http:destination> - - <httpj:engine-factory bus="cxf"> - <httpj:engine port="${testutil.ports.BusServer.3}"> - <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="password"> - <sec:keyStore type="JKS" password="password" - file="src/test/resources/keys/Tarpin.jks"/> - </sec:keyManagers> - <sec:trustManagers> - <sec:keyStore type="JKS" password="password" - file="src/test/resources/keys/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> - <sec:clientAuthentication want="true" required="true"/> - </httpj:tlsServerParameters> - </httpj:engine> - </httpj:engine-factory> - -</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml deleted file mode 100644 index bdea016..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish-callback.xml +++ /dev/null @@ -1,64 +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 --> - <!-- --> - <httpj:engine-factory id="port-9001-tls-config"> - <httpj:engine port="${testutil.ports.BusServer.1}"> - <httpj:tlsServerParameters> - <sec:keyManagers keyPasswordCallbackHandler="org.apache.cxf.systest.http.KeyPasswordCallbackHandler"> - <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Bethal.jks"/> - </sec:keyManagers> - <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Truststore.jks"/> - </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 keyPasswordCallbackHandler="org.apache.cxf.systest.http.KeyPasswordCallbackHandler"> - <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Morpit.jks"/> - </sec:keyManagers> - <sec:trustManagers> - <sec:keyStore type="JKS" password="password" file="src/test/resources/keys/Truststore.jks"/> - </sec:trustManagers> - </http:tlsClientParameters> - </http:conduit> -</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish.xml deleted file mode 100644 index 1d8190d..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-publish.xml +++ /dev/null @@ -1,64 +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 --> - <!-- --> - <httpj:engine-factory id="port-9001-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> - </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> - </http:tlsClientParameters> - </http:conduit> -</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server-constraints.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server-constraints.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server-constraints.xml deleted file mode 100644 index 753e0a4..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/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/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-server.xml deleted file mode 100644 index 2ded663..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/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/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-tlsrefs-publish.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-tlsrefs-publish.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/jaxws-tlsrefs-publish.xml deleted file mode 100644 index 18c2bc8..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/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.http.HTTPSClientTest$ServerManagersFactory" factory-method="getKeyManagers"/> - <bean id="serverTrustManagers" class="org.apache.cxf.systest.http.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.http.HTTPSClientTest$ClientManagersFactory" factory-method="getKeyManagers"/> - <bean id="clientTrustManagers" class="org.apache.cxf.systest.http.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/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/pkcs12.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/pkcs12.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/pkcs12.xml deleted file mode 100644 index d01a2a0..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/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/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec-url.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec-url.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec-url.xml deleted file mode 100644 index 0e70d13..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/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/94585ae0/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec.xml ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http/resource-key-spec.xml deleted file mode 100644 index a1f9bba..0000000 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/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>
