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 2012/05/24 15:01:37 UTC
svn commit: r818946 - in /websites/production/cxf/content/schemas:
clustering.xsd configuration/cxf-beans.xsd configuration/http-conf.xsd
configuration/wsrm-manager.xsd
Author: ay
Date: Thu May 24 13:01:37 2012
New Revision: 818946
Log:
consolidate BP schemas for the ID attribute
Added:
websites/production/cxf/content/schemas/clustering.xsd (with props)
Modified:
websites/production/cxf/content/schemas/configuration/cxf-beans.xsd
websites/production/cxf/content/schemas/configuration/http-conf.xsd
websites/production/cxf/content/schemas/configuration/wsrm-manager.xsd
Added: websites/production/cxf/content/schemas/clustering.xsd
==============================================================================
Binary file - no diff available.
Propchange: websites/production/cxf/content/schemas/clustering.xsd
------------------------------------------------------------------------------
svn:mime-type = application/xml
Modified: websites/production/cxf/content/schemas/configuration/cxf-beans.xsd
==============================================================================
--- websites/production/cxf/content/schemas/configuration/cxf-beans.xsd (original)
+++ websites/production/cxf/content/schemas/configuration/cxf-beans.xsd Thu May 24 13:01:37 2012
@@ -78,4 +78,8 @@
<xsd:attribute name="bean" type="xsd:string"/>
</xsd:complexType>
+ <xsd:complexType name="identifiedType" abstract="true">
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
</xsd:schema>
\ No newline at end of file
Modified: websites/production/cxf/content/schemas/configuration/http-conf.xsd
==============================================================================
--- websites/production/cxf/content/schemas/configuration/http-conf.xsd (original)
+++ websites/production/cxf/content/schemas/configuration/http-conf.xsd Thu May 24 13:01:37 2012
@@ -39,10 +39,6 @@
<xs:import namespace="http://cxf.apache.org/configuration/beans"
schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
- <xs:complexType name="identifiedType" abstract="true">
- <xs:attribute name="id" type="xs:ID"/>
- </xs:complexType>
-
<!-- Conduit Specific Items -->
<xs:element name="authorization" type="sec:AuthorizationPolicy"/>
@@ -54,7 +50,7 @@
<xs:element name="conduit">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="http-conf:identifiedType">
+ <xs:extension base="cxf-beans:identifiedType">
<xs:all>
<xs:element ref="http-conf:client" minOccurs="0">
<xs:annotation>
@@ -128,7 +124,7 @@
<xs:element name="destination">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="http-conf:identifiedType">
+ <xs:extension base="cxf-beans:identifiedType">
<xs:all>
<xs:element ref="http-conf:server" minOccurs="0">
<xs:annotation>
Modified: websites/production/cxf/content/schemas/configuration/wsrm-manager.xsd
==============================================================================
--- websites/production/cxf/content/schemas/configuration/wsrm-manager.xsd (original)
+++ websites/production/cxf/content/schemas/configuration/wsrm-manager.xsd Thu May 24 13:01:37 2012
@@ -37,10 +37,6 @@
<xs:import namespace="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" schemaLocation="http://schemas.xmlsoap.org/ws/2005/02/rm/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,7 +57,7 @@
<xs:element name="rmManager">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="tns:identifiedType">
+ <xs:extension base="cxf-beans:identifiedType">
<xs:group ref="tns:rmElements"/>
<xs:attribute name="activation" type="tns:activationType"/>
<xs:attributeGroup ref="cxf-beans:beanAttributes"></xs:attributeGroup>
@@ -137,7 +133,7 @@
<xs:element name="jdbcStore">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="tns:identifiedType">
+ <xs:extension base="cxf-beans: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">