Author: dkulp
Date: Tue Mar 18 15:48:07 2008
New Revision: 638623
URL: http://svn.apache.org/viewvc?rev=638623&view=rev
Log:
Merged revisions 638582 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r638582 | dkulp | 2008-03-18 17:25:46 -0400 (Tue, 18 Mar 2008) | 2 lines
[CXF-1272] Update the schemas and stuff that point at the wsdl schema to use
the full URL with the .xsd extension to work around an issue in spring
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/api/src/main/resources/catalog.cat
incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/META-INF/spring.schemas
incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/http.xsd
incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/wsdl.xjb
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/catalog.cat
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/schemas/wsdl/jbi.xjb
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/schemas/wsdl/jbi.xsd
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/api/src/main/resources/catalog.cat
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/api/src/main/resources/catalog.cat?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/api/src/main/resources/catalog.cat
(original)
+++ incubator/cxf/branches/2.0.x-fixes/api/src/main/resources/catalog.cat Tue
Mar 18 15:48:07 2008
@@ -19,4 +19,5 @@
SYSTEM "http://schemas.xmlsoap.org/wsdl/";
"../../../target/schemas/schemas/wsdl/wsdl.xsd"
+SYSTEM "http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
"../../../target/schemas/schemas/wsdl/wsdl.xsd"
Modified:
incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/META-INF/spring.schemas
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/META-INF/spring.schemas?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/META-INF/spring.schemas
(original)
+++
incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/META-INF/spring.schemas
Tue Mar 18 15:48:07 2008
@@ -19,6 +19,7 @@
#
#
http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
+http\://schemas.xmlsoap.org/wsdl/2003-02-11.xsd=schemas/wsdl/wsdl.xsd
http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
Modified:
incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/http.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/http.xsd?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/http.xsd
(original)
+++
incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/http.xsd
Tue Mar 18 15:48:07 2008
@@ -35,7 +35,8 @@
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
targetNamespace="http://schemas.xmlsoap.org/wsdl/http/";>
- <import namespace = "http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace = "http://schemas.xmlsoap.org/wsdl/";
+ schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"/>
<element name="address" type="http:addressType"/>
Modified:
incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/wsdl.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/wsdl.xjb?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/wsdl.xjb
(original)
+++
incubator/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/wsdl.xjb
Tue Mar 18 15:48:07 2008
@@ -22,13 +22,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl"/>
</jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
</jaxb:bindings>
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
<jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
</jaxb:bindings>
</jaxb:bindings>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xjb
Tue Mar 18 15:48:07 2008
@@ -22,13 +22,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl"/>
</jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
</jaxb:bindings>
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
<jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
</jaxb:bindings>
</jaxb:bindings>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/schemas/wsdl/jbi.xsd
Tue Mar 18 15:48:07 2008
@@ -24,7 +24,8 @@
elementFormDefault="qualified"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; jaxb:version="2.0">
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"; />
+ <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
+ schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"; />
<xs:complexType name="JBIFormatBinding">
<xs:complexContent>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xjb
Tue Mar 18 15:48:07 2008
@@ -22,13 +22,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl"/>
</jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
</jaxb:bindings>
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
<jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
</jaxb:bindings>
</jaxb:bindings>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/schemas/wsdl/xml-binding.xsd
Tue Mar 18 15:48:07 2008
@@ -24,7 +24,8 @@
elementFormDefault="qualified"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; jaxb:version="2.0">
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"; />
+ <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
+ schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"; />
<xs:complexType name="XMLBindingMessageFormat">
<xs:complexContent>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/catalog.cat
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/catalog.cat?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/catalog.cat
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/catalog.cat
Tue Mar 18 15:48:07 2008
@@ -19,5 +19,6 @@
SYSTEM "http://schemas.xmlsoap.org/wsdl/";
"../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
+SYSTEM "http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
"../../../../../../common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd"
SYSTEM "http://cxf.apache.org/schemas/configuration/security.xsd";
"../../../../../../common/schemas/src/main/resources/schemas/configuration/security.xsd"
SYSTEM "http://cxf.apache.org/schemas/wsdl/http-conf.xsd";
"schemas/wsdl/http-conf.xsd"
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/configuration/http-conf.xsd
Tue Mar 18 15:48:07 2008
@@ -34,7 +34,7 @@
<xs:include
schemaLocation="http://cxf.apache.org/schemas/wsdl/http-conf.xsd"/>
<xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
- schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
+
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"/>
<xs:import namespace="http://cxf.apache.org/configuration/security";
schemaLocation="http://cxf.apache.org/schemas/configuration/security.xsd"/>
<xs:import namespace="http://www.springframework.org/schema/beans";
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xjb
Tue Mar 18 15:48:07 2008
@@ -22,13 +22,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl"/>
</jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
</jaxb:bindings>
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
<jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
</jaxb:bindings>
</jaxb:bindings>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
Tue Mar 18 15:48:07 2008
@@ -28,7 +28,8 @@
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb";
jaxb:version="2.0">
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
+ <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
+ schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"/>
<xs:element name="server" type="http-conf:HTTPServerPolicy"/>
<xs:element name="client" type="http-conf:HTTPClientPolicy"/>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/schemas/wsdl/jbi.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/schemas/wsdl/jbi.xjb?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/schemas/wsdl/jbi.xjb
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/schemas/wsdl/jbi.xjb
Tue Mar 18 15:48:07 2008
@@ -22,13 +22,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl"/>
</jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
</jaxb:bindings>
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
<jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
</jaxb:bindings>
</jaxb:bindings>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/schemas/wsdl/jbi.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/schemas/wsdl/jbi.xsd?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/schemas/wsdl/jbi.xsd
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/schemas/wsdl/jbi.xsd
Tue Mar 18 15:48:07 2008
@@ -24,7 +24,8 @@
elementFormDefault="qualified"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"; jaxb:version="2.0">
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"; />
+ <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
+ schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"; />
<xs:element name="address" type="jbi:AddressType"/>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/configuration/jms.xsd
Tue Mar 18 15:48:07 2008
@@ -27,9 +27,6 @@
elementFormDefault="qualified" jaxb:version="2.0">
<xs:include schemaLocation="http://cxf.apache.org/schemas/wsdl/jms.xsd"/>
- <!--
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
- -->
<xs:import namespace="http://www.springframework.org/schema/beans";
schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
<xs:import namespace="http://cxf.apache.org/configuration/beans";
schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xjb
Tue Mar 18 15:48:07 2008
@@ -22,13 +22,13 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
jaxb:extensionBindingPrefixes="xjc">
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema">
<jaxb:schemaBindings>
<jaxb:package name="org.apache.cxf.wsdl"/>
</jaxb:schemaBindings>
<jaxb:globalBindings generateIsSetMethod="true"/>
</jaxb:bindings>
- <jaxb:bindings schemaLocation="http://schemas.xmlsoap.org/wsdl/";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
<jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
</jaxb:bindings>
<jaxb:bindings schemaLocation="jms.xsd" node="/xs:schema">
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd?rev=638623&r1=638622&r2=638623&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
Tue Mar 18 15:48:07 2008
@@ -24,7 +24,8 @@
targetNamespace="http://cxf.apache.org/transports/jms";
elementFormDefault="qualified" jaxb:version="2.0">
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
schemaLocation="http://schemas.xmlsoap.org/wsdl/"/>
+ <xs:import namespace="http://schemas.xmlsoap.org/wsdl/";
+ schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd"/>
<!-- Valid wsdl elements -->
<xs:element name="client" type="jms:ClientBehaviorPolicyType"/>
