Author: dkulp Date: Mon Jan 19 13:29:38 2009 New Revision: 735832 URL: http://svn.apache.org/viewvc?rev=735832&view=rev Log: Merged revisions 733891 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r733891 | dkulp | 2009-01-12 15:30:04 -0500 (Mon, 12 Jan 2009) | 9 lines Merged revisions 732710 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r732710 | seanoc | 2009-01-08 09:51:41 -0500 (Thu, 08 Jan 2009) | 1 line More NodeList changes ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 19 13:29:38 2009 @@ -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-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884 -/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,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163 1,731635,732320,732363,732411,733582 +/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,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891 +/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,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163 1,731635,732320,732363,732411,732710,733582 /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/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java?rev=735832&r1=735831&r2=735832&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java (original) +++ cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java Mon Jan 19 13:29:38 2009 @@ -457,7 +457,7 @@ return ret; } - public static void findAllElementsByTagNameNS(Element el, + private static void findAllElementsByTagNameNS(Element el, String nameSpaceURI, String localName, List<Element> elementList) { @@ -482,7 +482,7 @@ return ret; } - public static void findAllElementsByTagName(Element el, String tagName, List<Element> elementList) { + private static void findAllElementsByTagName(Element el, String tagName, List<Element> elementList) { if (tagName.equals(el.getTagName())) { elementList.add(el); Modified: cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java?rev=735832&r1=735831&r2=735832&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java (original) +++ cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java Mon Jan 19 13:29:38 2009 @@ -20,6 +20,7 @@ package org.apache.cxf.binding.soap.interceptor; import java.io.InputStream; +import java.util.List; import java.util.logging.Logger; import javax.xml.namespace.QName; @@ -32,7 +33,7 @@ import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; +//import org.w3c.dom.NodeList; import org.apache.cxf.Bus; import org.apache.cxf.binding.soap.Soap11; @@ -107,17 +108,18 @@ // TODO - we could stream read the "known" headers and just DOM read the // unknown ones Element element = doc.getDocumentElement(); - QName header = soapVersion.getHeader(); - NodeList headerEls = element.getElementsByTagNameNS(header.getNamespaceURI(), header - .getLocalPart()); - for (int i = 0; i < headerEls.getLength(); i++) { - Node currentHead = headerEls.item(i); - Element hel = DOMUtils.getFirstElement(currentHead); + QName header = soapVersion.getHeader(); + List<Element> elemList = + DOMUtils.findAllElementsByTagNameNS(element, + header.getNamespaceURI(), + header.getLocalPart()); + for (Element elem : elemList) { + Element hel = DOMUtils.getFirstElement(elem); while (hel != null) { // Need to add any attributes that are present on the parent element // which otherwise would be lost. - if (currentHead.hasAttributes()) { - NamedNodeMap nnp = currentHead.getAttributes(); + if (elem.hasAttributes()) { + NamedNodeMap nnp = elem.getAttributes(); for (int ct = 0; ct < nnp.getLength(); ct++) { Node attr = nnp.item(ct); Node headerAttrNode = hel.hasAttributes() @@ -135,8 +137,6 @@ } } -// System.out.println("READHEADERSINTERCEPTOR : node name : " -// + node.getLocalName() + " namespace URI" + node.getNamespaceURI()); HeaderProcessor p = bus.getExtension(HeaderManager.class) .getHeaderProcessor(hel.getNamespaceURI()); Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java?rev=735832&r1=735831&r2=735832&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java Mon Jan 19 13:29:38 2009 @@ -18,14 +18,16 @@ */ package org.apache.cxf.transport.jms.spring; +import java.util.List; + import javax.xml.namespace.QName; 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.transport.jms.AddressType; import org.apache.cxf.transport.jms.ClientBehaviorPolicyType; import org.apache.cxf.transport.jms.ClientConfig; @@ -48,10 +50,13 @@ mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "address"), "address", AddressType.class); mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "sessionPool"), "sessionPool", SessionPoolType.class); - NodeList el = element.getElementsByTagNameNS(JMS_NS, "jmsConfig-ref"); + + + List<Element> elemList = + DOMUtils.findAllElementsByTagNameNS(element, JMS_NS, "jmsConfig-ref"); - if (el.getLength() == 1) { - Node el1 = el.item(0); + if (elemList.size() == 1) { + Node el1 = elemList.get(0); bean.addPropertyReference("jmsConfig", el1.getTextContent()); } } Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java?rev=735832&r1=735831&r2=735832&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java Mon Jan 19 13:29:38 2009 @@ -18,13 +18,15 @@ */ package org.apache.cxf.transport.jms.spring; +import java.util.List; + import javax.xml.namespace.QName; 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.transport.jms.AddressType; import org.apache.cxf.transport.jms.JMSDestination; import org.apache.cxf.transport.jms.ServerBehaviorPolicyType; @@ -47,11 +49,12 @@ mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "address"), "address", AddressType.class); mapElementToJaxbProperty(element, bean, new QName(JMS_NS, "sessionPool"), "sessionPool", - SessionPoolType.class); - NodeList el = element.getElementsByTagNameNS(JMS_NS, "jmsConfig-ref"); + SessionPoolType.class); + List<Element> elemList = + DOMUtils.findAllElementsByTagNameNS(element, JMS_NS, "jmsConfig-ref"); - if (el.getLength() == 1) { - Node el1 = el.item(0); + if (elemList.size() == 1) { + Node el1 = elemList.get(0); bean.addPropertyReference("jmsConfig", el1.getTextContent()); } } Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=735832&r1=735831&r2=735832&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java (original) +++ cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java Mon Jan 19 13:29:38 2009 @@ -502,23 +502,21 @@ } else if (isValidJaxbBindingFile(reader)) { String schemaLocation = root.getAttribute("schemaLocation"); boolean hasJaxbBindingChild = false; - NodeList nlist = root.getElementsByTagNameNS(ToolConstants.JAXB_BINDINGS.getNamespaceURI(), - ToolConstants.JAXB_BINDINGS.getLocalPart()); - for (int i = 0; i < nlist.getLength(); i++) { - Node node = nlist.item(i); - if (node instanceof Element) { - hasJaxbBindingChild = true; - break; - } - } - nlist = root.getElementsByTagNameNS(ToolConstants.JAXB_BINDINGS.getNamespaceURI(), - "globalBindings"); - for (int i = 0; i < nlist.getLength(); i++) { - Node node = nlist.item(i); - if (node instanceof Element) { - hasJaxbBindingChild = true; - break; - } + + List<Element> elemList = + DOMUtils.findAllElementsByTagNameNS(root, + ToolConstants.JAXB_BINDINGS.getNamespaceURI(), + ToolConstants.JAXB_BINDINGS.getLocalPart()); + if (elemList.size() > 1) { + hasJaxbBindingChild = true; + } + + elemList = + DOMUtils.findAllElementsByTagNameNS(root, + ToolConstants.JAXB_BINDINGS.getNamespaceURI(), + "globalBindings"); + if (elemList.size() > 1) { + hasJaxbBindingChild = true; } if (StringUtils.isEmpty(schemaLocation) && !hasJaxbBindingChild) {
