Author: dkulp Date: Mon Jan 19 13:23:52 2009 New Revision: 735827 URL: http://svn.apache.org/viewvc?rev=735827&view=rev Log: Merged revisions 733873 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r733873 | dkulp | 2009-01-12 14:32:18 -0500 (Mon, 12 Jan 2009) | 9 lines Merged revisions 732320 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r732320 | seanoc | 2009-01-07 07:32:10 -0500 (Wed, 07 Jan 2009) | 1 line NodeList refactor ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java cxf/branches/2.0.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 19 13:23:52 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 -/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,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 +/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,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/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java?rev=735827&r1=735826&r2=735827&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java (original) +++ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java Mon Jan 19 13:23:52 2009 @@ -32,7 +32,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import org.apache.hello_world_soap_http.SOAPService1; import org.apache.hello_world_soap_http.SOAPService2; @@ -127,14 +126,14 @@ } private static Element fetchElementByName(Node parent, String name) { - Element ret = null; - NodeList nodeList = parent.getChildNodes(); - for (int i = 0; i < nodeList.getLength(); i++) { - Node node = nodeList.item(i); + Element ret = null; + Node node = parent.getFirstChild(); + while (node != null) { if (node instanceof Element && ((Element)node).getLocalName().equals(name)) { ret = (Element)node; break; } + node = node.getNextSibling(); } return ret; } Modified: cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java?rev=735827&r1=735826&r2=735827&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java Mon Jan 19 13:23:52 2009 @@ -126,65 +126,6 @@ elem = org.apache.cxf.helpers.DOMUtils.getNextElement(elem); } - /* - try { - - NodeList children = element.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 ("tlsServerParameters".equals(name)) { - - TLSServerParametersType parametersType = - JAXBHelper.parseElement((Element)n, bean, TLSServerParametersType.class); - - TLSServerParametersConfig param = - new TLSServerParametersConfig(parametersType); - - bean.addPropertyValue("tlsServerParameters", param); - - } else if ("tlsServerParametersRef".equals(name)) { - - TLSServerParametersIdentifiedType parameterTypeRef = - JAXBHelper.parseElement((Element)n, bean, - TLSServerParametersIdentifiedType.class); - - TLSServerParameters param = - getTlsServerParameters(engineFactoryProperties, parameterTypeRef.getId()); - bean.addPropertyValue("tlsServerParameters", param); - - } else if ("threadingParameters".equals(name)) { - ThreadingParametersType parametersType = - JAXBHelper.parseElement((Element)n, bean, ThreadingParametersType.class); - - ThreadingParameters param = toThreadingParameters(parametersType); - bean.addPropertyValue("threadingParameters", param); - - } else if ("threadingParametersRef".equals(name)) { - ThreadingParametersIdentifiedType parametersTypeRef = - JAXBHelper.parseElement((Element)n, bean, - ThreadingParametersIdentifiedType.class); - ThreadingParameters param = - getThreadingParameters(engineFactoryProperties, parametersTypeRef.getId()); - bean.addPropertyValue("threadingParameters", param); - - } else if ("connector".equals(name)) { - // only deal with the one connector here - List list = - ctx.getDelegate().parseListElement((Element) n, bean.getBeanDefinition()); - bean.addPropertyValue("connector", list.get(0)); - } else if ("handlers".equals(name)) { - List handlers = - ctx.getDelegate().parseListElement((Element) n, bean.getBeanDefinition()); - bean.addPropertyValue("handlers", handlers); - } else if ("sessionSupport".equals(name) || "reuseAddress".equals(name)) { - String text = n.getTextContent(); - bean.addPropertyValue(name, Boolean.valueOf(text)); - } - } - } - */ } catch (Exception e) { throw new RuntimeException("Could not process configuration.", e); } Modified: cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=735827&r1=735826&r2=735827&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java (original) +++ cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java Mon Jan 19 13:23:52 2009 @@ -39,7 +39,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.binding.soap.SoapMessage; @@ -277,15 +276,15 @@ } encodeReferenceParameters(maps, hdr, marshaller); - NodeList children = hdr.getChildNodes(); - int len = children.getLength(); - for (int i = 0; i < len; i++) { - Node node = children.item(i); - + Node childNode = hdr.getFirstChild(); + + while (childNode != null) { Header holder = new Header( - new QName(node.getNamespaceURI(), node.getLocalName()), - node); + new QName(childNode.getNamespaceURI(), + childNode.getLocalName()), + childNode); header.add(holder); + childNode = childNode.getNextSibling(); } ((AddressingPropertiesImpl)maps).setDuplicate(null); @@ -631,15 +630,6 @@ iter.remove(); } } - /* - NodeList headerElements = - header.getElementsByTagNameNS(maps.getNamespaceURI(), "*"); - for (int i = 0; i < headerElements.getLength(); i++) { - Node headerElement = headerElements.item(i); - if (Names.WSA_NAMESPACE_NAME.equals(headerElement.getNamespaceURI())) { - header.removeChild(headerElement); - } - } */ } /** Modified: cxf/branches/2.0.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java?rev=735827&r1=735826&r2=735827&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java (original) +++ cxf/branches/2.0.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java Mon Jan 19 13:23:52 2009 @@ -32,7 +32,7 @@ import javax.xml.namespace.QName; import org.w3c.dom.Element; -import org.w3c.dom.NodeList; +import org.w3c.dom.Node; import org.apache.cxf.binding.soap.SoapConstants; import org.apache.cxf.binding.soap.SoapFault; @@ -301,24 +301,24 @@ marshaller.marshal(null, header); EasyMock.expectLastCall(); } - - NodeList children = control.createMock(NodeList.class); - header.getChildNodes(); - EasyMock.expectLastCall().andReturn(children); - children.getLength(); - EasyMock.expectLastCall().andReturn(expectedMarshals).anyTimes(); - for (int i = 0; i < expectedMarshals; i++) { - Element child = control.createMock(Element.class); - children.item(i); - EasyMock.expectLastCall().andReturn(child); - /* - * child.setAttributeNS(EasyMock.eq("http://www.w3.org/2000/xmlns/";), EasyMock.eq("xmlns:wsa"), - * EasyMock.eq(maps.getNamespaceURI())); EasyMock.expectLastCall(); - */ + + Node child = control.createMock(Node.class); + header.getFirstChild(); + EasyMock.expectLastCall().andReturn(child); + + int i = 0; + while (child != null) { child.getNamespaceURI(); EasyMock.expectLastCall().andReturn(expectedNames[i].getNamespaceURI()); child.getLocalName(); EasyMock.expectLastCall().andReturn(expectedNames[i].getLocalPart()); + + Node nextChild = ++i < expectedMarshals + ? control.createMock(Node.class) + : null; + child.getNextSibling(); + EasyMock.expectLastCall().andReturn(nextChild); + child = nextChild; } mimeHeaders = new HashMap<String, List<String>>();
