Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4e3351ea Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4e3351ea Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4e3351ea Branch: refs/heads/3.0.x-fixes Commit: 4e3351ea605f6ea71e0242130b3d0c33b8c41918 Parents: c9eeeda Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Dec 11 09:55:46 2014 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Dec 11 09:55:46 2014 +0000 ---------------------------------------------------------------------- .../cxf/systest/http/HTTPSClientTest.java | 8 --- .../cxf/systest/http/jaxws-publish-callback.xml | 64 -------------------- 2 files changed, 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4e3351ea/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java index 80c2da0..8e5ed3d 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java @@ -153,14 +153,6 @@ public class HTTPSClientTest extends AbstractBusClientServerTestBase { "https://localhost:"; + BusServer.getPort(1) + "/SoapContext/HttpsPort"); } @Test -<<<<<<< HEAD -======= - public final void testJaxwsEndpointCallback() throws Exception { - testSuccessfulCall("jaxws-publish-callback.xml", - "https://localhost:"; + BusServer.getPort(1) + "/SoapContext/HttpsPort"); - } - @Test ->>>>>>> d4a35c4... Initial refactor of transports systests public final void testJaxwsTLSRefsEndpoint() throws Exception { testSuccessfulCall("jaxws-tlsrefs-publish.xml", "https://localhost:"; + BusServer.getPort(1) + "/SoapContext/HttpsPort"); http://git-wip-us.apache.org/repos/asf/cxf/blob/4e3351ea/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>
