Author: seanoc
Date: Wed Jan 7 04:32:10 2009
New Revision: 732320
URL: http://svn.apache.org/viewvc?rev=732320&view=rev
Log:
NodeList refactor
Modified:
cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
Modified:
cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java?rev=732320&r1=732319&r2=732320&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/demo/hwDispatch/client/Client.java
Wed Jan 7 04:32:10 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/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java?rev=732320&r1=732319&r2=732320&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
(original)
+++
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/spring/JettyHTTPServerEngineBeanDefinitionParser.java
Wed Jan 7 04:32:10 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/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=732320&r1=732319&r2=732320&view=diff
==============================================================================
---
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
(original)
+++
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
Wed Jan 7 04:32:10 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/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java?rev=732320&r1=732319&r2=732320&view=diff
==============================================================================
---
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
(original)
+++
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
Wed Jan 7 04:32:10 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>>();
