Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 10129 invoked from network); 12 Jan 2009 20:31:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Jan 2009 20:31:02 -0000 Received: (qmail 49901 invoked by uid 500); 12 Jan 2009 20:31:02 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 49793 invoked by uid 500); 12 Jan 2009 20:31:02 -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 49784 invoked by uid 99); 12 Jan 2009 20:31:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Jan 2009 12:31:02 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Mon, 12 Jan 2009 20:31:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 409852388896; Mon, 12 Jan 2009 12:30:41 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r733891 - in /cxf/branches/2.1.x-fixes: ./ common/common/src/main/java/org/apache/cxf/helpers/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/ tool... Date: Mon, 12 Jan 2009 20:30:21 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090112203041.409852388896@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Jan 12 12:30:04 2009 New Revision: 733891 URL: http://svn.apache.org/viewvc?rev=733891&view=rev Log: 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.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 12 12:30:04 2009 @@ -1 +1 @@ -/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,733582 +/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,732710, 733582 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java?rev=733891&r1=733890&r2=733891&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java (original) +++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/DOMUtils.java Mon Jan 12 12:30:04 2009 @@ -457,7 +457,7 @@ return ret; } - public static void findAllElementsByTagNameNS(Element el, + private static void findAllElementsByTagNameNS(Element el, String nameSpaceURI, String localName, List elementList) { @@ -482,7 +482,7 @@ return ret; } - public static void findAllElementsByTagName(Element el, String tagName, List elementList) { + private static void findAllElementsByTagName(Element el, String tagName, List elementList) { if (tagName.equals(el.getTagName())) { elementList.add(el); Modified: cxf/branches/2.1.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.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java?rev=733891&r1=733890&r2=733891&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java (original) +++ cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java Mon Jan 12 12:30:04 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 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.1.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.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java?rev=733891&r1=733890&r2=733891&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java (original) +++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSConduitBeanDefinitionParser.java Mon Jan 12 12:30:04 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 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.1.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.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java?rev=733891&r1=733890&r2=733891&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java (original) +++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spring/JMSDestinationBeanDefinitionParser.java Mon Jan 12 12:30:04 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 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.1.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.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=733891&r1=733890&r2=733891&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java (original) +++ cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java Mon Jan 12 12:30:04 2009 @@ -489,23 +489,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 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) {