This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push: new 21138b4 [cxf-systests-ws-specs] put cxf-rt-ws-policy before wss4j-ws-security-stax to have expected schemas on classpath 21138b4 is described below commit 21138b4ce300510f442475f1a59b2fac03f366dd Author: amarkevich <amarkev...@talend.com> AuthorDate: Thu Mar 14 15:08:03 2019 +0300 [cxf-systests-ws-specs] put cxf-rt-ws-policy before wss4j-ws-security-stax to have expected schemas on classpath --- systests/ws-specs/pom.xml | 8 ++++---- .../java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml | 11 ++++++++--- .../java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml | 10 ++++++++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/systests/ws-specs/pom.xml b/systests/ws-specs/pom.xml index b25552f..49cb0b9 100644 --- a/systests/ws-specs/pom.xml +++ b/systests/ws-specs/pom.xml @@ -154,19 +154,19 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-rm</artifactId> + <artifactId>cxf-rt-ws-policy</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-features-logging</artifactId> + <artifactId>cxf-rt-ws-rm</artifactId> <version>${project.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-policy</artifactId> + <artifactId>cxf-rt-features-logging</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml index 0860dd8..f7b94f9 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml @@ -18,14 +18,19 @@ 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:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:p="http://cxf.apache.org/policy" xmlns:jaxws="http://cxf.apache.org/jaxws" - xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" - xsi:schemaLocation="http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd http://cxf.apache.org/ws/addressing http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.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://www.springframework.org/schema/beans http://www.springframe [...] + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd + http://cxf.apache.org/ws/addressing http://cxf.apache.org/schema/ws/addressing.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.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://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://cxf.apache.org/greeter_control}GreeterPort.http-conduit"> <http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/> diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml index c1298ba..b49e23e 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml @@ -18,13 +18,19 @@ 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:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:p="http://cxf.apache.org/policy" xmlns:jaxws="http://cxf.apache.org/jaxws" - xsi:schemaLocation="http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd http://cxf.apache.org/ws/addressing http://cxf.apache.org/schema/ws/addressing.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.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://www.springframework.org/schema/beans http://www.springframe [...] + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd + http://cxf.apache.org/ws/addressing http://cxf.apache.org/schema/ws/addressing.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.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://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://cxf.apache.org/greeter_control}GreeterPort.http-conduit"> <http:client DecoupledEndpoint="http://localhost:${testutil.ports.decoupled}/decoupled_endpoint"/>