Author: dkulp Date: Tue Sep 16 09:22:11 2008 New Revision: 695965 URL: http://svn.apache.org/viewvc?rev=695965&view=rev Log: Merged revisions 695877 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r695877 | dkulp | 2008-09-16 09:37:47 -0400 (Tue, 16 Sep 2008) | 9 lines Merged revisions 695835 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r695835 | seanoc | 2008-09-16 08:44:21 -0400 (Tue, 16 Sep 2008) | 1 line Removed further references to NodeList ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 16 09:22:11 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695876 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java?rev=695965&r1=695964&r2=695965&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java (original) +++ cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/spring/PolicyFeatureBeanDefinitionParser.java Tue Sep 16 09:22:11 2008 @@ -22,10 +22,9 @@ import java.util.List; import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser; +import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.ws.policy.WSPolicyFeature; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; @@ -37,19 +36,18 @@ @Override protected void parseChildElements(Element e, ParserContext ctx, BeanDefinitionBuilder bean) { List<Element> ps = new ArrayList<Element>(); - List<Element> prs = new ArrayList<Element>(); - NodeList children = e.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) { - Node n = children.item(i); - if (n.getNodeType() == Node.ELEMENT_NODE) { - String name = n.getLocalName(); - if ("Policy".equals(n.getLocalName())) { - ps.add((Element)n); - } else if ("PolicyReference".equals(name)) { - prs.add((Element)n); - } - } + List<Element> prs = new ArrayList<Element>(); + + Element elem = DOMUtils.getFirstElement(e); + while (elem != null) { + if ("Policy".equals(elem.getLocalName())) { + ps.add(elem); + } else if ("PolicyReference".equals(elem.getLocalName())) { + prs.add(elem); + } + elem = DOMUtils.getNextElement(e); } + bean.addPropertyValue("policyElements", ps); bean.addPropertyValue("policyReferenceElements", prs);
