You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by an...@apache.org on 2007/06/06 15:36:40 UTC
svn commit: r544838 - in /incubator/cxf/trunk/rt:
bindings/soap/src/main/resources/META-INF/
bindings/soap/src/main/resources/org/
bindings/soap/src/main/resources/schemas/
bindings/soap/src/main/resources/schemas/configuration/
frontend/simple/src/mai...
Author: andreasmyth
Date: Wed Jun 6 06:36:39 2007
New Revision: 544838
URL: http://svn.apache.org/viewvc?view=rev&rev=544838
Log:
Used consistent URIs for schemas for http://cxf.apache.org/bindings/soap and http://cxf.apache.org/simple namespaces.
Added:
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/schemas/
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/schemas/configuration/
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/schemas/configuration/soap.xsd
- copied, changed from r544716, incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/soap.xsd
Removed:
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/
Modified:
incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/spring.schemas
incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/spring.schemas
incubator/cxf/trunk/rt/frontend/simple/src/main/resources/schemas/simple.xsd
incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml
incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml
Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/spring.schemas?view=diff&rev=544838&r1=544837&r2=544838
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/spring.schemas (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/spring.schemas Wed Jun 6 06:36:39 2007
@@ -1 +1 @@
-http\://cxf.apache.org/schema/bindings/soap.xsd=org/apache/cxf/binding/soap/spring/soap.xsd
\ No newline at end of file
+http\://cxf.apache.org/schemas/configuration/soap.xsd=schemas/configuration/soap.xsd
\ No newline at end of file
Copied: incubator/cxf/trunk/rt/bindings/soap/src/main/resources/schemas/configuration/soap.xsd (from r544716, incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/soap.xsd)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/resources/schemas/configuration/soap.xsd?view=diff&rev=544838&p1=incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/soap.xsd&r1=544716&p2=incubator/cxf/trunk/rt/bindings/soap/src/main/resources/schemas/configuration/soap.xsd&r2=544838
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/resources/org/apache/cxf/binding/soap/spring/soap.xsd (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/resources/schemas/configuration/soap.xsd Wed Jun 6 06:36:39 2007
@@ -2,13 +2,15 @@
<xsd:schema
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:cxf-beans="http://cxf.apache.org/configuration/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-2.0.xsd"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
targetNamespace="http://cxf.apache.org/bindings/soap"
elementFormDefault="qualified"
attributeFormDefault="unqualified" >
- <xsd:import namespace="http://www.springframework.org/schema/beans" />
+ <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+ <xsd:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
<xsd:element name="soapBinding">
<xsd:complexType>
@@ -20,6 +22,7 @@
<xsd:element name="binding" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="serviceFactory" type="xsd:anyType" minOccurs="0"/>
</xsd:sequence>
+ <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
<xsd:attribute name="version" type="xsd:string" />
<xsd:attribute name="mtomEnabled" type="xsd:string" />
<xsd:attribute name="style" type="xsd:string" />
Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/spring.schemas?view=diff&rev=544838&r1=544837&r2=544838
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/spring.schemas (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/resources/META-INF/spring.schemas Wed Jun 6 06:36:39 2007
@@ -1 +1 @@
-http\://cxf.apache.org/schema/simple.xsd=schemas/simple.xsd
\ No newline at end of file
+http\://cxf.apache.org/schemas/simple.xsd=schemas/simple.xsd
\ No newline at end of file
Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/resources/schemas/simple.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/resources/schemas/simple.xsd?view=diff&rev=544838&r1=544837&r2=544838
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/resources/schemas/simple.xsd (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/resources/schemas/simple.xsd Wed Jun 6 06:36:39 2007
@@ -2,13 +2,15 @@
<xsd:schema xmlns="http://cxf.apache.org/simple"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:cxf-beans="http://cxf.apache.org/configuration/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-2.0.xsd"
targetNamespace="http://cxf.apache.org/simple"
elementFormDefault="qualified"
attributeFormDefault="unqualified" >
- <xsd:import namespace="http://www.springframework.org/schema/beans" />
+ <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+ <xsd:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
<xsd:element name="server" type="serverType"/>
@@ -29,10 +31,9 @@
<xsd:element name="serviceBean" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="serviceFactory" type="xsd:anyType" minOccurs="0"/>
</xsd:all>
- <xsd:attribute name="abstract" type="xsd:boolean" />
+ <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
<xsd:attribute name="address" type="xsd:string" />
<xsd:attribute name="bus" type="xsd:string" />
- <xsd:attribute name="createdFromAPI" type="xsd:string" />
<xsd:attribute name="serviceClass" type="xsd:string"/>
<xsd:attribute name="serviceBean" type="xsd:string"/>
<xsd:attribute name="start" type="xsd:boolean" default="true"/>
@@ -57,11 +58,10 @@
<xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="properties" type="beans:mapType" minOccurs="0"/>
</xsd:all>
- <xsd:attribute name="abstract" type="xsd:boolean" />
+ <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
<xsd:attribute name="address" type="xsd:string" />
<xsd:attribute name="bindingUri" type="xsd:string" />
<xsd:attribute name="bus" type="xsd:string" />
- <xsd:attribute name="createdFromAPI" type="xsd:string" />
<xsd:attribute name="endpointName" type="xsd:QName" />
<xsd:attribute name="password" type="xsd:string" />
<xsd:attribute name="serviceClass" type="xsd:QName" />
Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml?view=diff&rev=544838&r1=544837&r2=544838
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/clients.xml Wed Jun 6 06:36:39 2007
@@ -23,8 +23,8 @@
xmlns:soap="http://cxf.apache.org/bindings/soap"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/bindings/soap http://cxf.apache.org/schema/bindings/soap.xsd
-http://cxf.apache.org/simple http://cxf.apache.org/schema/simple.xsd">
+http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd
+http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml?view=diff&rev=544838&r1=544837&r2=544838
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/servers.xml Wed Jun 6 06:36:39 2007
@@ -23,8 +23,8 @@
xmlns:soap="http://cxf.apache.org/bindings/soap"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-http://cxf.apache.org/bindings/soap http://cxf.apache.org/schema/bindings/soap.xsd
-http://cxf.apache.org/simple http://cxf.apache.org/schema/simple.xsd">
+http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd
+http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>