You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/09/17 22:32:17 UTC
svn commit: r696438 - in /cxf/branches/2.0.x-fixes: ./
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/
rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/
systests/src/test/java/org/apache/cxf/systest/handlers/
systests/src/test/java/org/apache/cxf/sys...
Author: dkulp
Date: Wed Sep 17 13:32:17 2008
New Revision: 696438
URL: http://svn.apache.org/viewvc?rev=696438&view=rev
Log:
Merged revisions 695980 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................
r695980 | dkulp | 2008-09-16 13:17:06 -0400 (Tue, 16 Sep 2008) | 9 lines
Merged revisions 695977 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r695977 | seanoc | 2008-09-16 13:07:32 -0400 (Tue, 16 Sep 2008) | 1 line
Removed further references to NodeList
........
................
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentProviderXMLClientServerTest.java
cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 17 13:32:17 2008
@@ -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
-/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
+/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
+/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
/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/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java?rev=696438&r1=696437&r2=696438&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java (original)
+++ cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptor.java Wed Sep 17 13:32:17 2008
@@ -41,7 +41,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.Binding;
import org.apache.cxf.binding.soap.Soap11;
@@ -311,7 +310,6 @@
if (header != null) {
Unmarshaller unmarshaller =
getJAXBContext().createUnmarshaller();
-// NodeList headerElements = header.getChildNodes();
Iterator<Header> iter = header.iterator();
while (iter.hasNext()) {
Object node = iter.next().getObject();
@@ -342,33 +340,6 @@
requested.add(ar);
}
}
-// for (int i = 0; i < headerElements.getLength(); i++) {
-// Node node = headerElements.item(i);
-// if (Node.ELEMENT_NODE != node.getNodeType()) {
-// continue;
-// }
-// Element headerElement = (Element)headerElements.item(i);
-// String headerURI = headerElement.getNamespaceURI();
-// String localName = headerElement.getLocalName();
-// if (RMConstants.getNamespace().equals(headerURI)) {
-// LOG.log(Level.FINE, "decoding RM header {0}", localName);
-// if (RMConstants.getSequenceName().equals(localName)) {
-// SequenceType s = decodeProperty(SequenceType.class,
-// headerElement,
-// unmarshaller);
-//
-// rmps.setSequence(s);
-// } else if (RMConstants.getSequenceAckName().equals(localName)) {
-// SequenceAcknowledgement ack = decodeProperty(SequenceAcknowledgement.class,
-// headerElement,
-// unmarshaller);
-// acks.add(ack);
-// } else if (RMConstants.getAckRequestedName().equals(localName)) {
-// AckRequestedType ar = decodeProperty(AckRequestedType.class,
-// headerElement,
-// unmarshaller);
-// requested.add(ar);
-// }
}
}
if (acks.size() > 0) {
@@ -455,15 +426,6 @@
iter.remove();
}
}
-
-// NodeList headerElements =
-// header.getElementsByTagNameNS(RMConstants.getNamespace(), "*");
-// for (int i = 0; i < headerElements.getLength(); i++) {
-// Node headerElement = headerElements.item(i);
-// if (RMConstants.getNamespace().equals(headerElement.getNamespaceURI())) {
-// header.removeChild(headerElement);
-// }
-// }
}
Modified: cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java?rev=696438&r1=696437&r2=696438&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java (original)
+++ cxf/branches/2.0.x-fixes/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapInterceptorTest.java Wed Sep 17 13:32:17 2008
@@ -34,7 +34,6 @@
import javax.xml.stream.XMLStreamReader;
import org.w3c.dom.Element;
-//import org.w3c.dom.NodeList;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.soap.SoapFault;
@@ -359,7 +358,6 @@
for (String name : names) {
boolean found = false;
-// NodeList headerElements = header.getChildNodes();
Iterator<Header> iter = header.iterator();
while (iter.hasNext()) {
Object obj = iter.next().getObject();
@@ -378,20 +376,6 @@
}
}
}
-// for (int i = 0; i < headerElements.getLength(); i++) {
-// Element headerElement = (Element)headerElements.item(i);
-// String namespace = headerElement.getNamespaceURI();
-// String localName = headerElement.getLocalName();
-// if (RMConstants.getNamespace().equals(namespace)
-// && localName.equals(name)) {
-// found = true;
-// break;
-// } else if (RMConstants.getAddressingNamespace().equals(namespace)
-// && localName.equals(name)) {
-// found = true;
-// break;
-// }
-// }
assertTrue("Could not find header element " + name, found);
}
@@ -416,22 +400,6 @@
assertTrue("Unexpected header element " + localName, found);
}
}
-// NodeList headerElements = header.getChildNodes();
-// for (int i = 0; i < headerElements.getLength(); i++) {
-// Element headerElement = (Element)headerElements.item(i);
-// String namespace = headerElement.getNamespaceURI();
-// String localName = headerElement.getLocalName();
-// assertTrue(RMConstants.getNamespace().equals(namespace)
-// || RMConstants.getAddressingNamespace().equals(namespace));
-// boolean found = false;
-// for (String name : names) {
-// if (localName.equals(name)) {
-// found = true;
-// break;
-// }
-// }
-// assertTrue("Unexpected header element " + localName, found);
-// }
}
private SoapMessage setUpInboundMessage(String resource) throws XMLStreamException {
Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java?rev=696438&r1=696437&r2=696438&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java (original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java Wed Sep 17 13:32:17 2008
@@ -29,6 +29,7 @@
import javax.xml.namespace.QName;
import javax.xml.soap.Detail;
import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPMessage;
@@ -48,12 +49,11 @@
import javax.xml.ws.soap.SOAPFaultException;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.apache.cxf.BusException;
import org.apache.cxf.common.util.PackageUtils;
import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.handler_test.HandlerTest;
import org.apache.handler_test.HandlerTestService;
@@ -1061,7 +1061,7 @@
String[] handlerNames = {"soapHandler4", "soapHandler3", "handler2", "handler1", "servant",
"handler1", "handler2", "soapHandler3", "soapHandler4"};
- List<String> resp = getHandlerNames(inMsg.getSOAPBody().getChildNodes());
+ List<String> resp = getHandlerNames(inMsg.getSOAPBody());
assertEquals(handlerNames.length, resp.size());
Iterator iter = resp.iterator();
@@ -1078,17 +1078,10 @@
}
}
- List<String> getHandlerNames(NodeList nodes) throws Exception {
+ List<String> getHandlerNames(SOAPBody soapBody) throws Exception {
+
+ Element elNode = DOMUtils.getFirstElement(soapBody);
List<String> stringList = null;
- Node elNode = null;
- for (int idx = 0; idx < nodes.getLength(); idx++) {
- Node n = nodes.item(idx);
- if (n.getNodeType() == Node.ELEMENT_NODE) {
- elNode = n;
- break;
- }
- }
-
JAXBContext jaxbCtx = JAXBContext.newInstance(PingResponse.class);
Unmarshaller um = jaxbCtx.createUnmarshaller();
Object obj = um.unmarshal(elNode);
Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentProviderXMLClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentProviderXMLClientServerTest.java?rev=696438&r1=696437&r2=696438&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentProviderXMLClientServerTest.java (original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/provider/AttachmentProviderXMLClientServerTest.java Wed Sep 17 13:32:17 2008
@@ -22,15 +22,16 @@
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.List;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
import org.apache.cxf.common.util.Base64Utility;
+import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.junit.BeforeClass;
@@ -72,17 +73,16 @@
connection.getInputStream().close();
- NodeList resList = result.getDocumentElement().getElementsByTagName("att");
- assertEquals("Two attachments must've been encoded", 2, resList.getLength());
+ List<Element> resList = DOMUtils.findAllElementsByTagName(result.getDocumentElement(), "att");
+ assertEquals("Two attachments must've been encoded", 2, resList.size());
verifyAttachment(resList, "foo", "foobar");
verifyAttachment(resList, "bar", "barbaz");
}
- private void verifyAttachment(NodeList atts, String contentId, String value) {
+ private void verifyAttachment(List<Element> atts, String contentId, String value) {
- for (int i = 0; i < atts.getLength(); i++) {
- Element expElem = (Element)atts.item(i);
+ for (Element expElem : atts) {
String child = expElem.getFirstChild().getNodeValue();
String contentIdVal = expElem.getAttribute("contentId");
if (contentId.equals(contentIdVal)
Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java?rev=696438&r1=696437&r2=696438&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java (original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java Wed Sep 17 13:32:17 2008
@@ -34,7 +34,6 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.SoapVersion;
@@ -95,16 +94,14 @@
hdr.setPrefix(ver.getHeader().getPrefix());
marshallFrom("urn:piggyback_responder", hdr, getMarshaller());
- NodeList nl = hdr.getChildNodes();
- for (int i = 0; i < nl.getLength(); i++) {
- Object obj = nl.item(i);
- if (obj instanceof Element) {
- Element elem = (Element) obj;
- Header holder = new Header(
- new QName(elem.getNamespaceURI(), elem.getLocalName()),
- elem, null);
- header.add(holder);
- }
+ Element elem = DOMUtils.getFirstElement(hdr);
+ while (elem != null) {
+ Header holder = new Header(
+ new QName(elem.getNamespaceURI(), elem.getLocalName()),
+ elem, null);
+ header.add(holder);
+
+ elem = DOMUtils.getNextElement(elem);
}
} catch (Exception e) {
Modified: cxf/branches/2.0.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.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java?rev=696438&r1=696437&r2=696438&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java (original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java Wed Sep 17 13:32:17 2008
@@ -171,14 +171,17 @@
private void buildHandlerChains() {
- for (Element jaxwsBinding : jaxwsBindingsMap.keySet()) {
- NodeList nl = jaxwsBinding.getElementsByTagNameNS(ToolConstants.HANDLER_CHAINS_URI,
- ToolConstants.HANDLER_CHAINS);
- if (nl.getLength() == 0) {
+ for (Element jaxwsBinding : jaxwsBindingsMap.keySet()) {
+ List<Element> elemList =
+ DOMUtils.findAllElementsByTagNameNS(jaxwsBinding,
+ ToolConstants.HANDLER_CHAINS_URI,
+ ToolConstants.HANDLER_CHAINS);
+ if (elemList.size() == 0) {
continue;
- }
+ }
// take the first one, anyway its 1 handler-config per customization
- this.handlerChains = (Element)nl.item(0);
+ this.handlerChains = elemList.get(0);
+
return;
}
@@ -406,16 +409,16 @@
Element cloneEle = (Element)cloneNode;
cloneEle.removeAttribute("node");
- for (int i = 0; i < cloneNode.getChildNodes().getLength(); i++) {
- Node child = cloneNode.getChildNodes().item(i);
- if (child.getNodeType() == Element.ELEMENT_NODE) {
- Element childElement = (Element)child;
- Node attrNode = childElement.getAttributeNode("node");
- if (attrNode != null) {
- cloneNode.removeChild(child);
- }
- }
+
+ Element elem = DOMUtils.getFirstElement(cloneNode);
+ while (elem != null) {
+ Node attrNode = elem.getAttributeNode("node");
+ if (attrNode != null) {
+ cloneNode.removeChild(elem);
+ }
+ elem = DOMUtils.getNextElement(elem);
}
+
firstChild.appendChild(cloneNode);
}