Author: dkulp Date: Wed Jan 28 17:06:38 2009 New Revision: 738541 URL: http://svn.apache.org/viewvc?rev=738541&view=rev Log: Merged revisions 737737 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r737737 | dkulp | 2009-01-26 11:34:33 -0500 (Mon, 26 Jan 2009) | 9 lines Merged revisions 737498 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r737498 | cschneider | 2009-01-25 05:46:25 -0500 (Sun, 25 Jan 2009) | 1 line CXF-2003 avoid comparing a namespace of null with a namespace of "" ........ ................ 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 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 28 17:06: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,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734 -/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,732827,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494 +/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,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737 +/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,732827,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498 /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=738541&r1=738540&r2=738541&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 Wed Jan 28 17:06:38 2009 @@ -54,8 +54,7 @@ import org.apache.cxf.common.util.StringUtils; /** - * Few simple utils to read DOM. This is originally from the Jakarta Commons - * Modeler. + * Few simple utils to read DOM. This is originally from the Jakarta Commons Modeler. * * @author Costin Manolache */ @@ -66,7 +65,7 @@ private DOMUtils() { } - + private static synchronized DocumentBuilder getBuilder() throws ParserConfigurationException { if (builder == null) { FACTORY.setNamespaceAware(true); @@ -74,9 +73,10 @@ } return builder; } - + /** * This function is much like getAttribute, but returns null, not "", for a nonexistent attribute. + * * @param e * @param attributeName * @return @@ -88,8 +88,7 @@ } return node.getValue(); } - - + /** * Get the trimmed text content of a node or null if there is no text */ @@ -97,13 +96,13 @@ if (n == null) { return null; } - + Node n1 = DOMUtils.getChild(n, Node.TEXT_NODE); if (n1 == null) { return null; } - + return n1.getNodeValue().trim(); } @@ -114,16 +113,16 @@ if (n == null) { return null; } - + Node n1 = DOMUtils.getChild(n, Node.TEXT_NODE); if (n1 == null) { return null; } - + return n1.getNodeValue(); } - + /** * Get the first element child. * @@ -134,7 +133,7 @@ if (parent == null) { return null; } - + Node first = parent.getFirstChild(); if (first == null) { return null; @@ -167,6 +166,7 @@ } return attN.getNodeValue(); } + public static String getAttribute(Element element, QName attName) { return element.getAttributeNS(attName.getNamespaceURI(), attName.getLocalPart()); } @@ -239,10 +239,11 @@ } return null; } - + public static QName getElementQName(Element el) { return new QName(el.getNamespaceURI(), el.getLocalName()); } + /** * Get the first direct child with a given type */ @@ -254,8 +255,9 @@ if (n == null) { return null; } - return (Element) n; + return (Element)n; } + public static Element getNextElement(Element el) { Node nd = el.getNextSibling(); while (nd != null) { @@ -266,31 +268,33 @@ } return null; } - + /** * Return the first element child with the specified qualified name. + * * @param parent * @param q * @return */ - public static Element getFirstChildWithName(Element parent, QName q) { + public static Element getFirstChildWithName(Element parent, QName q) { String ns = q.getNamespaceURI(); String lp = q.getLocalPart(); return getFirstChildWithName(parent, ns, lp); } - + /** * Return the first element child with the specified qualified name. + * * @param parent * @param ns * @param lp * @return */ - public static Element getFirstChildWithName(Element parent, String ns, String lp) { + public static Element getFirstChildWithName(Element parent, String ns, String lp) { for (Node n = parent.getFirstChild(); n != null; n = n.getNextSibling()) { if (n instanceof Element) { - Element e = (Element) n; - String ens = e.getNamespaceURI(); + Element e = (Element)n; + String ens = (e.getNamespaceURI() == null) ? "" : e.getNamespaceURI(); if (ns.equals(ens) && lp.equals(e.getLocalName())) { return e; } @@ -301,6 +305,7 @@ /** * Return child elements with specified name. + * * @param parent * @param ns * @param localName @@ -310,7 +315,7 @@ List<Element> r = new ArrayList<Element>(); for (Node n = parent.getFirstChild(); n != null; n = n.getNextSibling()) { if (n instanceof Element) { - Element e = (Element) n; + Element e = (Element)n; String eNs = (e.getNamespaceURI() == null) ? "" : e.getNamespaceURI(); if (ns.equals(eNs) && localName.equals(e.getLocalName())) { r.add(e); @@ -322,6 +327,7 @@ /** * Get the first child of the specified type. + * * @param parent * @param type * @return @@ -354,7 +360,7 @@ if (first == null) { return null; } - + for (Node node = first; node != null; node = node.getNextSibling()) { if (type >= 0 && node.getNodeType() != type) { @@ -399,47 +405,48 @@ return db.parse(is); } - public static Document readXml(Reader is) throws SAXException, IOException, - ParserConfigurationException { + + public static Document readXml(Reader is) throws SAXException, IOException, ParserConfigurationException { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - + dbf.setValidating(false); dbf.setIgnoringComments(false); dbf.setIgnoringElementContentWhitespace(true); dbf.setNamespaceAware(true); // dbf.setCoalescing(true); // dbf.setExpandEntityReferences(true); - + DocumentBuilder db = null; db = dbf.newDocumentBuilder(); db.setEntityResolver(new NullResolver()); - + // db.setErrorHandler( new MyErrorHandler()); InputSource ips = new InputSource(is); return db.parse(ips); } + public static Document readXml(StreamSource is) throws SAXException, IOException, ParserConfigurationException { - + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - + dbf.setValidating(false); dbf.setIgnoringComments(false); dbf.setIgnoringElementContentWhitespace(true); dbf.setNamespaceAware(true); // dbf.setCoalescing(true); // dbf.setExpandEntityReferences(true); - + DocumentBuilder db = null; db = dbf.newDocumentBuilder(); db.setEntityResolver(new NullResolver()); - + // db.setErrorHandler( new MyErrorHandler()); InputSource is2 = new InputSource(); is2.setSystemId(is.getSystemId()); is2.setByteStream(is.getInputStream()); is2.setCharacterStream(is.getReader()); - + return db.parse(is2); } @@ -458,7 +465,7 @@ throw new RuntimeException("Couldn't find a DOM parser.", e); } } - + public static Document createDocument() { try { return getBuilder().newDocument(); @@ -466,11 +473,11 @@ throw new RuntimeException("Couldn't find a DOM parser.", e); } } - + public static String getPrefixRecursive(Element el, String ns) { String prefix = getPrefix(el, ns); if (prefix == null && el.getParentNode() instanceof Element) { - prefix = getPrefixRecursive((Element) el.getParentNode(), ns); + prefix = getPrefixRecursive((Element)el.getParentNode(), ns); } return prefix; } @@ -480,16 +487,17 @@ for (int i = 0; i < atts.getLength(); i++) { Node node = atts.item(i); String name = node.getNodeName(); - if (ns.equals(node.getNodeValue()) - && (name != null && (XMLNAMESPACE.equals(name) || name.startsWith(XMLNAMESPACE + ":")))) { + if (ns.equals(node.getNodeValue()) + && (name != null && (XMLNAMESPACE.equals(name) || name.startsWith(XMLNAMESPACE + ":")))) { return node.getPrefix(); } } return null; } - + /** * Get all prefixes defined, up to the root, for a namespace URI. + * * @param element * @param namespaceUri * @param prefixes @@ -501,9 +509,10 @@ getPrefixesRecursive((Element)parent, namespaceUri, prefixes); } } - + /** * Get all prefixes defined on this element for the specified namespace. + * * @param element * @param namespaceUri * @param prefixes @@ -513,7 +522,7 @@ for (int i = 0; i < atts.getLength(); i++) { Node node = atts.item(i); String name = node.getNodeName(); - if (namespaceUri.equals(node.getNodeValue()) + if (namespaceUri.equals(node.getNodeValue()) && (name != null && (XMLNAMESPACE.equals(name) || name.startsWith(XMLNAMESPACE + ":")))) { prefixes.add(node.getPrefix()); } @@ -532,20 +541,21 @@ } /** - * Starting from a node, find the namespace declaration for a prefix. - * for a matching namespace declaration. + * Starting from a node, find the namespace declaration for a prefix. for a matching namespace + * declaration. + * * @param node search up from here to search for namespace definitions * @param searchPrefix the prefix we are searching for * @return the namespace if found. */ public static String getNamespace(Node node, String searchPrefix) { - + Element el; while (!(node instanceof Element)) { node = node.getParentNode(); } - el = (Element) node; - + el = (Element)node; + NamedNodeMap atts = el.getAttributes(); for (int i = 0; i < atts.getLength(); i++) { Node currentAttribute = atts.item(i); @@ -553,80 +563,69 @@ String currentPrefix = currentAttribute.getPrefix(); if (searchPrefix.equals(currentLocalName) && XMLNAMESPACE.equals(currentPrefix)) { return currentAttribute.getNodeValue(); - } else if (StringUtils.isEmpty(searchPrefix) - && XMLNAMESPACE.equals(currentLocalName) - && StringUtils.isEmpty(currentPrefix)) { + } else if (StringUtils.isEmpty(searchPrefix) && XMLNAMESPACE.equals(currentLocalName) + && StringUtils.isEmpty(currentPrefix)) { return currentAttribute.getNodeValue(); } } - + Node parent = el.getParentNode(); if (parent instanceof Element) { - return getNamespace((Element) parent, searchPrefix); + return getNamespace((Element)parent, searchPrefix); } - + return null; } - - public static List<Element> findAllElementsByTagNameNS(Element elem, - String nameSpaceURI, + + public static List<Element> findAllElementsByTagNameNS(Element elem, String nameSpaceURI, String localName) { List<Element> ret = new LinkedList<Element>(); findAllElementsByTagNameNS(elem, nameSpaceURI, localName, ret); return ret; } - - private static void findAllElementsByTagNameNS(Element el, - String nameSpaceURI, - String localName, - List<Element> elementList) { - - if (localName.equals(el.getLocalName()) - && nameSpaceURI.contains(el.getNamespaceURI())) { + + private static void findAllElementsByTagNameNS(Element el, String nameSpaceURI, String localName, + List<Element> elementList) { + + if (localName.equals(el.getLocalName()) && nameSpaceURI.contains(el.getNamespaceURI())) { elementList.add(el); - } + } Element elem = getFirstElement(el); while (elem != null) { findAllElementsByTagNameNS(elem, nameSpaceURI, localName, elementList); elem = getNextElement(elem); } } - - - - + public static List<Element> findAllElementsByTagName(Element elem, String tagName) { List<Element> ret = new LinkedList<Element>(); findAllElementsByTagName(elem, tagName, ret); return ret; } - + private static void findAllElementsByTagName(Element el, String tagName, List<Element> elementList) { - + if (tagName.equals(el.getTagName())) { elementList.add(el); - } + } Element elem = getFirstElement(el); while (elem != null) { findAllElementsByTagName(elem, tagName, elementList); elem = getNextElement(elem); } } - /** - * Set a namespace/prefix on an element if it is not set already. First off, it - * searches for the element for the prefix associated with the specified - * namespace. If the prefix isn't null, then this is returned. Otherwise, it - * creates a new attribute using the namespace/prefix passed as parameters. + * Set a namespace/prefix on an element if it is not set already. First off, it searches for the element + * for the prefix associated with the specified namespace. If the prefix isn't null, then this is + * returned. Otherwise, it creates a new attribute using the namespace/prefix passed as parameters. * * @param element * @param namespace * @param prefix * @return the prefix associated with the set namespace */ - public static String setNamespace(Element element, String namespace, - String prefix) { + public static String setNamespace(Element element, String namespace, String prefix) { String pre = getPrefixRecursive(element, namespace); if (pre != null) { return pre; @@ -634,9 +633,10 @@ element.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns:" + prefix, namespace); return prefix; } - + /** * Add a namespace prefix definition to an element. + * * @param element * @param namespaceUri * @param prefix
