You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by an...@apache.org on 2007/06/06 05:22:35 UTC
svn commit: r544716 [1/2] - in /incubator/cxf/trunk/systests: ./
src/test/java/org/apache/cxf/systest/clustering/
src/test/java/org/apache/cxf/systest/coloc/
src/test/java/org/apache/cxf/systest/factory_pattern/
src/test/java/org/apache/cxf/systest/htt...
Author: andreasmyth
Date: Tue Jun 5 20:22:31 2007
New Revision: 544716
URL: http://svn.apache.org/viewvc?view=rev&rev=544716
Log:
[JIRA CXF-678] Fixed remaining system test cfg files so that Springs validating parser is now used in all CXF modules.
Added:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy-optional.xml
- copied unchanged from r544432, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy-optional.xsd
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy.xml
- copied unchanged from r544432, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy.xsd
Removed:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/managed-cxf.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy-optional.xsd
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/mtom-policy.xsd
Modified:
incubator/cxf/trunk/systests/pom.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/failover.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/targets.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/cxf.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/cxf.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost-2.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal-2.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy-2.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail-2.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect-2.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon-2.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit-2.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer-2.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim-2.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel-2.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin-2.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/client1.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/addr.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/fault-stack-trace.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/lifecycle/cxf.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/counter-spring.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/managed-spring.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/outofband/header/cxf.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/schema_validation/cxf-config.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/databinding-schema-validation.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-inline-policy.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr-optional.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/addr.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/http-server.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rm.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/policy/rmwsdl.xml
Modified: incubator/cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Tue Jun 5 20:22:31 2007
@@ -291,6 +291,6 @@
</dependencies>
<properties>
<surefire.fork.mode>pertest</surefire.fork.mode>
- <spring.validation.mode>VALIDATION_NONE</spring.validation.mode>
</properties>
+
</project>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/failover.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/failover.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/failover.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/failover.xml Tue Jun 5 20:22:31 2007
@@ -22,19 +22,20 @@
xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:clustering="http://cxf.apache.org/clustering"
xsi:schemaLocation="
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="Sequential" class="org.apache.cxf.clustering.SequentialStrategy"/>
<bean id="Random" class="org.apache.cxf.clustering.RandomStrategy"/>
- <jaxws:client id="{http://cxf.apache.org/greeter_control}ReplicatedPortA"
+ <jaxws:client name="{http://cxf.apache.org/greeter_control}ReplicatedPortA"
createdFromAPI="true">
<jaxws:features>
<clustering:failover/>
</jaxws:features>
</jaxws:client>
- <jaxws:client id="{http://cxf.apache.org/greeter_control}ReplicatedPortB"
+ <jaxws:client name="{http://cxf.apache.org/greeter_control}ReplicatedPortB"
createdFromAPI="true">
<jaxws:features>
<clustering:failover>
@@ -45,7 +46,7 @@
</jaxws:features>
</jaxws:client>
- <jaxws:client id="{http://cxf.apache.org/greeter_control}ReplicatedPortC"
+ <jaxws:client name="{http://cxf.apache.org/greeter_control}ReplicatedPortC"
createdFromAPI="true">
<jaxws:features>
<clustering:failover>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/targets.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/targets.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/targets.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/clustering/targets.xml Tue Jun 5 20:22:31 2007
@@ -21,10 +21,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:wsa="http://cxf.apache.org/ws/addressing"
- xsi:schemaLocation="
+ xsi:schemaLocation="
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <jaxws:endpoint id="{http://cxf.apache.org/greeter_control}ReplicatedPortA" createdFromAPI="true">
+ <jaxws:endpoint name="{http://cxf.apache.org/greeter_control}ReplicatedPortA" createdFromAPI="true">
<jaxws:features>
<wsa:addressing/>
</jaxws:features>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml Tue Jun 5 20:22:31 2007
@@ -23,23 +23,9 @@
xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:coloc="http://cxf.apache.org/binding/coloc"
xsi:schemaLocation="
-http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-<!--
- <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine">
- <property name="bus" ref="cxf"/>
- <property name="enabled" value="true"/>
- </bean>
- <wsp:Policy wsu:Id="AddressingPolicy"
- xmlns:wsp="http://www.w3.org/2006/07/ws-policy"
- xmlns:coloc="http://cxf.apache.org/binding/coloc">
- <coloc:EnableColoc wsp:Optional="true">
- </wsp:Policy>
- <bean class="org.apache.cxf.ws.policy.attachment.external.ExternalAttachmentProvider">
- <constructor-arg ref="cxf"/>
- <property name="location" value="org/apache/cxf/systest/coloc/coloc-external.xml"/>
- </bean>
--->
+
<bean id="faultOutbound" class="org.apache.cxf.systest.coloc.ThrowFaultInterceptor"/>
<!-- Adding interceptors to the bus will add it to all services/endpoints-->
@@ -51,7 +37,7 @@
</property>
</bean>
- <jaxws:client id="{http://apache.org/headers/rpc_lit}SoapPort"
+ <jaxws:client name="{http://apache.org/headers/rpc_lit}SoapPort"
createdFromAPI="true">
<jaxws:features>
<coloc:enableColoc/>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/cxf.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/cxf.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/cxf.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/cxf.xml Tue Jun 5 20:22:31 2007
@@ -23,41 +23,43 @@
xmlns:jms="http://cxf.apache.org/transports/jms"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xsi:schemaLocation="
-http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+http://cxf.apache.org/transports/jms http://cxf.apache.org/schemas/configuration/jms.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">
<!--JMS Client Receive Timeout-->
<!--hello_world.wsdl-->
- <jms:conduit id="{http://apache.org/hello_world_soap_http}SoapPortJms.jms-conduit" abstract="true">
+ <jms:conduit name="{http://apache.org/hello_world_soap_http}SoapPortJms.jms-conduit" abstract="true">
<jms:clientConfig clientReceiveTimeout="90000"/>
</jms:conduit>
- <jms:conduit id="{http://apache.org/hello_world_soap_http}XMLPortJms.jms-conduit" abstract="true">
+ <jms:conduit name="{http://apache.org/hello_world_soap_http}XMLPortJms.jms-conduit" abstract="true">
<jms:clientConfig clientReceiveTimeout="90000"/>
</jms:conduit>
<!--header_rpc_lit.wsdl-->
- <jms:conduit id="{http://apache.org/headers/rpc_lit}SoapPortJms.jms-conduit" abstract="true">
+ <jms:conduit name="{http://apache.org/headers/rpc_lit}SoapPortJms.jms-conduit" abstract="true">
<jms:clientConfig clientReceiveTimeout="90000"/>
</jms:conduit>
- <jms:conduit id="{http://apache.org/headers/rpc_lit}XMLPortJms.jms-conduit" abstract="true">
+ <jms:conduit name="{http://apache.org/headers/rpc_lit}XMLPortJms.jms-conduit" abstract="true">
<jms:clientConfig clientReceiveTimeout="90000"/>
</jms:conduit>
<!--soap_header.wsdl-->
- <jms:conduit id="{http://apache.org/headers}SoapPortJms.jms-conduit" abstract="true">
+ <jms:conduit name="{http://apache.org/headers}SoapPortJms.jms-conduit" abstract="true">
<jms:clientConfig clientReceiveTimeout="90000"/>
</jms:conduit>
- <jms:conduit id="{http://apache.org/headers}XMLPortJms.jms-conduit" abstract="true">
+ <jms:conduit name="{http://apache.org/headers}XMLPortJms.jms-conduit" abstract="true">
<jms:clientConfig clientReceiveTimeout="90000"/>
</jms:conduit>
<!--HTTP Connection Receive Timeout -->
<!--Enable to avoid Connection Timeout during debugging-->
<!--
- <http:conduit id="{http://apache.org/hello_world_soap_http}SoapPort9001.http-conduit">
+ <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort9001.http-conduit">
<http:client ConnectionTimeout="300000" ReceiveTimeout="300000"/>
</http:conduit>
-->
@@ -78,13 +80,13 @@
<!-- Avoid upfront Conduit creation, as client-side transport resources
are not required in the coloc case -->
- <jaxws:client id="{http://apache.org/headers/rpc_lit}SoapPort"
+ <jaxws:client name="{http://apache.org/headers/rpc_lit}SoapPort"
createdFromAPI="true">
<jaxws:conduitSelector>
<bean class="org.apache.cxf.endpoint.DeferredConduitSelector"/>
</jaxws:conduitSelector>
</jaxws:client>
- <jaxws:client id="{http://apache.org/headers/doc_lit}SoapPort9000"
+ <jaxws:client name="{http://apache.org/headers/doc_lit}SoapPort9000"
createdFromAPI="true">
<jaxws:conduitSelector>
<bean class="org.apache.cxf.endpoint.DeferredConduitSelector"/>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/cxf.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/cxf.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/cxf.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/cxf.xml Tue Jun 5 20:22:31 2007
@@ -19,9 +19,7 @@
-->
<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"
xsi:schemaLocation="
-http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean name="{http://cxf.apache.org/factory_pattern}NumberPort.http-destination" abstract="true">
<!-- applying with wildcard to all JettyHTTPDestinations instead of this verbose method -->
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost-2.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost-2.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost-2.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost-2.cxf Tue Jun 5 20:22:31 2007
@@ -22,23 +22,17 @@
** This file configures the Abost Server.
** It is an http server that redirects to Hurlon.
-->
-
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="
+ 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">
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<http:server RedirectURL="http://localhost:9006/Hurlon"/>
</http:destination>
-
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
+
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf Tue Jun 5 20:22:31 2007
@@ -24,21 +24,16 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xsi:schemaLocation="
+ 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">
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<http:server RedirectURL="http://localhost:9006/Hurlon"/>
</http:destination>
-
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
+
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal-2.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal-2.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal-2.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal-2.cxf Tue Jun 5 20:22:31 2007
@@ -25,18 +25,17 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
<http:destination
- id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<http:tlsServerParameters>
<sec:keyManagers keyPassword="password">
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf Tue Jun 5 20:22:31 2007
@@ -25,18 +25,17 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
<http:destination
- id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<http:sslServer>
<sec:Keystore>src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks</sec:Keystore>
@@ -44,8 +43,7 @@
<sec:KeystorePassword>password</sec:KeystorePassword>
<sec:KeyPassword>password</sec:KeyPassword>
<sec:WantClientAuthentication>true</sec:WantClientAuthentication>
- <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>
- <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
+ <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>
<sec:CiphersuiteFilters>
<!-- these filters ensure that a ciphersuite with
export-suitable or null encryption is used,
@@ -57,6 +55,7 @@
<sec:include>.*_WITH_NULL_.*</sec:include>
<sec:exclude>.*_DH_anon_.*</sec:exclude>
</sec:CiphersuiteFilters>
+ <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
</http:sslServer>
</http:destination>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy-2.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy-2.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy-2.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy-2.cxf Tue Jun 5 20:22:31 2007
@@ -24,17 +24,16 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<http:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password"
@@ -59,7 +58,5 @@
</http:tlsServerParameters>
<http:server RedirectURL="https://localhost:9002/Bethal"/>
</http:destination>
-
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
+
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf Tue Jun 5 20:22:31 2007
@@ -24,17 +24,17 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ <http:server RedirectURL="https://localhost:9002/Bethal"/>
<http:sslServer>
<sec:Keystore>src/test/java/org/apache/cxf/systest/http/resources/Gordy.jks</sec:Keystore>
<sec:KeystoreType>JKS</sec:KeystoreType>
@@ -42,7 +42,6 @@
<sec:KeyPassword>password</sec:KeyPassword>
<sec:WantClientAuthentication>true</sec:WantClientAuthentication>
<sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>
- <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
<sec:CiphersuiteFilters>
<!-- these filters ensure that a ciphersuite with
export-suitable or null encryption is used,
@@ -54,10 +53,8 @@
<sec:include>.*_WITH_NULL_.*</sec:include>
<sec:exclude>.*_DH_anon_.*</sec:exclude>
</sec:CiphersuiteFilters>
- </http:sslServer>
- <http:server RedirectURL="https://localhost:9002/Bethal"/>
+ <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
+ </http:sslServer>
</http:destination>
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail-2.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail-2.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail-2.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail-2.cxf Tue Jun 5 20:22:31 2007
@@ -1,13 +1,32 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:schemaLocation="http://cxf.apache.org/transports/httpconfiguration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans/
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="
+ 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">
- <http:conduit id="{http://apache.org/hello_world}Hurlon.http-conduit">
+ <http:conduit name="{http://apache.org/hello_world}Hurlon.http-conduit">
<http:client AutoRedirect="true"/>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf Tue Jun 5 20:22:31 2007
@@ -1,13 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http:www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:schemaLocation="http://cxf.apache.org/transports/httpconfiguration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans/
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="
+ 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">
- <http:conduit id="{http://apache.org/hello_world}Hurlon.http-conduit">
+ <http:conduit name="{http://apache.org/hello_world}Hurlon.http-conduit">
<http:client AutoRedirect="true"/>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect-2.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect-2.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect-2.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect-2.cxf Tue Jun 5 20:22:31 2007
@@ -1,13 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http:www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:schemaLocation="http://cxf.apache.org/transports/httpconfiguration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans/
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="
+ 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">
- <http:conduit id="{http://apache.org/hello_world}Rethwel.http-conduit">
+ <http:conduit name="{http://apache.org/hello_world}Rethwel.http-conduit">
<http:client AutoRedirect="true"/>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpRedirect.cxf Tue Jun 5 20:22:31 2007
@@ -1,13 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http:www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:schemaLocation="http://cxf.apache.org/transports/httpconfiguration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans/
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xsi:schemaLocation="
+ 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">
- <http:conduit id="{http://apache.org/hello_world}Rethwel.http-conduit">
+ <http:conduit name="{http://apache.org/hello_world}Rethwel.http-conduit">
<http:client AutoRedirect="true"/>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon-2.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon-2.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon-2.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon-2.cxf Tue Jun 5 20:22:31 2007
@@ -24,21 +24,17 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<http:server RedirectURL="http://localhost:9007/Abost"/>
</http:destination>
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf Tue Jun 5 20:22:31 2007
@@ -24,21 +24,17 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<http:server RedirectURL="http://localhost:9007/Abost"/>
</http:destination>
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit-2.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit-2.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit-2.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit-2.cxf Tue Jun 5 20:22:31 2007
@@ -24,17 +24,17 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ <http:sslServer/>
<http:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password"
@@ -56,10 +56,7 @@
<sec:exclude>.*_DH_anon_.*</sec:exclude>
</sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
- </http:tlsServerParameters>
- </http:sslServer>
+ </http:tlsServerParameters>
</http:destination>
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf Tue Jun 5 20:22:31 2007
@@ -24,25 +24,23 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<http:sslServer>
<sec:Keystore>src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks</sec:Keystore>
<sec:KeystoreType>JKS</sec:KeystoreType>
<sec:KeystorePassword>password</sec:KeystorePassword>
<sec:KeyPassword>password</sec:KeyPassword>
<sec:WantClientAuthentication>true</sec:WantClientAuthentication>
- <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>
- <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
+ <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>
<sec:CiphersuiteFilters>
<!-- these filters ensure that a ciphersuite with
export-suitable or null encryption is used,
@@ -54,9 +52,8 @@
<sec:include>.*_WITH_NULL_.*</sec:include>
<sec:exclude>.*_DH_anon_.*</sec:exclude>
</sec:CiphersuiteFilters>
+ <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
</http:sslServer>
</http:destination>
-
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
+
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer-2.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer-2.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer-2.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer-2.cxf Tue Jun 5 20:22:31 2007
@@ -24,20 +24,18 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<!-- Nothing to Configure here for Mortimer -->
</http:destination>
-
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
+
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Mortimer.cxf Tue Jun 5 20:22:31 2007
@@ -24,20 +24,18 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<!-- Nothing to Configure here for Mortimer -->
</http:destination>
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim-2.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim-2.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim-2.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim-2.cxf Tue Jun 5 20:22:31 2007
@@ -24,17 +24,18 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ <http:server RedirectURL="http://localhost:9000/Mortimer"/>
<http:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password"
@@ -56,10 +57,7 @@
<sec:exclude>.*_DH_anon_.*</sec:exclude>
</sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
- </http:tlsServerParameters>
- <http:server RedirectURL="http://localhost:9000/Mortimer"/>
+ </http:tlsServerParameters>
</http:destination>
-
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
+
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf Tue Jun 5 20:22:31 2007
@@ -24,25 +24,24 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<http:sslServer>
<sec:Keystore>src/test/java/org/apache/cxf/systest/http/resources/Poltim.jks</sec:Keystore>
<sec:KeystoreType>JKS</sec:KeystoreType>
<sec:KeystorePassword>password</sec:KeystorePassword>
<sec:KeyPassword>password</sec:KeyPassword>
<sec:WantClientAuthentication>true</sec:WantClientAuthentication>
- <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>
- <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
+ <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>
<sec:CiphersuiteFilters>
<!-- these filters ensure that a ciphersuite with
export-suitable or null encryption is used,
@@ -54,10 +53,9 @@
<sec:include>.*_WITH_NULL_.*</sec:include>
<sec:exclude>.*_DH_anon_.*</sec:exclude>
</sec:CiphersuiteFilters>
+ <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
</http:sslServer>
<http:server RedirectURL="http://localhost:9000/Mortimer"/>
</http:destination>
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel-2.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel-2.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel-2.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel-2.cxf Tue Jun 5 20:22:31 2007
@@ -24,21 +24,19 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<http:server RedirectURL="http://localhost:9000/Mortimer"/>
</http:destination>
-
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
+
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf Tue Jun 5 20:22:31 2007
@@ -24,21 +24,19 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
<http:server RedirectURL="http://localhost:9000/Mortimer"/>
</http:destination>
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin-2.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin-2.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin-2.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin-2.cxf Tue Jun 5 20:22:31 2007
@@ -24,17 +24,17 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ <http:server RedirectURL="https://localhost:9001/Gordy"/>
<http:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password"
@@ -56,10 +56,7 @@
<sec:exclude>.*_DH_anon_.*</sec:exclude>
</sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
- </http:tlsServerParameters>
- <http:server RedirectURL="https://localhost:9001/Gordy"/>
+ </http:tlsServerParameters>
</http:destination>
-
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
+
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf Tue Jun 5 20:22:31 2007
@@ -24,25 +24,25 @@
-->
<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:jaxws="http://java.sun.com/xml/ns/jaxws"
- xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="
+ 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">
- <http:destination id="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+
+ <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
+ <http:server RedirectURL="https://localhost:9001/Gordy"/>
<http:sslServer>
<sec:Keystore>src/test/java/org/apache/cxf/systest/http/resources/Tarpin.jks</sec:Keystore>
<sec:KeystoreType>JKS</sec:KeystoreType>
<sec:KeystorePassword>password</sec:KeystorePassword>
<sec:KeyPassword>password</sec:KeyPassword>
<sec:WantClientAuthentication>true</sec:WantClientAuthentication>
- <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>
- <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
+ <sec:RequireClientAuthentication>true</sec:RequireClientAuthentication>
<sec:CiphersuiteFilters>
<!-- these filters ensure that a ciphersuite with
export-suitable or null encryption is used,
@@ -54,10 +54,8 @@
<sec:include>.*_WITH_NULL_.*</sec:include>
<sec:exclude>.*_DH_anon_.*</sec:exclude>
</sec:CiphersuiteFilters>
- </http:sslServer>
- <http:server RedirectURL="https://localhost:9001/Gordy"/>
+ <sec:TrustStore>src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks</sec:TrustStore>
+ </http:sslServer>
</http:destination>
- <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
- <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/client1.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/client1.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/client1.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/resources/client1.xml Tue Jun 5 20:22:31 2007
@@ -1,20 +1,45 @@
+<?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:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:schemaLocation="
- http://cxf.apache.org/transports/httpconfiguration
- http://cxf.apache.org/schema/transports/http.xsd
- http://www.springframework.org/schema/beans/
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <http:conduit id="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
+ xsi:schemaLocation="
+ 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">
+
+<!--
+http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
+-->
+
+ <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
+
+ <http:client AutoRedirect="true"/>
+
<http:sslClient>
<sec:Keystore>src/demo/hw/resources/Bethal.jks</sec:Keystore>
<sec:KeystoreType>JKS</sec:KeystoreType>
<sec:KeystorePassword>password</sec:KeystorePassword>
- <sec:KeyPassword>password</sec:KeyPassword>
- <sec:TrustStore>src/demo/hw/resources/Truststore.jks</sec:TrustStore>
+ <sec:KeyPassword>password</sec:KeyPassword>
<sec:CiphersuiteFilters>
<!-- these filters ensure that a ciphersuite with
export-suitable but non-null encryption is used,
@@ -25,16 +50,16 @@
<sec:exclude>.*_WITH_NULL_.*</sec:exclude>
<sec:exclude>.*_MD5</sec:exclude>
</sec:CiphersuiteFilters>
+ <sec:TrustStore>src/demo/hw/resources/Truststore.jks</sec:TrustStore>
</http:sslClient>
- <http:client AutoRedirect="true"/>
-
- <http:trustDecider
- class="org.apache.cxf.systest.http.TrustHandler"/>
-
+ <!--
<http:basicAuthSupplier
class="org.apache.cxf.systest.http.UserPassSupplier"/>
+ -->
+ <http:trustDecider
+ class="org.apache.cxf.systest.http.TrustHandler"/>
</http:conduit>
</beans>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/addr.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/addr.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/addr.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/addr.xml Tue Jun 5 20:22:31 2007
@@ -19,9 +19,7 @@
-->
<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"
xsi:schemaLocation="
-http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/no-addr.xml Tue Jun 5 20:22:31 2007
@@ -19,9 +19,7 @@
-->
<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"
xsi:schemaLocation="
-http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/fault-stack-trace.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/fault-stack-trace.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/fault-stack-trace.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/fault-stack-trace.xml Tue Jun 5 20:22:31 2007
@@ -18,7 +18,7 @@
under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/lifecycle/cxf.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/lifecycle/cxf.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/lifecycle/cxf.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/lifecycle/cxf.xml Tue Jun 5 20:22:31 2007
@@ -22,9 +22,10 @@
xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:wsa="http://cxf.apache.org/ws/addressing"
xsi:schemaLocation="
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <jaxws:endpoint id="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
+ <jaxws:endpoint name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
<jaxws:features>
<wsa:addressing/>
</jaxws:features>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/counter-spring.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/counter-spring.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/counter-spring.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/counter-spring.xml Tue Jun 5 20:22:31 2007
@@ -19,7 +19,6 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:im="http://cxf.apache.org/management"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/managed-spring.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/managed-spring.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/managed-spring.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/managed-spring.xml Tue Jun 5 20:22:31 2007
@@ -19,7 +19,6 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:im="http://cxf.apache.org/management"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomPolicyTest.java Tue Jun 5 20:22:31 2007
@@ -82,11 +82,11 @@
WSPolicyFeature policy = new WSPolicyFeature();
if (mtomRequired) {
policy.getPolicyElements().add(DOMUtils.readXml(
- getClass().getResourceAsStream("mtom-policy.xsd"))
+ getClass().getResourceAsStream("mtom-policy.xml"))
.getDocumentElement());
} else {
policy.getPolicyElements().add(DOMUtils.readXml(
- getClass().getResourceAsStream("mtom-policy-optional.xsd"))
+ getClass().getResourceAsStream("mtom-policy-optional.xml"))
.getDocumentElement());
}
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java Tue Jun 5 20:22:31 2007
@@ -125,7 +125,7 @@
sf.setProperties(props);
sf.create();
- servStatic(getClass().getResource("mtom-policy.xsd"),
+ servStatic(getClass().getResource("mtom-policy.xml"),
"http://localhost:9036/policy.xsd");
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/outofband/header/cxf.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/outofband/header/cxf.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/outofband/header/cxf.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/outofband/header/cxf.xml Tue Jun 5 20:22:31 2007
@@ -1,19 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xsi:schemaLocation="
- http://cxf.apache.org/transports/http/configuration
- http://cxf.apache.org/schema/transports/http.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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <http:conduit id="{http://apache.org/hello_world_doc_lit_bare}SoapPort.http-conduit">
+ <http:conduit name="{http://apache.org/hello_world_doc_lit_bare}SoapPort.http-conduit">
<http:client ReceiveTimeout="0" ConnectionTimeout="0"/>
</http:conduit>
- <http:destination id="{http://apache.org/hello_world_doc_lit_bare}SoapPort.http-destination">
+ <http:destination name="{http://apache.org/hello_world_doc_lit_bare}SoapPort.http-destination">
<http:server ReceiveTimeout="0"/>
</http:destination>
- <jaxws:client id="{http://apache.org/hello_world_doc_lit_bare}SoapPort"
+ <jaxws:client name="{http://apache.org/hello_world_doc_lit_bare}SoapPort"
createdFromAPI="true">
<jaxws:features>
<bean class="org.apache.cxf.feature.LoggingFeature"/>
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/schema_validation/cxf-config.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/schema_validation/cxf-config.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/schema_validation/cxf-config.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/schema_validation/cxf-config.xml Tue Jun 5 20:22:31 2007
@@ -21,19 +21,17 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:soap="http://cxf.apache.org/bindings/soap"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/bindings/soap http://cxf.apache.org/schema/bindings/soap.xsd
-http://cxf.apache.org/jaxws http://cxf.apache.org/schema/jaxws.xsd">
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
- <jaxws:endpoint id="{http://apache.org/schema_validation}SoapPort" createdFromAPI="true">
+ <jaxws:endpoint name="{http://apache.org/schema_validation}SoapPort" createdFromAPI="true">
<jaxws:properties>
<entry key="schema-validation-enabled" value="true" />
</jaxws:properties>
</jaxws:endpoint>
- <bean id="{http://apache.org/schema_validation}SchemaValidationService" abstract="true">
+ <bean name="{http://apache.org/schema_validation}SchemaValidationService" abstract="true">
<property name="properties">
<map>
<entry key="schema-validation-enabled" value="true" />
Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml?view=diff&rev=544716&r1=544715&r2=544716
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml Tue Jun 5 20:22:31 2007
@@ -20,7 +20,6 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws"
- xmlns:soap="http://cxf.apache.org/bindings/soap"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">