Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C6366106C7 for ; Wed, 18 Dec 2013 10:52:51 +0000 (UTC) Received: (qmail 53536 invoked by uid 500); 18 Dec 2013 10:52:51 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 53495 invoked by uid 500); 18 Dec 2013 10:52:50 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 53482 invoked by uid 99); 18 Dec 2013 10:52:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Dec 2013 10:52:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FILL_THIS_FORM_SHORT X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Dec 2013 10:52:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9BC4A23888FE; Wed, 18 Dec 2013 10:52:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1551904 - in /cxf/trunk/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: Wed, 18 Dec 2013 10:52:26 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131218105226.9BC4A23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ay Date: Wed Dec 18 10:52:25 2013 New Revision: 1551904 URL: http://svn.apache.org/r1551904 Log: [CXF-5459] some ws-policy related schmeas are not resolved in spring 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/OSGI-INF/blueprint/policy.xml cxf/trunk/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java 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=1551904&r1=1551903&r2=1551904&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 10:52: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/trunk/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml?rev=1551904&r1=1551903&r2=1551904&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml (original) +++ cxf/trunk/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml Wed Dec 18 10:52:25 2013 @@ -51,6 +51,11 @@ + + + + + Modified: cxf/trunk/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd?rev=1551904&r1=1551903&r2=1551904&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd (original) +++ cxf/trunk/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd Wed Dec 18 10:52: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. --> - - + + Modified: cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd?rev=1551904&r1=1551903&r2=1551904&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd (original) +++ cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd Wed Dec 18 10:52:25 2013 @@ -28,11 +28,11 @@ No other rights are granted by implicati + schemaLocation="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-utility-1.0.xsd" /> @@ -115,4 +115,4 @@ No other rights are granted by implicati - \ No newline at end of file + Modified: cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd?rev=1551904&r1=1551903&r2=1551904&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd (original) +++ cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd Wed Dec 18 10:52:25 2013 @@ -20,9 +20,9 @@ --> - + - + @@ -117,4 +117,4 @@ - \ No newline at end of file + Modified: cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd?rev=1551904&r1=1551903&r2=1551904&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd (original) +++ cxf/trunk/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd Wed Dec 18 10:52:25 2013 @@ -27,11 +27,11 @@ + schemaLocation="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-utility-1.0.xsd" /> Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java?rev=1551904&r1=1551903&r2=1551904&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java (original) +++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java Wed Dec 18 10:52: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")); }