Author: dkulp
Date: Mon Jan 12 11:32:18 2009
New Revision: 733873
URL: http://svn.apache.org/viewvc?rev=733873&view=rev
Log:
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.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java
cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
cxf/branches/2.1.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 11:32:18 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,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,733582
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.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.1.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java?rev=733873&r1=733872&r2=733873&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java
(original)
+++
cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java
Mon Jan 12 11:32:18 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.1.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.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java?rev=733873&r1=733872&r2=733873&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
Mon Jan 12 11:32:18 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.1.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.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=733873&r1=733872&r2=733873&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
Mon Jan 12 11:32:18 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.1.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.1.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java?rev=733873&r1=733872&r2=733873&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
Mon Jan 12 11:32:18 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.SoapBindingConstants;
import org.apache.cxf.binding.soap.SoapFault;
@@ -302,24 +302,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>>();
