This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a commit to branch xml-namespace-cleanups in repository https://gitbox.apache.org/repos/asf/camel.git
commit f195b6edf8d9b8287ce2a8cbab16eb0874a391de Author: Babak Vahdat <bvah...@apache.org> AuthorDate: Sun Jan 3 13:59:43 2021 +0100 cleanup the xml namespaces --- .../jetty/rest/RestJettyBasicAuthTest.xml | 5 +-- .../apache/camel/component/validator/report.xsd | 7 ++-- .../apache/camel/component/validator/schema.xsd | 1 - .../camel/component/validator/unsecuredSchema.xsd | 2 - .../apache/camel/component/xslt/transform_text.xsl | 11 +++--- .../org/apache/camel/model/routeGroup.xml | 3 +- .../org/apache/camel/model/routeProperties.xml | 3 +- .../org/apache/camel/model/simpleRest.xml | 3 +- .../org/apache/camel/model/simpleRestToD.xml | 3 +- .../org/apache/camel/model/simpleRoute.xml | 3 +- .../apache/camel/processor/ValidatingProcessor.xsd | 1 - .../camel/util/simpleRouteWithNamespaces.xml | 2 +- .../camel-xml-io/src/test/resources/routeGroup.xml | 3 +- .../src/test/resources/routeProperties.xml | 3 +- .../camel-xml-io/src/test/resources/simpleRest.xml | 3 +- .../src/test/resources/simpleRestToD.xml | 3 +- .../src/test/resources/simpleRoute.xml | 3 +- .../quickfixj/QuickfixjSpringTest-context.xml | 3 +- docs/img/logo-d.svg | 2 +- docs/img/logo-template.svg | 27 +++++++------ .../camel/spring/patterns/FilterTest-context.xml | 4 +- .../src/test/resources/OptimizationRequest.xsd | 9 ++--- .../childparentuncle/deeper/parent/parent.xsd | 1 - .../childparentuncle/deeper/uncle/uncle.xsd | 2 - .../camel/itest/jms/FileToJmsTest-context.xml | 7 +--- .../JMSTransactionIsTransactedRedeliveredTest.xml | 1 - .../itest/jms/JmsPollingConsumerTest-context.xml | 8 +--- .../itest/security/CxfMessageCamelContext.xml | 45 ++++++++++------------ .../apache/camel/itest/security/camel-context.xml | 45 ++++++++++------------ .../FromJmsToJdbcIdempotentConsumerToJmsTest.xml | 5 +-- .../FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml | 7 +--- .../camel/itest/tx/Jms2RequiresNewTest-context.xml | 1 - .../spring-config/client-WsAddressingContext.xml | 7 ++-- .../spring-config/server-WsAddressingContext.xml | 9 ++--- .../spring-config/server-applicationContext.xml | 9 ++--- .../src/test/resources/wsdl/binding.xml | 5 +-- .../src/test/resources/wsdl/hello_world.wsdl | 14 +++---- .../resources/wsdl/CBRWSDL-consumer-embedded.wsdl | 24 ++++++------ .../resources/wsdl/CBRWSDL-provider-embedded.wsdl | 24 ++++++------ .../wsdl/HBRSoapWSDL-consumer-embedded.wsdl | 24 ++++++------ .../wsdl/HBRSoapWSDL-provider-embedded.wsdl | 24 ++++++------ .../wsdl/HBRTransportWSDL-consumer-embedded.wsdl | 24 ++++++------ .../wsdl/HBRTransportWSDL-provider-embedded.wsdl | 24 ++++++------ .../wsdl/ProxyWSDL-consumer-embedded.wsdl | 24 ++++++------ .../wsdl/ProxyWSDL-provider-embedded.wsdl | 24 ++++++------ .../wsdl/SecureProxyWSDL-consumer-embedded.wsdl | 24 ++++++------ .../wsdl/SecureProxyWSDL-provider-embedded.wsdl | 6 +-- .../wsdl/TransformerWSDL-consumer-embedded.wsdl | 24 ++++++------ .../wsdl/TransformerWSDL-provider-embedded.wsdl | 24 ++++++------ .../camel/component/validator/dotslash/parent.xsd | 2 - .../component/validator/doubleslash/parent.xsd | 2 - .../component/validator/relativeparent/parent.xsd | 2 - 52 files changed, 239 insertions(+), 307 deletions(-) diff --git a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.xml b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.xml index 1196a7d..a53b1a3 100644 --- a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.xml +++ b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.xml @@ -54,8 +54,7 @@ port="9444" apiContextPath="api-docs" apiContextListing="true" - enableCORS="true" - > + enableCORS="true"> <endpointProperty key="handlers" value="securityHandler"/> <dataFormatProperty key="prettyPrint" value="true"/> @@ -77,4 +76,4 @@ </rest> </camelContext> -</beans> \ No newline at end of file +</beans> diff --git a/core/camel-core/src/test/resources/org/apache/camel/component/validator/report.xsd b/core/camel-core/src/test/resources/org/apache/camel/component/validator/report.xsd index 18554b2..1ca8c38 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/component/validator/report.xsd +++ b/core/camel-core/src/test/resources/org/apache/camel/component/validator/report.xsd @@ -19,19 +19,18 @@ --> <xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://foo.com/report" - xmlns:tns="http://foo.com/report" xmlns:rb="http://foo.com/report-base" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:import namespace="http://foo.com/report-base" schemaLocation="http://foo.com/report-base.xsd" /> + <xs:import namespace="http://foo.com/report-base" schemaLocation="http://foo.com/report-base.xsd" /> <xs:element name="report"> <xs:complexType> <xs:sequence> - <xs:element name="author" type="rb:person" maxOccurs="unbounded" /> + <xs:element name="author" type="rb:person" maxOccurs="unbounded" /> <xs:element name="content" type="rb:content" /> <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> </xs:element> -</xs:schema> \ No newline at end of file +</xs:schema> diff --git a/core/camel-core/src/test/resources/org/apache/camel/component/validator/schema.xsd b/core/camel-core/src/test/resources/org/apache/camel/component/validator/schema.xsd index caae7f1..11ea3a6 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/component/validator/schema.xsd +++ b/core/camel-core/src/test/resources/org/apache/camel/component/validator/schema.xsd @@ -19,7 +19,6 @@ --> <xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://foo.com/bar" - xmlns:tns="http://foo.com/bar" xmlns:xs="http://www.w3.org/2001/XMLSchema"> diff --git a/core/camel-core/src/test/resources/org/apache/camel/component/validator/unsecuredSchema.xsd b/core/camel-core/src/test/resources/org/apache/camel/component/validator/unsecuredSchema.xsd index c955ca6..8e21fe5 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/component/validator/unsecuredSchema.xsd +++ b/core/camel-core/src/test/resources/org/apache/camel/component/validator/unsecuredSchema.xsd @@ -19,10 +19,8 @@ --> <xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://foo.com/bar" - xmlns:tns="http://foo.com/bar" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="mail"> <xs:complexType> <xs:sequence> diff --git a/core/camel-core/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl b/core/camel-core/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl index 0eeba5d..6a9943f 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl +++ b/core/camel-core/src/test/resources/org/apache/camel/component/xslt/transform_text.xsl @@ -18,11 +18,10 @@ --> <xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:date="http://xml.apache.org/xalan/java/java.util.Date" - xmlns:rt="http://xml.apache.org/xalan/java/java.lang.Runtime" - xmlns:str="http://xml.apache.org/xalan/java/java.lang.String" - exclude-result-prefixes="date"> + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:date="http://xml.apache.org/xalan/java/java.util.Date" + xmlns:rt="http://xml.apache.org/xalan/java/java.lang.Runtime" + exclude-result-prefixes="date"> <xsl:output method="text"/> <xsl:template match="/"> <xsl:variable name="cmd"><![CDATA[/usr/bin/test]]></xsl:variable> @@ -30,4 +29,4 @@ <xsl:variable name="process" select="rt:exec($rtObj, $cmd)"/> <xsl:text>Process: </xsl:text><xsl:value-of select="$process"/> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/routeGroup.xml b/core/camel-core/src/test/resources/org/apache/camel/model/routeGroup.xml index 7548f8c..5ff347d 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/model/routeGroup.xml +++ b/core/camel-core/src/test/resources/org/apache/camel/model/routeGroup.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<routes xmlns="http://camel.apache.org/schema/spring"> <!-- xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd" diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/routeProperties.xml b/core/camel-core/src/test/resources/org/apache/camel/model/routeProperties.xml index b425f6c..6e67e6c 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/model/routeProperties.xml +++ b/core/camel-core/src/test/resources/org/apache/camel/model/routeProperties.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<routes xmlns="http://camel.apache.org/schema/spring"> <!-- xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd" diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/simpleRest.xml b/core/camel-core/src/test/resources/org/apache/camel/model/simpleRest.xml index d67aafd..9269b02 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/model/simpleRest.xml +++ b/core/camel-core/src/test/resources/org/apache/camel/model/simpleRest.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<rests xmlns="http://camel.apache.org/schema/spring" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<rests xmlns="http://camel.apache.org/schema/spring"> <rest path="/users"> <get uri="/view/{id}"> diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/simpleRestToD.xml b/core/camel-core/src/test/resources/org/apache/camel/model/simpleRestToD.xml index bb23e22..be3d3e4 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/model/simpleRestToD.xml +++ b/core/camel-core/src/test/resources/org/apache/camel/model/simpleRestToD.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<rests xmlns="http://camel.apache.org/schema/spring" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<rests xmlns="http://camel.apache.org/schema/spring"> <rest path="/users"> <get uri="/view/{id}"> diff --git a/core/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml b/core/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml index 99a60bb..389ad21 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml +++ b/core/camel-core/src/test/resources/org/apache/camel/model/simpleRoute.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<routes xmlns="http://camel.apache.org/schema/spring"> <!-- xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd" diff --git a/core/camel-core/src/test/resources/org/apache/camel/processor/ValidatingProcessor.xsd b/core/camel-core/src/test/resources/org/apache/camel/processor/ValidatingProcessor.xsd index dfb5fba..ded9a62 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/processor/ValidatingProcessor.xsd +++ b/core/camel-core/src/test/resources/org/apache/camel/processor/ValidatingProcessor.xsd @@ -19,7 +19,6 @@ --> <xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://foo.com/bar" - xmlns:tns="http://foo.com/bar" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="user"> diff --git a/core/camel-core/src/test/resources/org/apache/camel/util/simpleRouteWithNamespaces.xml b/core/camel-core/src/test/resources/org/apache/camel/util/simpleRouteWithNamespaces.xml index c81b7d9..d1fdbb6 100644 --- a/core/camel-core/src/test/resources/org/apache/camel/util/simpleRouteWithNamespaces.xml +++ b/core/camel-core/src/test/resources/org/apache/camel/util/simpleRouteWithNamespaces.xml @@ -29,4 +29,4 @@ </choice> </route> </routes> -<!-- END SNIPPET: e1 --> \ No newline at end of file +<!-- END SNIPPET: e1 --> diff --git a/core/camel-xml-io/src/test/resources/routeGroup.xml b/core/camel-xml-io/src/test/resources/routeGroup.xml index 7548f8c..5ff347d 100644 --- a/core/camel-xml-io/src/test/resources/routeGroup.xml +++ b/core/camel-xml-io/src/test/resources/routeGroup.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<routes xmlns="http://camel.apache.org/schema/spring"> <!-- xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd" diff --git a/core/camel-xml-io/src/test/resources/routeProperties.xml b/core/camel-xml-io/src/test/resources/routeProperties.xml index b425f6c..6e67e6c 100644 --- a/core/camel-xml-io/src/test/resources/routeProperties.xml +++ b/core/camel-xml-io/src/test/resources/routeProperties.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<routes xmlns="http://camel.apache.org/schema/spring"> <!-- xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd" diff --git a/core/camel-xml-io/src/test/resources/simpleRest.xml b/core/camel-xml-io/src/test/resources/simpleRest.xml index d67aafd..9269b02 100644 --- a/core/camel-xml-io/src/test/resources/simpleRest.xml +++ b/core/camel-xml-io/src/test/resources/simpleRest.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<rests xmlns="http://camel.apache.org/schema/spring" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<rests xmlns="http://camel.apache.org/schema/spring"> <rest path="/users"> <get uri="/view/{id}"> diff --git a/core/camel-xml-io/src/test/resources/simpleRestToD.xml b/core/camel-xml-io/src/test/resources/simpleRestToD.xml index bb23e22..be3d3e4 100644 --- a/core/camel-xml-io/src/test/resources/simpleRestToD.xml +++ b/core/camel-xml-io/src/test/resources/simpleRestToD.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<rests xmlns="http://camel.apache.org/schema/spring" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<rests xmlns="http://camel.apache.org/schema/spring"> <rest path="/users"> <get uri="/view/{id}"> diff --git a/core/camel-xml-io/src/test/resources/simpleRoute.xml b/core/camel-xml-io/src/test/resources/simpleRoute.xml index 99a60bb..389ad21 100644 --- a/core/camel-xml-io/src/test/resources/simpleRoute.xml +++ b/core/camel-xml-io/src/test/resources/simpleRoute.xml @@ -17,8 +17,7 @@ limitations under the License. --> -<routes xmlns="http://camel.apache.org/schema/spring" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<routes xmlns="http://camel.apache.org/schema/spring"> <!-- xsi:schemaLocation="http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd" diff --git a/docs/components/modules/ROOT/examples/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml b/docs/components/modules/ROOT/examples/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml index 577c4a3..cbbed8e 100644 --- a/docs/components/modules/ROOT/examples/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml +++ b/docs/components/modules/ROOT/examples/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml @@ -20,7 +20,6 @@ <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" - xmlns:camel="http://camel.apache.org/schema/spring" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd @@ -126,4 +125,4 @@ </property> </bean> -</beans> \ No newline at end of file +</beans> diff --git a/docs/img/logo-d.svg b/docs/img/logo-d.svg index 666cccd..e3fcc92 100644 --- a/docs/img/logo-d.svg +++ b/docs/img/logo-d.svg @@ -17,7 +17,7 @@ limitations under the License. --> -<svg version="1.1" viewBox="0 0 130.21 130.01" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +<svg version="1.1" viewBox="0 0 130.21 130.01" xmlns="http://www.w3.org/2000/svg"> <defs> <linearGradient id="c" x1="333.48" x2="477" y1="702.6" y2="563.73" gradientTransform="matrix(.99206 0 0 .99206 94.038 276.06)" gradientUnits="userSpaceOnUse"> <stop stop-color="#F69923" offset="0"/> diff --git a/docs/img/logo-template.svg b/docs/img/logo-template.svg index 7a34ab6..bfcdebd 100644 --- a/docs/img/logo-template.svg +++ b/docs/img/logo-template.svg @@ -20,20 +20,19 @@ <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="744.09448819" - height="1052.3622047" - id="svg5193" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="logo-template.svg"> + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="744.09448819" + height="1052.3622047" + id="svg5193" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="logo-template.svg"> <defs id="defs5195"> <linearGradient diff --git a/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml b/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml index 0541bd1..a5a6e29 100644 --- a/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml +++ b/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml @@ -21,11 +21,9 @@ <!-- tag::example[] --> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd - "> + http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> <camelContext xmlns="http://camel.apache.org/schema/spring"> <route> diff --git a/tests/camel-itest/src/test/resources/OptimizationRequest.xsd b/tests/camel-itest/src/test/resources/OptimizationRequest.xsd index c47c2ba..c25df03 100644 --- a/tests/camel-itest/src/test/resources/OptimizationRequest.xsd +++ b/tests/camel-itest/src/test/resources/OptimizationRequest.xsd @@ -18,10 +18,9 @@ --> <xsd:schema - targetNamespace="http://test" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:typens="http://test" - elementFormDefault="qualified"> + targetNamespace="http://test" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified"> <xsd:element name="OptimizationRequestGroup"> <xsd:complexType> <xsd:sequence> @@ -29,4 +28,4 @@ </xsd:sequence> </xsd:complexType> </xsd:element> -</xsd:schema> \ No newline at end of file +</xsd:schema> diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/component/validator/childparentuncle/deeper/parent/parent.xsd b/tests/camel-itest/src/test/resources/org/apache/camel/component/validator/childparentuncle/deeper/parent/parent.xsd index 7e1ec26..69304bd 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/component/validator/childparentuncle/deeper/parent/parent.xsd +++ b/tests/camel-itest/src/test/resources/org/apache/camel/component/validator/childparentuncle/deeper/parent/parent.xsd @@ -18,7 +18,6 @@ --> <xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://foo.com/bar" - xmlns:tns="http://foo.com/bar" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:include schemaLocation="../uncle/uncle.xsd"/> diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/component/validator/childparentuncle/deeper/uncle/uncle.xsd b/tests/camel-itest/src/test/resources/org/apache/camel/component/validator/childparentuncle/deeper/uncle/uncle.xsd index a44ee18..4053bc1 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/component/validator/childparentuncle/deeper/uncle/uncle.xsd +++ b/tests/camel-itest/src/test/resources/org/apache/camel/component/validator/childparentuncle/deeper/uncle/uncle.xsd @@ -18,10 +18,8 @@ --> <xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://foo.com/bar" - xmlns:tns="http://foo.com/bar" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="user"> <xs:complexType> <xs:sequence> diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml index 7c8f111..b43d79d 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/FileToJmsTest-context.xml @@ -19,11 +19,8 @@ --> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:broker="http://activemq.apache.org/schema/core" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd - http://activemq.apache.org/schema/core http://activemq.org/config/1.0/1.0.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> <!-- camel stuff below to send and listen to broker with a spring JMS transaction manager --> <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop"> diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml index 28d730a..d69878c 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JMSTransactionIsTransactedRedeliveredTest.xml @@ -19,7 +19,6 @@ --> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:camel="http://camel.apache.org/schema/spring" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml index 096f20c..a67c819 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/jms/JmsPollingConsumerTest-context.xml @@ -19,12 +19,8 @@ --> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:broker="http://activemq.apache.org/schema/core" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd - http://activemq.apache.org/schema/core http://activemq.org/config/1.0/1.0.xsd"> - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> <!-- camel stuff below to send and listen to broker with a spring JMS transaction manager --> <bean id="poolConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop"> diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/CxfMessageCamelContext.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/CxfMessageCamelContext.xml index 1e74738..269e5e9 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/CxfMessageCamelContext.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/CxfMessageCamelContext.xml @@ -17,20 +17,17 @@ limitations under the License. --> -<beans - xmlns="http://www.springframework.org/schema/beans" - xmlns:cxf="http://camel.apache.org/schema/cxf" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - - xsi:schemaLocation="http://camel.apache.org/schema/cxf +<beans + xmlns="http://www.springframework.org/schema/beans" + xmlns:cxf="http://camel.apache.org/schema/cxf" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd http://camel.apache.org/schema/spring-security http://camel.apache.org/schema/spring-security/camel-spring-security.xsd http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://cxf.apache.org/jaxws - http://cxf.apache.org/schemas/jaxws.xsd"> - + http://www.springframework.org/schema/beans/spring-beans.xsd"> + <!-- import the spring security configuration --> <import resource="classpath:org/apache/camel/itest/security/commonSecurity.xml"/> @@ -39,7 +36,7 @@ authenticationManager="authenticationManager" accessDecisionManager="accessDecisionManager" xmlns="http://camel.apache.org/schema/spring-security"/> - + <bean id="myAuthenticationAdapter" class="org.apache.camel.itest.security.MyAuthenticationAdapter"/> <bean id="cxfMessageProcessor" class="org.apache.camel.itest.security.CXFMessageProcessor"/> @@ -53,10 +50,10 @@ </route> </camelContext> - <!-- - UsernameToken endpoint definition - This endpoint is configured to read the username and password tokens - and validate them using a password callback handler. + <!-- + UsernameToken endpoint definition + This endpoint is configured to read the username and password tokens + and validate them using a password callback handler. --> <cxf:cxfEndpoint id="UsernameTokenEndpoint" @@ -66,27 +63,25 @@ serviceName="s:SOAPService" xmlns:s="http://apache.org/hello_world_soap_http" address="http://localhost:9000/SoapContext/SoapPort" - loggingFeatureEnabled="true" - > + loggingFeatureEnabled="true"> <cxf:inInterceptors> <ref bean="UsernameToken_Request"/> </cxf:inInterceptors> </cxf:cxfEndpoint> - <!-- - WSS4JInInterceptor for UsernameTokenEndpoint above + <!-- + WSS4JInInterceptor for UsernameTokenEndpoint above --> - <bean + <bean id="UsernameToken_Request" - class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor" - > + class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"> <constructor-arg> <map> - <entry key="action" value="UsernameToken"/> + <entry key="action" value="UsernameToken"/> <entry key="passwordType" value="PasswordText"/> - <entry key="passwordCallbackClass" value="org.apache.camel.itest.security.KeystorePasswordCallback"/> + <entry key="passwordCallbackClass" value="org.apache.camel.itest.security.KeystorePasswordCallback"/> </map> </constructor-arg> </bean> - + </beans> diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml index e94dcf0..5cfc3fe 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml @@ -17,20 +17,17 @@ limitations under the License. --> -<beans - xmlns="http://www.springframework.org/schema/beans" - xmlns:cxf="http://camel.apache.org/schema/cxf" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - - xsi:schemaLocation="http://camel.apache.org/schema/cxf +<beans + xmlns="http://www.springframework.org/schema/beans" + xmlns:cxf="http://camel.apache.org/schema/cxf" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd http://camel.apache.org/schema/spring-security http://camel.apache.org/schema/spring-security/camel-spring-security.xsd http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://cxf.apache.org/jaxws - http://cxf.apache.org/schemas/jaxws.xsd"> - + http://www.springframework.org/schema/beans/spring-beans.xsd"> + <!-- import the spring security configuration --> <import resource="classpath:org/apache/camel/itest/security/commonSecurity.xml"/> @@ -39,7 +36,7 @@ authenticationManager="authenticationManager" accessDecisionManager="accessDecisionManager" xmlns="http://camel.apache.org/schema/spring-security"/> - + <bean id="myAuthenticationAdapter" class="org.apache.camel.itest.security.MyAuthenticationAdapter"/> <bean id="myProcessor" class="org.apache.camel.itest.security.MyProcessor"/> @@ -53,10 +50,10 @@ </route> </camelContext> - <!-- - UsernameToken endpoint definition - This endpoint is configured to read the username and password tokens - and validate them using a password callback handler. + <!-- + UsernameToken endpoint definition + This endpoint is configured to read the username and password tokens + and validate them using a password callback handler. --> <cxf:cxfEndpoint id="UsernameTokenEndpoint" @@ -65,28 +62,26 @@ endpointName="s:SoapOverHttp" serviceName="s:SOAPService" xmlns:s="http://apache.org/hello_world_soap_http" - address="http://localhost:9000/SoapContext/SoapPort" - > + address="http://localhost:9000/SoapContext/SoapPort"> <cxf:inInterceptors> <ref bean="UsernameToken_Request"/> <!-- bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/--> </cxf:inInterceptors> </cxf:cxfEndpoint> - <!-- - WSS4JInInterceptor for UsernameTokenEndpoint above + <!-- + WSS4JInInterceptor for UsernameTokenEndpoint above --> - <bean + <bean id="UsernameToken_Request" - class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor" - > + class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"> <constructor-arg> <map> - <entry key="action" value="UsernameToken"/> + <entry key="action" value="UsernameToken"/> <entry key="passwordType" value="PasswordText"/> - <entry key="passwordCallbackClass" value="org.apache.camel.itest.security.KeystorePasswordCallback"/> + <entry key="passwordCallbackClass" value="org.apache.camel.itest.security.KeystorePasswordCallback"/> </map> </constructor-arg> </bean> - + </beans> diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.xml index 980df44..47b55b3 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.xml @@ -18,13 +18,10 @@ --> <beans xmlns="http://www.springframework.org/schema/beans" - xmlns:camel="http://camel.apache.org/schema/spring" xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:broker="http://activemq.apache.org/schema/core" 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 - http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"> diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml index 6b0f8f4..af9e0a7 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml @@ -18,14 +18,9 @@ --> <beans xmlns="http://www.springframework.org/schema/beans" - xmlns:camel="http://camel.apache.org/schema/spring" xmlns:broker="http://activemq.apache.org/schema/core" - xmlns:jdbc="http://www.springframework.org/schema/jdbc" 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 - http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd - http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml index 5814881..dac32e5 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml @@ -19,7 +19,6 @@ --> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:broker="http://activemq.apache.org/schema/core" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd diff --git a/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml b/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml index 6a298db..fc86f5e 100644 --- a/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml +++ b/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml @@ -18,16 +18,15 @@ --> <beans xmlns="http://www.springframework.org/schema/beans" - 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 + 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 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd - http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.xsd"> <import resource="classpath:META-INF/cxf/cxf.xml" /> - + <import resource="classpath:spring-config/jms-applicationContext.xml" /> diff --git a/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml b/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml index 0b3c14a..1e30bac 100644 --- a/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml +++ b/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml @@ -18,18 +18,15 @@ --> <beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:broker="http://activemq.apache.org/schema/core" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd + 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 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd - http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.xsd"> <import resource="classpath:META-INF/cxf/cxf.xml" /> - + <import resource="classpath:spring-config/jms-applicationContext.xml" /> <endpoint xmlns="http://cxf.apache.org/jaxws" diff --git a/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml b/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml index 70e0792..f5b1619 100644 --- a/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml +++ b/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml @@ -18,18 +18,15 @@ --> <beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:broker="http://activemq.apache.org/schema/core" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd + 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 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd - http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd http://cxf.apache.org/transports/camel http://cxf.apache.org/transports/camel.xsd"> <import resource="classpath:META-INF/cxf/cxf.xml" /> - + <import resource="classpath:spring-config/jms-applicationContext.xml" /> <endpoint xmlns="http://cxf.apache.org/jaxws" diff --git a/tests/camel-itest/src/test/resources/wsdl/binding.xml b/tests/camel-itest/src/test/resources/wsdl/binding.xml index 5ff61ec..481f2e6 100644 --- a/tests/camel-itest/src/test/resources/wsdl/binding.xml +++ b/tests/camel-itest/src/test/resources/wsdl/binding.xml @@ -18,10 +18,7 @@ --> <jxb:bindings version="1.0" wsdlLocation="hello_world.wsdl" - xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" - xmlns:jxb="http://java.sun.com/xml/ns/jaxb" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + xmlns:jxb="http://java.sun.com/xml/ns/jaxb"> <jxb:bindings> <jxb:globalBindings> <jxb:serializable uid="1"/> diff --git a/tests/camel-itest/src/test/resources/wsdl/hello_world.wsdl b/tests/camel-itest/src/test/resources/wsdl/hello_world.wsdl index 684b371..b902eb9 100644 --- a/tests/camel-itest/src/test/resources/wsdl/hello_world.wsdl +++ b/tests/camel-itest/src/test/resources/wsdl/hello_world.wsdl @@ -19,13 +19,13 @@ --> <wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:tns="http://apache.org/hello_world_soap_http" - xmlns:x1="http://apache.org/hello_world_soap_http/types" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" + xmlns:tns="http://apache.org/hello_world_soap_http" + xmlns:x1="http://apache.org/hello_world_soap_http/types" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" +> <wsdl:types> <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema" diff --git a/tests/camel-performance/src/test/resources/wsdl/CBRWSDL-consumer-embedded.wsdl b/tests/camel-performance/src/test/resources/wsdl/CBRWSDL-consumer-embedded.wsdl index 6ac9728..f61bfd0 100644 --- a/tests/camel-performance/src/test/resources/wsdl/CBRWSDL-consumer-embedded.wsdl +++ b/tests/camel-performance/src/test/resources/wsdl/CBRWSDL-consumer-embedded.wsdl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="EchoWSDL" targetNamespace="http://services.samples/xsd" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://services.samples/xsd" @@ -31,13 +31,13 @@ <message name="EchoOperationResponse"> <part name="parameters" element="tns:buyStocks"/> </message> - + <portType name="buyStocksPortType"> <operation name="buyStocksOperation"> <input name="message" message="tns:EchoOperationRequest"/> <output name="message" message="tns:EchoOperationResponse"/> </operation> - + <operation name="buyStocksOperation1K"> <input name="message1K" message="tns:EchoOperationRequest"/> <output name="message1K" message="tns:EchoOperationResponse"/> @@ -57,7 +57,7 @@ <operation name="buyStocksOperation500K"> <input name="message500K" message="tns:EchoOperationRequest"/> <output name="message500K" message="tns:EchoOperationResponse"/> - </operation> + </operation> </portType> <binding name="EchoServiceSOAP11Binding" type="tns:buyStocksPortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> @@ -70,7 +70,7 @@ <soap:body use="literal"/> </output> </operation> - + <operation name="buyStocksOperation1K"> <soap:operation soapAction="urn:buyStocks.2" style="document"/> <input name="message1K"> @@ -79,7 +79,7 @@ <output name="message1K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation5K"> <soap:operation soapAction="urn:buyStocks.5" style="document"/> <input name="message5K"> @@ -88,7 +88,7 @@ <output name="message5K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation10K"> <soap:operation soapAction="urn:buyStocks.10" style="document"/> <input name="message10K"> @@ -97,7 +97,7 @@ <output name="message10K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation100K"> <soap:operation soapAction="urn:buyStocks.100" style="document"/> <input name="message100K"> @@ -106,7 +106,7 @@ <output name="message100K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation500K"> <soap:operation soapAction="urn:buyStocks.500" style="document"/> <input name="message500K"> @@ -115,7 +115,7 @@ <output name="message500K"> <soap:body use="literal"/> </output> - </operation> + </operation> </binding> <service name="CBRProxy"> <port name="CBREchoServicePort" binding="tns:EchoServiceSOAP11Binding"> diff --git a/tests/camel-performance/src/test/resources/wsdl/CBRWSDL-provider-embedded.wsdl b/tests/camel-performance/src/test/resources/wsdl/CBRWSDL-provider-embedded.wsdl index 27cce06..a6540d9 100644 --- a/tests/camel-performance/src/test/resources/wsdl/CBRWSDL-provider-embedded.wsdl +++ b/tests/camel-performance/src/test/resources/wsdl/CBRWSDL-provider-embedded.wsdl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="EchoWSDL" targetNamespace="http://services.samples/xsd" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://services.samples/xsd" @@ -31,13 +31,13 @@ <message name="EchoOperationResponse"> <part name="parameters" element="tns:buyStocks"/> </message> - + <portType name="buyStocksPortType"> <operation name="buyStocksOperation"> <input name="message" message="tns:EchoOperationRequest"/> <output name="message" message="tns:EchoOperationResponse"/> </operation> - + <operation name="buyStocksOperation1K"> <input name="message1K" message="tns:EchoOperationRequest"/> <output name="message1K" message="tns:EchoOperationResponse"/> @@ -57,7 +57,7 @@ <operation name="buyStocksOperation500K"> <input name="message500K" message="tns:EchoOperationRequest"/> <output name="message500K" message="tns:EchoOperationResponse"/> - </operation> + </operation> </portType> <binding name="EchoServiceSOAP11Binding" type="tns:buyStocksPortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> @@ -70,7 +70,7 @@ <soap:body use="literal"/> </output> </operation> - + <operation name="buyStocksOperation1K"> <soap:operation soapAction="urn:buyStocks.2" style="document"/> <input name="message1K"> @@ -79,7 +79,7 @@ <output name="message1K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation5K"> <soap:operation soapAction="urn:buyStocks.5" style="document"/> <input name="message5K"> @@ -88,7 +88,7 @@ <output name="message5K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation10K"> <soap:operation soapAction="urn:buyStocks.10" style="document"/> <input name="message10K"> @@ -97,7 +97,7 @@ <output name="message10K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation100K"> <soap:operation soapAction="urn:buyStocks.100" style="document"/> <input name="message100K"> @@ -106,7 +106,7 @@ <output name="message100K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation500K"> <soap:operation soapAction="urn:buyStocks.500" style="document"/> <input name="message500K"> @@ -115,7 +115,7 @@ <output name="message500K"> <soap:body use="literal"/> </output> - </operation> + </operation> </binding> <service name="CBREchoService"> <port name="CBREchoServicePort" binding="tns:EchoServiceSOAP11Binding"> diff --git a/tests/camel-performance/src/test/resources/wsdl/HBRSoapWSDL-consumer-embedded.wsdl b/tests/camel-performance/src/test/resources/wsdl/HBRSoapWSDL-consumer-embedded.wsdl index ac3cb6a..72d23cd 100644 --- a/tests/camel-performance/src/test/resources/wsdl/HBRSoapWSDL-consumer-embedded.wsdl +++ b/tests/camel-performance/src/test/resources/wsdl/HBRSoapWSDL-consumer-embedded.wsdl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="EchoWSDL" targetNamespace="http://services.samples/xsd" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://services.samples/xsd" @@ -38,13 +38,13 @@ <message name="EchoOperationResponse"> <part name="parameters" element="tns:buyStocks"/> </message> - + <portType name="buyStocksPortType"> <operation name="buyStocksOperation"> <input name="message" message="tns:EchoOperationRequest"/> <output name="message" message="tns:EchoOperationResponse"/> </operation> - + <operation name="buyStocksOperation1K"> <input name="message1K" message="tns:EchoOperationRequest"/> <output name="message1K" message="tns:EchoOperationResponse"/> @@ -64,7 +64,7 @@ <operation name="buyStocksOperation500K"> <input name="message500K" message="tns:EchoOperationRequest"/> <output name="message500K" message="tns:EchoOperationResponse"/> - </operation> + </operation> </portType> <binding name="EchoServiceSOAP11Binding" type="tns:buyStocksPortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> @@ -78,7 +78,7 @@ <soap:body use="literal"/> </output> </operation> - + <operation name="buyStocksOperation1K"> <soap:operation soapAction="urn:buyStocks.2" style="document"/> <input name="message1K"> @@ -88,7 +88,7 @@ <output name="message1K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation5K"> <soap:operation soapAction="urn:buyStocks.5" style="document"/> <input name="message5K"> @@ -98,7 +98,7 @@ <output name="message5K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation10K"> <soap:operation soapAction="urn:buyStocks.10" style="document"/> <input name="message10K"> @@ -108,7 +108,7 @@ <output name="message10K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation100K"> <soap:operation soapAction="urn:buyStocks.100" style="document"/> <input name="message100K"> @@ -118,7 +118,7 @@ <output name="message100K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation500K"> <soap:operation soapAction="urn:buyStocks.500" style="document"/> <input name="message500K"> @@ -128,7 +128,7 @@ <output name="message500K"> <soap:body use="literal"/> </output> - </operation> + </operation> </binding> <service name="CBRSOAPHeaderProxy"> <port name="CBRSOAPHeaderEchoServicePort" binding="tns:EchoServiceSOAP11Binding"> diff --git a/tests/camel-performance/src/test/resources/wsdl/HBRSoapWSDL-provider-embedded.wsdl b/tests/camel-performance/src/test/resources/wsdl/HBRSoapWSDL-provider-embedded.wsdl index 1af63ad..e2392f0 100644 --- a/tests/camel-performance/src/test/resources/wsdl/HBRSoapWSDL-provider-embedded.wsdl +++ b/tests/camel-performance/src/test/resources/wsdl/HBRSoapWSDL-provider-embedded.wsdl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="EchoWSDL" targetNamespace="http://services.samples/xsd" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://services.samples/xsd" @@ -31,13 +31,13 @@ <message name="EchoOperationResponse"> <part name="parameters" element="tns:buyStocks"/> </message> - + <portType name="buyStocksPortType"> <operation name="buyStocksOperation"> <input name="message" message="tns:EchoOperationRequest"/> <output name="message" message="tns:EchoOperationResponse"/> </operation> - + <operation name="buyStocksOperation1K"> <input name="message1K" message="tns:EchoOperationRequest"/> <output name="message1K" message="tns:EchoOperationResponse"/> @@ -57,7 +57,7 @@ <operation name="buyStocksOperation500K"> <input name="message500K" message="tns:EchoOperationRequest"/> <output name="message500K" message="tns:EchoOperationResponse"/> - </operation> + </operation> </portType> <binding name="EchoServiceSOAP11Binding" type="tns:buyStocksPortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> @@ -70,7 +70,7 @@ <soap:body use="literal"/> </output> </operation> - + <operation name="buyStocksOperation1K"> <soap:operation soapAction="urn:buyStocks.2" style="document"/> <input name="message1K"> @@ -79,7 +79,7 @@ <output name="message1K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation5K"> <soap:operation soapAction="urn:buyStocks.5" style="document"/> <input name="message5K"> @@ -88,7 +88,7 @@ <output name="message5K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation10K"> <soap:operation soapAction="urn:buyStocks.10" style="document"/> <input name="message10K"> @@ -97,7 +97,7 @@ <output name="message10K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation100K"> <soap:operation soapAction="urn:buyStocks.100" style="document"/> <input name="message100K"> @@ -106,7 +106,7 @@ <output name="message100K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation500K"> <soap:operation soapAction="urn:buyStocks.500" style="document"/> <input name="message500K"> @@ -115,7 +115,7 @@ <output name="message500K"> <soap:body use="literal"/> </output> - </operation> + </operation> </binding> <service name="HBRSoapEchoService"> <port name="HBRSoapEchoServicePort" binding="tns:EchoServiceSOAP11Binding"> diff --git a/tests/camel-performance/src/test/resources/wsdl/HBRTransportWSDL-consumer-embedded.wsdl b/tests/camel-performance/src/test/resources/wsdl/HBRTransportWSDL-consumer-embedded.wsdl index 57a7240..4ece9fb 100644 --- a/tests/camel-performance/src/test/resources/wsdl/HBRTransportWSDL-consumer-embedded.wsdl +++ b/tests/camel-performance/src/test/resources/wsdl/HBRTransportWSDL-consumer-embedded.wsdl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="EchoWSDL" targetNamespace="http://services.samples/xsd" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://services.samples/xsd" @@ -31,13 +31,13 @@ <message name="EchoOperationResponse"> <part name="parameters" element="tns:buyStocks"/> </message> - + <portType name="buyStocksPortType"> <operation name="buyStocksOperation"> <input name="message" message="tns:EchoOperationRequest"/> <output name="message" message="tns:EchoOperationResponse"/> </operation> - + <operation name="buyStocksOperation1K"> <input name="message1K" message="tns:EchoOperationRequest"/> <output name="message1K" message="tns:EchoOperationResponse"/> @@ -57,7 +57,7 @@ <operation name="buyStocksOperation500K"> <input name="message500K" message="tns:EchoOperationRequest"/> <output name="message500K" message="tns:EchoOperationResponse"/> - </operation> + </operation> </portType> <binding name="EchoServiceSOAP11Binding" type="tns:buyStocksPortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> @@ -70,7 +70,7 @@ <soap:body use="literal"/> </output> </operation> - + <operation name="buyStocksOperation1K"> <soap:operation soapAction="urn:buyStocks.2" style="document"/> <input name="message1K"> @@ -79,7 +79,7 @@ <output name="message1K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation5K"> <soap:operation soapAction="urn:buyStocks.5" style="document"/> <input name="message5K"> @@ -88,7 +88,7 @@ <output name="message5K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation10K"> <soap:operation soapAction="urn:buyStocks.10" style="document"/> <input name="message10K"> @@ -97,7 +97,7 @@ <output name="message10K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation100K"> <soap:operation soapAction="urn:buyStocks.100" style="document"/> <input name="message100K"> @@ -106,7 +106,7 @@ <output name="message100K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation500K"> <soap:operation soapAction="urn:buyStocks.500" style="document"/> <input name="message500K"> @@ -115,7 +115,7 @@ <output name="message500K"> <soap:body use="literal"/> </output> - </operation> + </operation> </binding> <service name="CBRTransportHeaderProxy"> <port name="CBRTransportHeaderEchoServicePort" binding="tns:EchoServiceSOAP11Binding"> diff --git a/tests/camel-performance/src/test/resources/wsdl/HBRTransportWSDL-provider-embedded.wsdl b/tests/camel-performance/src/test/resources/wsdl/HBRTransportWSDL-provider-embedded.wsdl index 487c3de..ee03250 100644 --- a/tests/camel-performance/src/test/resources/wsdl/HBRTransportWSDL-provider-embedded.wsdl +++ b/tests/camel-performance/src/test/resources/wsdl/HBRTransportWSDL-provider-embedded.wsdl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="EchoWSDL" targetNamespace="http://services.samples/xsd" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://services.samples/xsd" @@ -31,13 +31,13 @@ <message name="EchoOperationResponse"> <part name="parameters" element="tns:buyStocks"/> </message> - + <portType name="buyStocksPortType"> <operation name="buyStocksOperation"> <input name="message" message="tns:EchoOperationRequest"/> <output name="message" message="tns:EchoOperationResponse"/> </operation> - + <operation name="buyStocksOperation1K"> <input name="message1K" message="tns:EchoOperationRequest"/> <output name="message1K" message="tns:EchoOperationResponse"/> @@ -57,7 +57,7 @@ <operation name="buyStocksOperation500K"> <input name="message500K" message="tns:EchoOperationRequest"/> <output name="message500K" message="tns:EchoOperationResponse"/> - </operation> + </operation> </portType> <binding name="EchoServiceSOAP11Binding" type="tns:buyStocksPortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> @@ -70,7 +70,7 @@ <soap:body use="literal"/> </output> </operation> - + <operation name="buyStocksOperation1K"> <soap:operation soapAction="urn:buyStocks.2" style="document"/> <input name="message1K"> @@ -79,7 +79,7 @@ <output name="message1K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation5K"> <soap:operation soapAction="urn:buyStocks.5" style="document"/> <input name="message5K"> @@ -88,7 +88,7 @@ <output name="message5K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation10K"> <soap:operation soapAction="urn:buyStocks.10" style="document"/> <input name="message10K"> @@ -97,7 +97,7 @@ <output name="message10K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation100K"> <soap:operation soapAction="urn:buyStocks.100" style="document"/> <input name="message100K"> @@ -106,7 +106,7 @@ <output name="message100K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation500K"> <soap:operation soapAction="urn:buyStocks.500" style="document"/> <input name="message500K"> @@ -115,7 +115,7 @@ <output name="message500K"> <soap:body use="literal"/> </output> - </operation> + </operation> </binding> <service name="HBRTransportEchoService"> <port name="HBRTransportEchoServicePort" binding="tns:EchoServiceSOAP11Binding"> diff --git a/tests/camel-performance/src/test/resources/wsdl/ProxyWSDL-consumer-embedded.wsdl b/tests/camel-performance/src/test/resources/wsdl/ProxyWSDL-consumer-embedded.wsdl index 421c640..bb5bee0 100644 --- a/tests/camel-performance/src/test/resources/wsdl/ProxyWSDL-consumer-embedded.wsdl +++ b/tests/camel-performance/src/test/resources/wsdl/ProxyWSDL-consumer-embedded.wsdl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="EchoWSDL" targetNamespace="http://services.samples/xsd" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://services.samples/xsd" @@ -31,13 +31,13 @@ <message name="EchoOperationResponse"> <part name="parameters" element="tns:buyStocks"/> </message> - + <portType name="buyStocksPortType"> <operation name="buyStocksOperation"> <input name="message" message="tns:EchoOperationRequest"/> <output name="message" message="tns:EchoOperationResponse"/> </operation> - + <operation name="buyStocksOperation1K"> <input name="message1K" message="tns:EchoOperationRequest"/> <output name="message1K" message="tns:EchoOperationResponse"/> @@ -57,7 +57,7 @@ <operation name="buyStocksOperation500K"> <input name="message500K" message="tns:EchoOperationRequest"/> <output name="message500K" message="tns:EchoOperationResponse"/> - </operation> + </operation> </portType> <binding name="EchoServiceSOAP11Binding" type="tns:buyStocksPortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> @@ -70,7 +70,7 @@ <soap:body use="literal"/> </output> </operation> - + <operation name="buyStocksOperation1K"> <soap:operation soapAction="urn:buyStocks.2" style="document"/> <input name="message1K"> @@ -79,7 +79,7 @@ <output name="message1K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation5K"> <soap:operation soapAction="urn:buyStocks.5" style="document"/> <input name="message5K"> @@ -88,7 +88,7 @@ <output name="message5K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation10K"> <soap:operation soapAction="urn:buyStocks.10" style="document"/> <input name="message10K"> @@ -97,7 +97,7 @@ <output name="message10K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation100K"> <soap:operation soapAction="urn:buyStocks.100" style="document"/> <input name="message100K"> @@ -106,7 +106,7 @@ <output name="message100K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation500K"> <soap:operation soapAction="urn:buyStocks.500" style="document"/> <input name="message500K"> @@ -115,7 +115,7 @@ <output name="message500K"> <soap:body use="literal"/> </output> - </operation> + </operation> </binding> <service name="DirectProxy"> <port name="EchoServicePort" binding="tns:EchoServiceSOAP11Binding"> diff --git a/tests/camel-performance/src/test/resources/wsdl/ProxyWSDL-provider-embedded.wsdl b/tests/camel-performance/src/test/resources/wsdl/ProxyWSDL-provider-embedded.wsdl index 9676d62..7a62555 100644 --- a/tests/camel-performance/src/test/resources/wsdl/ProxyWSDL-provider-embedded.wsdl +++ b/tests/camel-performance/src/test/resources/wsdl/ProxyWSDL-provider-embedded.wsdl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="EchoWSDL" targetNamespace="http://services.samples/xsd" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://services.samples/xsd" @@ -31,13 +31,13 @@ <message name="EchoOperationResponse"> <part name="parameters" element="tns:buyStocks"/> </message> - + <portType name="buyStocksPortType"> <operation name="buyStocksOperation"> <input name="message" message="tns:EchoOperationRequest"/> <output name="message" message="tns:EchoOperationResponse"/> </operation> - + <operation name="buyStocksOperation1K"> <input name="message1K" message="tns:EchoOperationRequest"/> <output name="message1K" message="tns:EchoOperationResponse"/> @@ -57,7 +57,7 @@ <operation name="buyStocksOperation500K"> <input name="message500K" message="tns:EchoOperationRequest"/> <output name="message500K" message="tns:EchoOperationResponse"/> - </operation> + </operation> </portType> <binding name="EchoServiceSOAP11Binding" type="tns:buyStocksPortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> @@ -70,7 +70,7 @@ <soap:body use="literal"/> </output> </operation> - + <operation name="buyStocksOperation1K"> <soap:operation soapAction="urn:buyStocks.2" style="document"/> <input name="message1K"> @@ -79,7 +79,7 @@ <output name="message1K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation5K"> <soap:operation soapAction="urn:buyStocks.5" style="document"/> <input name="message5K"> @@ -88,7 +88,7 @@ <output name="message5K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation10K"> <soap:operation soapAction="urn:buyStocks.10" style="document"/> <input name="message10K"> @@ -97,7 +97,7 @@ <output name="message10K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation100K"> <soap:operation soapAction="urn:buyStocks.100" style="document"/> <input name="message100K"> @@ -106,7 +106,7 @@ <output name="message100K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation500K"> <soap:operation soapAction="urn:buyStocks.500" style="document"/> <input name="message500K"> @@ -115,7 +115,7 @@ <output name="message500K"> <soap:body use="literal"/> </output> - </operation> + </operation> </binding> <service name="ProxyEchoService"> <port name="EchoServicePort" binding="tns:EchoServiceSOAP11Binding"> diff --git a/tests/camel-performance/src/test/resources/wsdl/SecureProxyWSDL-consumer-embedded.wsdl b/tests/camel-performance/src/test/resources/wsdl/SecureProxyWSDL-consumer-embedded.wsdl index e4f236f..5b34f98 100644 --- a/tests/camel-performance/src/test/resources/wsdl/SecureProxyWSDL-consumer-embedded.wsdl +++ b/tests/camel-performance/src/test/resources/wsdl/SecureProxyWSDL-consumer-embedded.wsdl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="EchoWSDL" targetNamespace="http://services.samples/xsd" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://services.samples/xsd" @@ -31,13 +31,13 @@ <message name="EchoOperationResponse"> <part name="parameters" element="tns:buyStocks"/> </message> - + <portType name="buyStocksPortType"> <operation name="buyStocksOperation"> <input name="message" message="tns:EchoOperationRequest"/> <output name="message" message="tns:EchoOperationResponse"/> </operation> - + <operation name="buyStocksOperation1K"> <input name="message1K" message="tns:EchoOperationRequest"/> <output name="message1K" message="tns:EchoOperationResponse"/> @@ -57,7 +57,7 @@ <operation name="buyStocksOperation500K"> <input name="message500K" message="tns:EchoOperationRequest"/> <output name="message500K" message="tns:EchoOperationResponse"/> - </operation> + </operation> </portType> <binding name="EchoServiceSOAP11Binding" type="tns:buyStocksPortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> @@ -70,7 +70,7 @@ <soap:body use="literal"/> </output> </operation> - + <operation name="buyStocksOperation1K"> <soap:operation soapAction="urn:buyStocks.2" style="document"/> <input name="message1K"> @@ -79,7 +79,7 @@ <output name="message1K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation5K"> <soap:operation soapAction="urn:buyStocks.5" style="document"/> <input name="message5K"> @@ -88,7 +88,7 @@ <output name="message5K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation10K"> <soap:operation soapAction="urn:buyStocks.10" style="document"/> <input name="message10K"> @@ -97,7 +97,7 @@ <output name="message10K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation100K"> <soap:operation soapAction="urn:buyStocks.100" style="document"/> <input name="message100K"> @@ -106,7 +106,7 @@ <output name="message100K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation500K"> <soap:operation soapAction="urn:buyStocks.500" style="document"/> <input name="message500K"> @@ -115,7 +115,7 @@ <output name="message500K"> <soap:body use="literal"/> </output> - </operation> + </operation> </binding> <service name="SecureProxy"> <port name="EchoServicePort" binding="tns:EchoServiceSOAP11Binding"> diff --git a/tests/camel-performance/src/test/resources/wsdl/SecureProxyWSDL-provider-embedded.wsdl b/tests/camel-performance/src/test/resources/wsdl/SecureProxyWSDL-provider-embedded.wsdl index 091c453..57b8fa4 100644 --- a/tests/camel-performance/src/test/resources/wsdl/SecureProxyWSDL-provider-embedded.wsdl +++ b/tests/camel-performance/src/test/resources/wsdl/SecureProxyWSDL-provider-embedded.wsdl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="EchoWSDL" targetNamespace="http://services.samples/xsd" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://services.samples/xsd" diff --git a/tests/camel-performance/src/test/resources/wsdl/TransformerWSDL-consumer-embedded.wsdl b/tests/camel-performance/src/test/resources/wsdl/TransformerWSDL-consumer-embedded.wsdl index e546175..2591b6f 100644 --- a/tests/camel-performance/src/test/resources/wsdl/TransformerWSDL-consumer-embedded.wsdl +++ b/tests/camel-performance/src/test/resources/wsdl/TransformerWSDL-consumer-embedded.wsdl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="EchoWSDL" targetNamespace="http://services.samples/xsd" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://services.samples/xsd" @@ -31,13 +31,13 @@ <message name="EchoOperationResponse"> <part name="parameters" element="tns:buyStocks"/> </message> - + <portType name="buyStocksPortType"> <operation name="buyStocksOperation"> <input name="message" message="tns:EchoOperationRequest"/> <output name="message" message="tns:EchoOperationResponse"/> </operation> - + <operation name="buyStocksOperation1K"> <input name="message1K" message="tns:EchoOperationRequest"/> <output name="message1K" message="tns:EchoOperationResponse"/> @@ -57,7 +57,7 @@ <operation name="buyStocksOperation500K"> <input name="message500K" message="tns:EchoOperationRequest"/> <output name="message500K" message="tns:EchoOperationResponse"/> - </operation> + </operation> </portType> <binding name="EchoServiceSOAP11Binding" type="tns:buyStocksPortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> @@ -70,7 +70,7 @@ <soap:body use="literal"/> </output> </operation> - + <operation name="buyStocksOperation1K"> <soap:operation soapAction="urn:buyStocks.2" style="document"/> <input name="message1K"> @@ -79,7 +79,7 @@ <output name="message1K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation5K"> <soap:operation soapAction="urn:buyStocks.5" style="document"/> <input name="message5K"> @@ -88,7 +88,7 @@ <output name="message5K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation10K"> <soap:operation soapAction="urn:buyStocks.10" style="document"/> <input name="message10K"> @@ -97,7 +97,7 @@ <output name="message10K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation100K"> <soap:operation soapAction="urn:buyStocks.100" style="document"/> <input name="message100K"> @@ -106,7 +106,7 @@ <output name="message100K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation500K"> <soap:operation soapAction="urn:buyStocks.500" style="document"/> <input name="message500K"> @@ -115,7 +115,7 @@ <output name="message500K"> <soap:body use="literal"/> </output> - </operation> + </operation> </binding> <service name="XSLTProxy"> <port name="EchoServicePort" binding="tns:EchoServiceSOAP11Binding"> diff --git a/tests/camel-performance/src/test/resources/wsdl/TransformerWSDL-provider-embedded.wsdl b/tests/camel-performance/src/test/resources/wsdl/TransformerWSDL-provider-embedded.wsdl index 31eb75a..6b9b3a1 100644 --- a/tests/camel-performance/src/test/resources/wsdl/TransformerWSDL-provider-embedded.wsdl +++ b/tests/camel-performance/src/test/resources/wsdl/TransformerWSDL-provider-embedded.wsdl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name="EchoWSDL" targetNamespace="http://services.samples/xsd" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://services.samples/xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://services.samples/xsd" @@ -31,13 +31,13 @@ <message name="EchoOperationResponse"> <part name="parameters" element="tns:buyStocks"/> </message> - + <portType name="buyStocksPortType"> <operation name="buyStocksOperation"> <input name="message" message="tns:EchoOperationRequest"/> <output name="message" message="tns:EchoOperationResponse"/> </operation> - + <operation name="buyStocksOperation1K"> <input name="message1K" message="tns:EchoOperationRequest"/> <output name="message1K" message="tns:EchoOperationResponse"/> @@ -57,7 +57,7 @@ <operation name="buyStocksOperation500K"> <input name="message500K" message="tns:EchoOperationRequest"/> <output name="message500K" message="tns:EchoOperationResponse"/> - </operation> + </operation> </portType> <binding name="EchoServiceSOAP11Binding" type="tns:buyStocksPortType"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> @@ -70,7 +70,7 @@ <soap:body use="literal"/> </output> </operation> - + <operation name="buyStocksOperation1K"> <soap:operation soapAction="urn:buyStocks.2" style="document"/> <input name="message1K"> @@ -79,7 +79,7 @@ <output name="message1K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation5K"> <soap:operation soapAction="urn:buyStocks.5" style="document"/> <input name="message5K"> @@ -88,7 +88,7 @@ <output name="message5K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation10K"> <soap:operation soapAction="urn:buyStocks.10" style="document"/> <input name="message10K"> @@ -97,7 +97,7 @@ <output name="message10K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation100K"> <soap:operation soapAction="urn:buyStocks.100" style="document"/> <input name="message100K"> @@ -106,7 +106,7 @@ <output name="message100K"> <soap:body use="literal"/> </output> - </operation> + </operation> <operation name="buyStocksOperation500K"> <soap:operation soapAction="urn:buyStocks.500" style="document"/> <input name="message500K"> @@ -115,7 +115,7 @@ <output name="message500K"> <soap:body use="literal"/> </output> - </operation> + </operation> </binding> <service name="XSLTEchoService"> <port name="EchoServicePort" binding="tns:EchoServiceSOAP11Binding"> diff --git a/tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/dotslash/parent.xsd b/tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/dotslash/parent.xsd index 273d3e5..ded9a62 100644 --- a/tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/dotslash/parent.xsd +++ b/tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/dotslash/parent.xsd @@ -19,10 +19,8 @@ --> <xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://foo.com/bar" - xmlns:tns="http://foo.com/bar" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="user"> <xs:complexType> <xs:sequence> diff --git a/tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/doubleslash/parent.xsd b/tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/doubleslash/parent.xsd index 273d3e5..ded9a62 100644 --- a/tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/doubleslash/parent.xsd +++ b/tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/doubleslash/parent.xsd @@ -19,10 +19,8 @@ --> <xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://foo.com/bar" - xmlns:tns="http://foo.com/bar" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="user"> <xs:complexType> <xs:sequence> diff --git a/tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/relativeparent/parent.xsd b/tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/relativeparent/parent.xsd index 273d3e5..ded9a62 100644 --- a/tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/relativeparent/parent.xsd +++ b/tests/test-bundles/camel-validator-test-resources/src/main/resources/org/apache/camel/component/validator/relativeparent/parent.xsd @@ -19,10 +19,8 @@ --> <xs:schema elementFormDefault="qualified" version="1.0" targetNamespace="http://foo.com/bar" - xmlns:tns="http://foo.com/bar" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="user"> <xs:complexType> <xs:sequence>