You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2011/12/12 15:59:11 UTC
svn commit: r1213262 - in
/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration:
wsrm-manager-types.xsd wsrm-manager.xsd
Author: ay
Date: Mon Dec 12 14:59:10 2011
New Revision: 1213262
URL: http://svn.apache.org/viewvc?rev=1213262&view=rev
Log:
removing spring schema reference in CXF-3975
Modified:
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd
cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
Modified: cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd?rev=1213262&r1=1213261&r2=1213262&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd (original)
+++ cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd Mon Dec 12 14:59:10 2011
@@ -22,10 +22,8 @@
xmlns:tns="http://cxf.apache.org/ws/rm/manager"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- jaxb:version="2.0">
+ attributeFormDefault="unqualified">
<xs:annotation>
<xs:documentation>
Modified: cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd?rev=1213262&r1=1213261&r2=1213262&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd (original)
+++ cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager.xsd Mon Dec 12 14:59:10 2011
@@ -22,7 +22,6 @@
xmlns:tns="http://cxf.apache.org/ws/rm/manager"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
- xmlns:s-beans="http://www.springframework.org/schema/beans"
xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
elementFormDefault="qualified"
attributeFormDefault="unqualified">
@@ -34,13 +33,14 @@
</xs:annotation>
<xs:include schemaLocation="wsrm-manager-types.xsd"/>
- <xs:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
- <!-- problem in refering to this schema when parsed by spring; this needs to be placed in the spring.handlers
- <xs:import namespace="http://www.osgi.org/xmlns/blueprint/v1.0.0" schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/>
- -->
<xs:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
<xs:import namespace="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" schemaLocation="wsrm-policy.xsd"/>
+
+ <xs:complexType name="identifiedType" abstract="true">
+ <xs:attribute name="id" type="xs:ID"/>
+ </xs:complexType>
+
<xs:element name="reliableMessaging">
<xs:annotation>
<xs:documentation>
@@ -61,10 +61,10 @@
<xs:element name="rmManager">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="s-beans:identifiedType">
+ <xs:extension base="tns:identifiedType">
<xs:group ref="tns:rmElements"/>
- <xs:attributeGroup ref="cxf-beans:beanAttributes"/>
<xs:attribute name="activation" type="tns:activationType"/>
+ <xs:attributeGroup ref="cxf-beans:beanAttributes"></xs:attributeGroup>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -123,20 +123,21 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element ref="s-beans:property" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
+ <xs:any minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
<xs:documentation>
- Deprecated.
- </xs:documentation>
+ Deprecated. To support the older spring:property element that is no longer used
+ </xs:documentation>
</xs:annotation>
- </xs:element>
+ </xs:any>
+
</xs:sequence>
</xs:group>
<xs:element name="jdbcStore">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="s-beans:identifiedType">
+ <xs:extension base="tns:identifiedType">
<xs:attributeGroup ref="cxf-beans:beanAttributes"/>
<xs:attribute name="activation" type="tns:activationType"/>
<xs:attribute name="driverClassName" type="xs:string" default="org.apache.derby.jdbc.EmbeddedDriver">