Author: dkulp
Date: Thu Jan 8 13:27:51 2009
New Revision: 732827
URL: http://svn.apache.org/viewvc?rev=732827&view=rev
Log:
Fix problem getting children of given name if prefixes are different
Modified:
cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Trust13Builder.java
Modified:
cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java?rev=732827&r1=732826&r2=732827&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java
(original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java
Thu Jan 8 13:27:51 2009
@@ -291,7 +291,7 @@
if (n instanceof Element) {
Element e = (Element) n;
String ens = e.getNamespaceURI();
- if (ns.equals(ens) && lp.equals(e.getNodeName())) {
+ if (ns.equals(ens) && lp.equals(e.getLocalName())) {
return e;
}
}
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Trust13Builder.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Trust13Builder.java?rev=732827&r1=732826&r2=732827&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Trust13Builder.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/Trust13Builder.java
Thu Jan 8 13:27:51 2009
@@ -36,12 +36,11 @@
public class Trust13Builder implements AssertionBuilder {
public PolicyAssertion build(Element element) {
-
element = DOMUtils.getFirstChildWithName(element, SPConstants.POLICY);
if (element == null) {
throw new IllegalArgumentException(
- "Trust10 assertion doesn't contain any Policy");
+ "Trust13 assertion doesn't contain any Policy");
}
Trust13 trust13 = new Trust13(SP12Constants.INSTANCE);