Author: ay
Date: Wed Dec 18 15:32:36 2013
New Revision: 1551978
URL: http://svn.apache.org/r1551978
Log:
[CXF-5465] policy.xsd used in rt-ws-policy's blueprint configuration is
inconsistent
Removed:
cxf/trunk/rt/ws/policy/src/main/resources/schemas/blueprint/policy.xsd
Modified:
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy.xsd
Modified:
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java?rev=1551978&r1=1551977&r2=1551978&view=diff
==============================================================================
---
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
(original)
+++
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
Wed Dec 18 15:32:36 2013
@@ -35,7 +35,7 @@ public class PolicyBPHandler implements
//Say yes to various schemas.
String location = null;
if ("http://cxf.apache.org/policy".equals(s)) {
- location = "schemas/blueprint/policy.xsd";
+ location = "schemas/policy.xsd";
} else if ("http://www.w3.org/ns/ws-policy".equals(s)) {
location = "schemas/ws-policy-200702.xsd";
} else if ("http://www.w3.org/2006/07/ws-policy".equals(s)) {
Modified: cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy.xsd
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy.xsd?rev=1551978&r1=1551977&r2=1551978&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy.xsd (original)
+++ cxf/trunk/rt/ws/policy/src/main/resources/schemas/policy.xsd Wed Dec 18
15:32:36 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>
