[jbossws-commits] JBossWS SVN: r2260 - in branches/jbossws-1.2.0: jbossws-core/src/main/java/org/jboss/ws/core/soap and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sat Feb 3 14:55:44 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-03 14:55:44 -0500 (Sat, 03 Feb 2007)
New Revision: 2260
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java
branches/jbossws-1.2.0/jbossws-tests/build.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
Log:
Rollback XML escape optimization
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-02-03 16:04:18 UTC (rev 2259)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-02-03 19:55:44 UTC (rev 2260)
@@ -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: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-02-03 16:04:18 UTC (rev 2259)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-02-03 19:55:44 UTC (rev 2260)
@@ -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: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java 2007-02-03 16:04:18 UTC (rev 2259)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/DOMWriter.java 2007-02-03 19:55:44 UTC (rev 2260)
@@ -67,6 +67,7 @@
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;
@@ -82,6 +83,7 @@
*/
public class DOMWriter
{
+ private static Logger log = Logger.getLogger(DOMWriter.class);
// Print writer
private PrintWriter out;
// True, if canonical output
@@ -100,8 +102,6 @@
private Node rootNode;
// True if we want namespace completion
private boolean completeNamespaces = true;
- // True if we want escaped XML text content
- private boolean escapeCharacters = true;
public DOMWriter(Writer w)
{
@@ -144,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)
{
@@ -153,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;
@@ -181,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.
@@ -305,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"))
{
@@ -412,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: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2007-02-03 16:04:18 UTC (rev 2259)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2007-02-03 19:55:44 UTC (rev 2260)
@@ -170,6 +170,7 @@
URL orgURL = locs.get(nsURI);
URL resURL = resolveNamespaceURI(resolver, nsURI);
URL url = resURL != null ? resURL : orgURL;
+
log.debug("Load schema: " + nsURI + "=" + url);
XMLInputSource inputSource = new XMLInputSource(null, url.toExternalForm(), null);
@@ -178,6 +179,9 @@
inputSource.setByteStream(in);
SchemaGrammar grammar = (SchemaGrammar)loader.loadGrammar(inputSource);
+ if (grammar == null)
+ throw new IllegalStateException("Cannot load grammar: " + url);
+
gs[index++] = grammar;
}
catch (RuntimeException rte)
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-03 16:04:18 UTC (rev 2259)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-03 19:55:44 UTC (rev 2260)
@@ -115,18 +115,6 @@
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
- <!-- Define the jbossws.core.jar -->
- <condition property="jbossws.core.jar" value="${core.output.lib.dir}/jbossws-core.jar">
- <isset property="HAVE_JDK_1.5"/>
- </condition>
- <property name="jbossws.core.jar" value="${jboss40.output.lib.dir}/jbossws14-core.jar"/>
-
- <!-- Define the jbossws.client.jar -->
- <condition property="jbossws.client.jar" value="${core.output.lib.dir}/jbossws-client.jar">
- <isset property="HAVE_JDK_1.5"/>
- </condition>
- <property name="jbossws.client.jar" value="${jboss40.output.lib.dir}/jbossws14-client.jar"/>
-
<!-- Define excluded tests -->
<condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt">
<or>
@@ -155,10 +143,14 @@
<target name="common-classpath" depends="prepare,thirdparty">
- <!-- The combined compile classpath -->
- <path id="jbossws.jars.classpath">
- <pathelement location="${jbossws.core.jar}"/>
- <pathelement location="${jbossws.client.jar}"/>
+ <condition property="jbossws.classpath" value="jbossws.classpath.jdk15">
+ <isset property="HAVE_JDK_1.5"/>
+ </condition>
+ <property name="jbossws.classpath" value="jbossws.classpath.jdk14"/>
+
+ <path id="jbossws.classpath.jdk15">
+ <pathelement location="${core.output.lib.dir}/jbossws-core.jar"/>
+ <pathelement location="${core.output.lib.dir}/jbossws-client.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/>
@@ -167,11 +159,20 @@
<pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/>
<pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/>
</path>
+ <path id="jbossws.classpath.jdk14">
+ <pathelement location="${core.output.lib.dir}/jbossws14-core.jar"/>
+ <pathelement location="${core.output.lib.dir}/jbossws14-client.jar"/>
+ <pathelement location="${core.output.lib.dir}/jboss-jaxws14.jar"/>
+ <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/>
+ <pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/>
+ </path>
+ <path id="jbossws.classpath" refid="${jbossws.classpath}"/>
<!-- The combined compile classpath -->
<path id="javac.classpath">
<path refid="core.classpath"/>
- <path refid="jbossws.jars.classpath"/>
+ <path refid="jbossws.classpath"/>
<pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/jboss-vfs.jar"/>
<pathelement location="${thirdparty.dir}/junit.jar"/>
@@ -189,7 +190,7 @@
<!-- The test client classpath -->
<path id="test.client.classpath">
- <path refid="jbossws.jars.classpath"/>
+ <path refid="jbossws.classpath"/>
<pathelement location="${jboss.client}/commons-logging.jar"/>
<pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
@@ -208,7 +209,7 @@
<!-- The jBPM BPEL classpath -->
<path id="jbpm.bpel.classpath">
- <path refid="jbossws.jars.classpath"/>
+ <path refid="jbossws.classpath"/>
<pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
<pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" />
<pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" />
@@ -229,7 +230,7 @@
<target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
<!-- The test client classpath -->
<path id="test.client.classpath">
- <path refid="jbossws.jars.classpath"/>
+ <path refid="jbossws.classpath"/>
<pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/>
<path refid="javac.classpath"/>
</path>
@@ -329,10 +330,7 @@
<!-- generate mapping artifacts -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="core.classpath"/>
- <classpath location="${jbossws.core.jar}"/>
- <classpath location="${core.output.lib.dir}/jboss-jaxrpc.jar"/>
- <classpath location="${core.output.lib.dir}/jboss-jaxws.jar"/>
- <classpath location="${core.output.lib.dir}/jboss-saaj.jar"/>
+ <classpath refid="jbossws.classpath"/>
<classpath location="${thirdparty.dir}/jbossretro-rt.jar"/>
<classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
<classpath location="${thirdparty.dir}/concurrent.jar"/>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-02-03 16:04:18 UTC (rev 2259)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/common/utils/DOMWriterTestCase.java 2007-02-03 19:55:44 UTC (rev 2260)
@@ -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);
}
More information about the jbossws-commits
mailing list