cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r890907 - in /websites/production/cxf/content/schemas: blueprint/policy.xsd policy.xsd
Date Wed, 18 Dec 2013 16:14:32 GMT
Author: ay
Date: Wed Dec 18 16:14:32 2013
New Revision: 890907

Log:
consolidate policy.xsd

Modified:
    websites/production/cxf/content/schemas/blueprint/policy.xsd
    websites/production/cxf/content/schemas/policy.xsd

Modified: websites/production/cxf/content/schemas/blueprint/policy.xsd
==============================================================================
--- websites/production/cxf/content/schemas/blueprint/policy.xsd (original)
+++ websites/production/cxf/content/schemas/blueprint/policy.xsd Wed Dec 18 16:14:32 2013
@@ -17,15 +17,14 @@
   specific language governing permissions and limitations
   under the License.
 -->
+<!-- Deprecated. Use http://cxf.apache.org/schemas/policy.xsd -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:beans="http://www.osgi.org/xmlns/blueprint/v1.0.0"
   xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  targetNamespace="http://cxf.apache.org/blueprint/policy" 
+  targetNamespace="http://cxf.apache.org/policy" 
   elementFormDefault="qualified"
   attributeFormDefault="unqualified"  >
-  
-  <xsd:import namespace="http://www.osgi.org/xmlns/blueprint/v1.0.0" schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"/>
+
   <xsd:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="http://cxf.apache.org/schemas/configuration/cxf-beans.xsd"/>
 
   <xsd:annotation>
@@ -79,7 +78,7 @@
           </xsd:annotation>
         </xsd:element>
       </xsd:all>
-      <!-- xsd:attributeGroup ref="cxf-beans:beanAttributes"/-->       
+      <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>       
       <xsd:attribute name="enabled" type="xsd:boolean" default="false">         
         <xsd:annotation>
           <xsd:documentation>
@@ -115,8 +114,8 @@
   <xsd:element name="externalAttachment">
     <xsd:complexType>
       <xsd:complexContent>
-        <xsd:extension base="beans:Tcomponent">
-          <!-- xsd:attributeGroup ref="cxf-beans:beanAttributes"/-->        
+        <xsd:extension base="cxf-beans:identifiedType">
+          <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>        
           <xsd:attribute name="location" type="xsd:string" default="http://www.w3.org/2006/07/ws-policy">
             <xsd:annotation>
               <xsd:documentation>

Modified: websites/production/cxf/content/schemas/policy.xsd
==============================================================================
--- websites/production/cxf/content/schemas/policy.xsd (original)
+++ websites/production/cxf/content/schemas/policy.xsd Wed Dec 18 16:14:32 2013
@@ -18,14 +18,12 @@
   under the License.
 -->
 <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"
   targetNamespace="http://cxf.apache.org/policy" 
   elementFormDefault="qualified"
   attributeFormDefault="unqualified"  >
 
-  <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:annotation>
@@ -102,13 +100,20 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:attribute>
+      <xsd:attribute name="bus" type="xsd:string">        
+        <xsd:annotation>
+          <xsd:documentation>
+              The name of the bus to apply these settings
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
     </xsd:complexType>
   </xsd:element>
  
   <xsd:element name="externalAttachment">
     <xsd:complexType>
       <xsd:complexContent>
-        <xsd:extension base="beans:identifiedType">
+        <xsd:extension base="cxf-beans:identifiedType">
           <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>        
           <xsd:attribute name="location" type="xsd:string" default="http://www.w3.org/2006/07/ws-policy">
             <xsd:annotation>



Mime
View raw message