6:09 p.m.
Author: heiko.braun(a)jboss.com
Date: 2007-02-05 12:09:51 -0500 (Mon, 05 Feb 2007)
New Revision: 2281
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
Log:
Revert DOMWriter changes
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
---
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-02-05
13:45:04 UTC (rev 2280)
+++
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-02-05
17:09:51 UTC (rev 2281)
@@ -140,7 +140,7 @@
completeHost = reqProtocol + "://" + hostAndPort;
}
- String newLocation = completeHost + reqPath +
"?wsdl&resource=" + newResourcePath;
+ String newLocation = completeHost + reqPath +
"?wsdl&resource=" + newResourcePath;
locationAttr.setNodeValue(newLocation);
log.trace("Mapping import from '" + orgLocation +
"' to '" + newLocation + "'");
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
---
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-02-05
13:45:04 UTC (rev 2280)
+++
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-02-05
17:09:51 UTC (rev 2281)
@@ -108,7 +108,7 @@
{
Element srcElement = (Element)it.next();
//registerNamespacesLocally(srcElement);
- String xmlFragment = DOMWriter.printNode(srcElement, false, true);
+ String xmlFragment = DOMWriter.printNode(srcElement, false);
Name name = new NameImpl(srcElement.getLocalName(), srcElement.getPrefix(),
srcElement.getNamespaceURI());
SOAPContentElement destElement = new SOAPHeaderElementImpl(name);
@@ -202,7 +202,7 @@
DOMUtils.copyAttributes(destElement, srcElement);
- String xmlFragment = DOMWriter.printNode(srcElement, false, true);
+ String xmlFragment = DOMWriter.printNode(srcElement, false);
destElement.setXMLFragment(xmlFragment);
}
}
@@ -215,7 +215,7 @@
DOMUtils.copyAttributes(destElement, srcElement);
- String xmlFragment = DOMWriter.printNode(srcElement, false, true);
+ String xmlFragment = DOMWriter.printNode(srcElement, false);
destElement.setXMLFragment(xmlFragment);
}
else if (style == null)
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-02-05
13:45:04 UTC (rev 2280)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-02-05
17:09:51 UTC (rev 2281)
@@ -187,8 +187,6 @@
org.w3c.dom.Node child = (org.w3c.dom.Node)getFirstChild();
- value = DOMWriter.normalize(value, false);
-
if (child instanceof org.w3c.dom.Text)
((org.w3c.dom.Text)child).setNodeValue(value);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java 2007-02-05
13:45:04 UTC (rev 2280)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java 2007-02-05
17:09:51 UTC (rev 2281)
@@ -57,14 +57,23 @@
// $Id$
-import org.jboss.logging.Logger;
-import org.w3c.dom.*;
-
-import java.io.*;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.jboss.logging.Logger;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
/**
* Traverse a DOM tree in order to print a document that is parsed.
*
@@ -94,8 +103,6 @@
// True if we want namespace completion
private boolean completeNamespaces = true;
- private boolean escapeCharacters = false;
-
public DOMWriter(Writer w)
{
this.out = new PrintWriter(w);
@@ -137,7 +144,7 @@
/**
* Print a node with explicit prettyprinting.
* The defaults for all other DOMWriter properties apply.
- * Special characters will not be escaped.
+ *
*/
public static String printNode(Node node, boolean prettyprint)
{
@@ -146,19 +153,6 @@
return strw.toString();
}
- /**
- * Print a node with explicit prettyprinting.
- * Special characters can be escaped. This is idiot proof
- * but can be very expensive.
- *
- */
- public static String printNode(Node node, boolean prettyprint, boolean escape)
- {
- StringWriter strw = new StringWriter();
- new
DOMWriter(strw).setPrettyprint(prettyprint).setEscapeCharacters(escape).print(node);
- return strw.toString();
- }
-
public boolean isCanonical()
{
return canonical;
@@ -174,11 +168,6 @@
return this;
}
- public DOMWriter setEscapeCharacters(boolean b)
- {
- this.escapeCharacters = b;
- return this;
- }
/**
* Set wheter subelements should have their namespaces completed.
* Setting this to false may lead to invalid XML fragments.
@@ -298,7 +287,7 @@
Attr attr = attrs[i];
String atPrefix = attr.getPrefix();
String atName = attr.getNodeName();
- String atValue = escapeCharacters ? normalize(attr.getNodeValue(),
canonical) : attr.getNodeValue();
+ String atValue = normalize(attr.getNodeValue(), canonical);
if (atPrefix != null && !atPrefix.equals("xmlns")
&& !atPrefix.equals("xml"))
{
@@ -405,7 +394,7 @@
// print text
case Node.TEXT_NODE:
{
- String text = escapeCharacters ? normalize(node.getNodeValue(), canonical) :
node.getNodeValue();
+ String text = normalize(node.getNodeValue(), canonical);
if (prettyprint == false || text.trim().length() > 0)
out.print(text);
break;
Modified:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
===================================================================
---
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-02-05
13:45:04 UTC (rev 2280)
+++
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-02-05
17:09:51 UTC (rev 2281)
@@ -189,7 +189,7 @@
Element domEl = DOMUtils.parse(expStr);
- String wasStr = DOMWriter.printNode(domEl, false, true);
+ String wasStr = DOMWriter.printNode(domEl, false);
assertEquals(expStr, wasStr);
}