Author: ay Date: Mon Jan 20 16:24:35 2014 New Revision: 1559768 URL: http://svn.apache.org/r1559768 Log: Merged revisions 1552340 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1552340 | ay | 2013-12-19 17:27:27 +0100 (Thu, 19 Dec 2013) | 10 lines Merged revisions 1551978 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1551978 | ay | 2013-12-18 16:32:36 +0100 (Wed, 18 Dec 2013) | 2 lines [CXF-5465] policy.xsd used in rt-ws-policy's blueprint configuration is inconsistent ........ ........ Removed: cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/blueprint/policy.xsd Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/policy.xsd Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java?rev=1559768&r1=1559767&r2=1559768&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java Mon Jan 20 16:24:35 2014 @@ -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/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/policy.xsd URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/policy.xsd?rev=1559768&r1=1559767&r2=1559768&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/policy.xsd (original) +++ cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/policy.xsd Mon Jan 20 16:24:35 2014 @@ -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>
