cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1552640 - in /cxf/branches/2.6.x-fixes/rt/ws/policy/src: main/java/org/apache/cxf/ws/policy/blueprint/ main/resources/OSGI-INF/blueprint/ main/resources/schemas/ test/java/org/apache/cxf/ws/policy/blueprint/
Date Fri, 20 Dec 2013 13:14:26 GMT
Author: ay
Date: Fri Dec 20 13:14:25 2013
New Revision: 1552640

URL: http://svn.apache.org/r1552640
Log:
Merged revisions 1552332 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1552332 | ay | 2013-12-19 17:20:09 +0100 (Thu, 19 Dec 2013) | 10 lines

  Merged revisions 1551904 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1551904 | ay | 2013-12-18 11:52:25 +0100 (Wed, 18 Dec 2013) | 2 lines

    [CXF-5459] some ws-policy related schmeas are not resolved in spring

  ........

........

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/OSGI-INF/blueprint/policy.xml
    cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
    cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd
    cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd
    cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd
    cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java

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=1552640&r1=1552639&r2=1552640&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
Fri Dec 20 13:14:25 2013
@@ -46,6 +46,8 @@ public class PolicyBPHandler implements 
             location = "schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd";
         } else if ("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd".equals(s))
{
             location = "schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+        } else if ("http://www.w3.org/2000/09/xmldsig#".equals(s)) {
+            location = "schemas/xmldsig-core-schema.xsd";
         } else if ("http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702".equals(s))
{
             location = "schemas/ws-securitypolicy-1.2.xsd";
         }

Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml?rev=1552640&r1=1552639&r2=1552640&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml
(original)
+++ cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml
Fri Dec 20 13:14:25 2013
@@ -57,6 +57,11 @@
     </service>
     <service ref="PolicyBPHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
         <service-properties>
+            <entry key="osgi.service.blueprint.namespace" value="http://www.w3.org/2000/09/xmldsig#"/>
+        </service-properties>
+    </service>
+    <service ref="PolicyBPHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+        <service-properties>
             <entry key="osgi.service.blueprint.namespace" value="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"/>
         </service-properties>
     </service>

Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd?rev=1552640&r1=1552639&r2=1552640&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
(original)
+++ cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
Fri Dec 20 13:14:25 2013
@@ -8,8 +8,8 @@ The limited permissions granted above ar
 This document and the information contained herein is provided on an “AS IS” basis
and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY
THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES
OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 -->
 <xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all" version="0.2">
-	<xsd:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
-	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
+	<xsd:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
+	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
     
 	<xsd:complexType name="AttributedString">
 		<xsd:annotation>

Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd?rev=1552640&r1=1552639&r2=1552640&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd
(original)
+++ cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd
Fri Dec 20 13:14:25 2013
@@ -28,11 +28,11 @@ No other rights are granted by implicati
 
   <xs:import 
 		namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-		schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" />
+		schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
/>
 
   <xs:import 
 		namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-		schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd" />
+		schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
/>
 
   <!-- ////////// WS-Policy ////////// -->
 
@@ -115,4 +115,4 @@ No other rights are granted by implicati
     </xs:complexType>
   </xs:element>
 
-</xs:schema>
\ No newline at end of file
+</xs:schema>

Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd?rev=1552640&r1=1552639&r2=1552640&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd
(original)
+++ cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd
Fri Dec 20 13:14:25 2013
@@ -20,9 +20,9 @@
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2006/07/ws-policy"
xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
targetNamespace="http://www.w3.org/2006/07/ws-policy" blockDefault="#all" elementFormDefault="qualified">
 	
-  <xs:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
+  <xs:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
 
-  <xs:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
+  <xs:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
   
 	<!-- Constructs from the Web Services Policy 1.5 Framework -->
 
@@ -117,4 +117,4 @@
     </xs:complexType>
   </xs:element>
   	
-</xs:schema>
\ No newline at end of file
+</xs:schema>

Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd?rev=1552640&r1=1552639&r2=1552640&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd
(original)
+++ cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd
Fri Dec 20 13:14:25 2013
@@ -27,11 +27,11 @@
 	
   <xs:import 
       namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-      schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" />
+      schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
/>
 
   <xs:import 
       namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-      schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd" />
+      schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
/>
   
 	<!-- Constructs from the Web Services Policy 1.5 Framework -->
 

Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java?rev=1552640&r1=1552639&r2=1552640&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
Fri Dec 20 13:14:25 2013
@@ -36,6 +36,12 @@ public class PolicyBPHandlerTest extends
         assertNotNull(handler.getSchemaLocation("http://www.w3.org/2006/07/ws-policy"));
         assertNotNull(handler.getSchemaLocation("http://schemas.xmlsoap.org/ws/2004/09/policy"));
         
+        assertNotNull(handler.getSchemaLocation(
+            "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"));
+        assertNotNull(handler.getSchemaLocation(
+            "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"));
+        assertNotNull(handler.getSchemaLocation("http://www.w3.org/2000/09/xmldsig#"));
+        
         assertNotNull(handler.getSchemaLocation("http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"));
     }
 



Mime
View raw message