snichol 2002/11/26 18:49:30
Modified: java/src/org/apache/soap Constants.java Envelope.java
java/src/org/apache/soap/server TypeMappingSerializer.java
Log:
Use Envelope.LINE_SEPARATOR for all line separators in XML serialization of
SOAP envelope, including XML declaration.
Revision Changes Path
1.30 +1 -1 xml-soap/java/src/org/apache/soap/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/Constants.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Constants.java 14 Nov 2002 16:22:06 -0000 1.29
+++ Constants.java 27 Nov 2002 02:49:30 -0000 1.30
@@ -145,7 +145,7 @@
// XML Declaration string
public static final String XML_DECL =
- "<?xml version='1.0' encoding='UTF-8'?>\r\n";
+ "<?xml version='1.0' encoding='UTF-8'?>";
// Element names.
public static final String ELEM_ENVELOPE = "Envelope";
1.15 +1 -1 xml-soap/java/src/org/apache/soap/Envelope.java
Index: Envelope.java
===================================================================
RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/Envelope.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Envelope.java 27 Nov 2002 02:36:08 -0000 1.14
+++ Envelope.java 27 Nov 2002 02:49:30 -0000 1.15
@@ -246,7 +246,7 @@
Constants.NS_URI_SOAP_ENV, Constants.NS_PRE_SOAP_ENV, nsStack);
// Write XML declaration
- sink.write(Constants.XML_DECL);
+ sink.write(Constants.XML_DECL + Envelope.LINE_SEPARATOR);
sink.write('<');
sink.write(soapEnvNSPrefix);
1.13 +19 -13
xml-soap/java/src/org/apache/soap/server/TypeMappingSerializer.java
Index: TypeMappingSerializer.java
===================================================================
RCS file:
/home/cvs/xml-soap/java/src/org/apache/soap/server/TypeMappingSerializer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TypeMappingSerializer.java 27 Nov 2002 02:36:08 -0000 1.12
+++ TypeMappingSerializer.java 27 Nov 2002 02:49:30 -0000 1.13
@@ -58,15 +58,21 @@
package org.apache.soap.server;
import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.Writer;
import org.w3c.dom.*;
-import org.apache.soap.util.Bean;
-import org.apache.soap.util.StringUtils;
-import org.apache.soap.util.xml.*;
import org.apache.soap.Constants;
-import org.apache.soap.rpc.SOAPContext;
-import org.apache.soap.encoding.*;
+import org.apache.soap.Envelope;
+import org.apache.soap.encoding.SOAPMappingRegistry;
import org.apache.soap.encoding.soapenc.SoapEncUtils;
+import org.apache.soap.rpc.SOAPContext;
+import org.apache.soap.util.Bean;
+import org.apache.soap.util.xml.Deserializer;
+import org.apache.soap.util.xml.DOMUtils;
+import org.apache.soap.util.xml.NSStack;
+import org.apache.soap.util.xml.QName;
+import org.apache.soap.util.xml.Serializer;
+import org.apache.soap.util.xml.XMLJavaMappingRegistry;
/**
* Serialize and deserialize type mappings according to SOAP-Enc.
@@ -95,7 +101,7 @@
nsStack.pushScope ();
SoapEncUtils.generateStructureHeader (inScopeEncStyle, javaType, context,
sink, nsStack, xjmr, ctx);
- sink.write (StringUtils.lineSeparator);
+ sink.write(Envelope.LINE_SEPARATOR);
// these namespaces being defined by the envelope stuff
String schemaURI;
@@ -120,39 +126,39 @@
if (tm.encodingStyle != null) {
sink.write ("<encodingStyle " + xsiPrefix + ":type=\"" + xsdPrefix +
":string\">" + tm.encodingStyle + "</encodingStyle>");
- sink.write (StringUtils.lineSeparator);
+ sink.write (Envelope.LINE_SEPARATOR);
}
if (tm.elementType != null) {
sink.write ("<elementType-ns " + xsiPrefix + ":type=\"" + xsdPrefix +
":string\">" + tm.elementType.getNamespaceURI () +
"</elementType-ns>");
- sink.write (StringUtils.lineSeparator);
+ sink.write (Envelope.LINE_SEPARATOR);
sink.write ("<elementType-lp " + xsiPrefix + ":type=\"" + xsdPrefix +
":string\">" + tm.elementType.getLocalPart () +
"</elementType-lp>");
- sink.write (StringUtils.lineSeparator);
+ sink.write (Envelope.LINE_SEPARATOR);
}
if (tm.javaType != null) {
sink.write ("<javaType " + xsiPrefix + ":type=\"" + xsdPrefix +
":string\">" + tm.javaType + "</javaType>");
- sink.write (StringUtils.lineSeparator);
+ sink.write (Envelope.LINE_SEPARATOR);
}
if (tm.xml2JavaClassName != null) {
sink.write ("<xml2JavaClassName " + xsiPrefix + ":type=\"" + xsdPrefix +
":string\">" + tm.xml2JavaClassName +
"</xml2JavaClassName>");
- sink.write (StringUtils.lineSeparator);
+ sink.write (Envelope.LINE_SEPARATOR);
}
if (tm.java2XMLClassName != null) {
sink.write ("<java2XMLClassName " + xsiPrefix + ":type=\"" + xsdPrefix +
":string\">" + tm.java2XMLClassName +
"</java2XMLClassName>");
- sink.write (StringUtils.lineSeparator);
+ sink.write (Envelope.LINE_SEPARATOR);
}
sink.write ("</" + context + '>');
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
