svn commit: r1552275 - in /cxf/branches/2.7.x-fixes/rt/ws/policy/src: main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java

[ay]

Author: ay
Date: Thu Dec 19 10:01:23 2013
New Revision: 1552275

URL: http://svn.apache.org/r1552275
Log:
Merged revisions 1551527 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1551527 | ay | 2013-12-17 13:43:48 +0100 (Tue, 17 Dec 2013) | 2 lines

  fix url for CXF-5461

........

Modified:
    
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
    
cxf/branches/2.7.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java

Modified: 
cxf/branches/2.7.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.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java?rev=1552275&r1=1552274&r2=1552275&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
 Thu Dec 19 10:01:23 2013
@@ -46,7 +46,7 @@ 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://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/ws-securitypolicy-1.2.xsd".equals(s))
 {
+        } else if 
("http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702".equals(s)) {
             location = "schemas/ws-securitypolicy-1.2.xsd";
         }
         if (location != null) {

Modified: 
cxf/branches/2.7.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.7.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java?rev=1552275&r1=1552274&r2=1552275&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandlerTest.java
 Thu Dec 19 10:01:23 2013
@@ -35,6 +35,8 @@ public class PolicyBPHandlerTest extends
         
assertNotNull(handler.getSchemaLocation("http://www.w3.org/ns/ws-policy";));
         
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/ws-sx/ws-securitypolicy/200702";));
     }
 
 }