snichol 2002/11/18 13:52:06 Modified: java/src/org/apache/soap Body.java Envelope.java Fault.java Header.java java/src/org/apache/soap/encoding/literalxml XMLParameterSerializer.java java/src/org/apache/soap/encoding/soapenc ArraySerializer.java BeanSerializer.java HashtableSerializer.java PropertyBagSerializer.java VectorSerializer.java java/src/org/apache/soap/rpc RPCMessage.java Log: For serialization within the SOAP envelope, use Envelope.LINE_SEPARATOR as the "line separator". This is a constant with no platform dependency. For now, it is "\n" for backward compatibility, but do not rely on that! Revision Changes Path 1.11 +4 -4 xml-soap/java/src/org/apache/soap/Body.java Index: Body.java =================================================================== RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/Body.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Body.java 18 Nov 2002 16:42:40 -0000 1.10 +++ Body.java 18 Nov 2002 21:52:05 -0000 1.11 @@ -174,7 +174,7 @@ // Serialize any body attributes. attrHandler.marshall(sink, ctx); - sink.write('>' + StringUtils.lineSeparator); + sink.write('>' + Envelope.LINE_SEPARATOR); // Serialize any body entries. if (bodyEntries != null) @@ -212,7 +212,7 @@ throw new IllegalArgumentException("Unknown type of body entry: '" + obj.getClass () + "'"); } - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); } } @@ -229,12 +229,12 @@ mrc.setId(id); ser.marshall(actualEncStyle, obj.getClass(), obj, mrc, sink, nsStack, xjmr, ctx); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); } } sink.write("</" + soapEnvNSPrefix + ':' + Constants.ELEM_BODY + '>' + - StringUtils.lineSeparator); + Envelope.LINE_SEPARATOR); nsStack.popScope(); } 1.13 +6 -3 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.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Envelope.java 18 Nov 2002 16:42:40 -0000 1.12 +++ Envelope.java 18 Nov 2002 21:52:05 -0000 1.13 @@ -76,6 +76,9 @@ */ public class Envelope { + /** To separate XML tags in the envelope */ + public static final String LINE_SEPARATOR = "\n"; + // The SOAP envelope header private Header header = null; // The SOAP envelope body @@ -245,7 +248,7 @@ // Serialize any envelope attributes. attrHandler.marshall(sink, ctx); - sink.write('>' + StringUtils.lineSeparator); + sink.write('>' + Envelope.LINE_SEPARATOR); // If there is a header, serialize it. if (header != null) @@ -265,14 +268,14 @@ Utils.marshallNode(envelopeEntryEl, sink); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); } } sink.write("</"); sink.write(soapEnvNSPrefix); sink.write(':' + Constants.ELEM_ENVELOPE + - '>' + StringUtils.lineSeparator); + '>' + Envelope.LINE_SEPARATOR); } /** 1.12 +10 -10 xml-soap/java/src/org/apache/soap/Fault.java Index: Fault.java =================================================================== RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/Fault.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Fault.java 6 Nov 2002 15:11:08 -0000 1.11 +++ Fault.java 18 Nov 2002 21:52:05 -0000 1.12 @@ -187,15 +187,15 @@ // Serialize any fault attributes. attrHandler.marshall(sink, ctx); - sink.write('>' + StringUtils.lineSeparator + + sink.write('>' + Envelope.LINE_SEPARATOR + '<' + Constants.ELEM_FAULT_CODE + '>'); sink.write(Utils.cleanString(faultCode)); sink.write("</" + Constants.ELEM_FAULT_CODE + '>' + - StringUtils.lineSeparator + + Envelope.LINE_SEPARATOR + '<' + Constants.ELEM_FAULT_STRING + '>'); sink.write(Utils.cleanString(faultString)); sink.write("</" + Constants.ELEM_FAULT_STRING + '>' + - StringUtils.lineSeparator); + Envelope.LINE_SEPARATOR); // Generate the <faultactor> element if a value is present. if (faultActorURI != null) @@ -203,7 +203,7 @@ sink.write('<' + Constants.ELEM_FAULT_ACTOR + '>'); sink.write(Utils.cleanString(faultActorURI)); sink.write("</" + Constants.ELEM_FAULT_ACTOR + '>' + - StringUtils.lineSeparator); + Envelope.LINE_SEPARATOR); } // If there are detail entries, generate the <detail> element, @@ -211,7 +211,7 @@ if (detailEntries != null) { sink.write('<' + Constants.ELEM_DETAIL + '>' + - StringUtils.lineSeparator); + Envelope.LINE_SEPARATOR); // Serialize the detail entries within the <detail> element. for (Enumeration e = detailEntries.elements(); e.hasMoreElements();) @@ -224,7 +224,7 @@ Element detailEntryEl = (Element)detailEntry; Utils.marshallNode(detailEntryEl, sink); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); } /* If the detail entry is a Parameter, try to find a serializer. @@ -247,7 +247,7 @@ nsStack, xjmr, ctx); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); } else { @@ -262,7 +262,7 @@ } sink.write("</" + Constants.ELEM_DETAIL + '>' + - StringUtils.lineSeparator); + Envelope.LINE_SEPARATOR); } // Serialize any fault entries (in addition to <faultcode>, <faultstring>, @@ -275,14 +275,14 @@ Utils.marshallNode(faultEntryEl, sink); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); } } sink.write("</"); sink.write(soapEnvNSPrefix); sink.write(':' + Constants.ELEM_FAULT + '>' + - StringUtils.lineSeparator); + Envelope.LINE_SEPARATOR); nsStack.popScope(); } 1.6 +3 -3 xml-soap/java/src/org/apache/soap/Header.java Index: Header.java =================================================================== RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/Header.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Header.java 6 Nov 2002 15:11:08 -0000 1.5 +++ Header.java 18 Nov 2002 21:52:05 -0000 1.6 @@ -128,7 +128,7 @@ // Serialize any header attributes. attrHandler.marshall(sink, ctx); - sink.write('>' + StringUtils.lineSeparator); + sink.write('>' + Envelope.LINE_SEPARATOR); // Serialize the header entries within the <SOAP-ENV:Header> element. for (Enumeration e = headerEntries.elements(); e.hasMoreElements();) @@ -137,12 +137,12 @@ Utils.marshallNode(headerEntryEl, sink); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); } sink.write("</"); sink.write(soapEnvNSPrefix); - sink.write(':' + Constants.ELEM_HEADER + '>' + StringUtils.lineSeparator); + sink.write(':' + Constants.ELEM_HEADER + '>' + Envelope.LINE_SEPARATOR); } nsStack.popScope(); 1.4 +2 -2 xml-soap/java/src/org/apache/soap/encoding/literalxml/XMLParameterSerializer.java Index: XMLParameterSerializer.java =================================================================== RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/encoding/literalxml/XMLParameterSerializer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- XMLParameterSerializer.java 8 Jan 2001 12:25:13 -0000 1.3 +++ XMLParameterSerializer.java 18 Nov 2002 21:52:05 -0000 1.4 @@ -105,9 +105,9 @@ Constants.NS_URI_LITERAL_XML + '\"'); } - sink.write('>' + StringUtils.lineSeparator); + sink.write('>' + Envelope.LINE_SEPARATOR); Utils.marshallNode(el, sink); - sink.write(StringUtils.lineSeparator + "</" + name + '>'); + sink.write(Envelope.LINE_SEPARATOR + "</" + name + '>'); } else { 1.14 +2 -2 xml-soap/java/src/org/apache/soap/encoding/soapenc/ArraySerializer.java Index: ArraySerializer.java =================================================================== RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/encoding/soapenc/ArraySerializer.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ArraySerializer.java 10 Sep 2002 07:27:25 -0000 1.13 +++ ArraySerializer.java 18 Nov 2002 21:52:05 -0000 1.14 @@ -114,7 +114,7 @@ elementType, lengthStr); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); int length = Array.getLength(src); @@ -137,7 +137,7 @@ sink, nsStack, ctx); } - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); nsStack.popScope(); } 1.11 +2 -2 xml-soap/java/src/org/apache/soap/encoding/soapenc/BeanSerializer.java Index: BeanSerializer.java =================================================================== RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/encoding/soapenc/BeanSerializer.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- BeanSerializer.java 6 Nov 2002 15:11:08 -0000 1.10 +++ BeanSerializer.java 18 Nov 2002 21:52:05 -0000 1.11 @@ -94,7 +94,7 @@ xjmr, ctx); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); PropertyDescriptor[] properties = getPropertyDescriptors(javaType); @@ -135,7 +135,7 @@ xjmr.marshall(Constants.NS_URI_SOAP_ENC, Parameter.class, param, null, sink, nsStack, ctx); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); } } } 1.4 +5 -5 xml-soap/java/src/org/apache/soap/encoding/soapenc/HashtableSerializer.java Index: HashtableSerializer.java =================================================================== RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/encoding/soapenc/HashtableSerializer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- HashtableSerializer.java 30 Aug 2002 21:39:00 -0000 1.3 +++ HashtableSerializer.java 18 Nov 2002 21:52:05 -0000 1.4 @@ -107,7 +107,7 @@ xjmr, ctx); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); Hashtable hash = (Hashtable)src; @@ -117,12 +117,12 @@ Object value = hash.get(key); sink.write("<" + STR_ITEM + ">"); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); // ??? Deal with null keys? xjmr.marshall(Constants.NS_URI_SOAP_ENC, key.getClass(), key, STR_KEY, sink, nsStack, ctx); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); if (value == null) { @@ -138,9 +138,9 @@ STR_VALUE, sink, nsStack, ctx); } - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); sink.write("</" + STR_ITEM + ">"); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); } sink.write("</" + context + '>'); 1.2 +3 -3 xml-soap/java/src/org/apache/soap/encoding/soapenc/PropertyBagSerializer.java Index: PropertyBagSerializer.java =================================================================== RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/encoding/soapenc/PropertyBagSerializer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PropertyBagSerializer.java 16 Sep 2002 15:26:25 -0000 1.1 +++ PropertyBagSerializer.java 18 Nov 2002 21:52:05 -0000 1.2 @@ -66,11 +66,11 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.apache.soap.Constants; +import org.apache.soap.Envelope; import org.apache.soap.rpc.Parameter; import org.apache.soap.rpc.RPCConstants; import org.apache.soap.rpc.SOAPContext; import org.apache.soap.util.Bean; -import org.apache.soap.util.StringUtils; import org.apache.soap.util.xml.Deserializer; import org.apache.soap.util.xml.DOMUtils; import org.apache.soap.util.xml.NSStack; @@ -109,7 +109,7 @@ xjmr, ctx); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); Map map = (Map) src; Set keySet = map.keySet(); @@ -121,7 +121,7 @@ Parameter param = new Parameter(key.toString(), value.getClass(), value, null); xjmr.marshall(Constants.NS_URI_SOAP_ENC, Parameter.class, param, null, sink, nsStack, ctx); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); } sink.write("</" + context + '>'); 1.10 +2 -2 xml-soap/java/src/org/apache/soap/encoding/soapenc/VectorSerializer.java Index: VectorSerializer.java =================================================================== RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/encoding/soapenc/VectorSerializer.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- VectorSerializer.java 30 Aug 2002 21:39:00 -0000 1.9 +++ VectorSerializer.java 18 Nov 2002 21:52:05 -0000 1.10 @@ -132,7 +132,7 @@ xjmr, ctx); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); for (Enumeration e = enum; e.hasMoreElements(); ) { @@ -154,7 +154,7 @@ "item", sink, nsStack, ctx); } - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); nsStack.popScope(); } 1.22 +4 -4 xml-soap/java/src/org/apache/soap/rpc/RPCMessage.java Index: RPCMessage.java =================================================================== RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/rpc/RPCMessage.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- RPCMessage.java 11 Nov 2002 14:34:47 -0000 1.21 +++ RPCMessage.java 18 Nov 2002 21:52:06 -0000 1.22 @@ -295,7 +295,7 @@ sink.write('\"'); } - sink.write('>' + StringUtils.lineSeparator); + sink.write('>' + Envelope.LINE_SEPARATOR); // Get the returnValue. Parameter ret = resp.getReturnValue(); @@ -311,7 +311,7 @@ ser.marshall(actualMsgEncStyle, Parameter.class, ret, null, sink, nsStack, xjmr, ctx); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); } serializeParams(params, actualMsgEncStyle, sink, nsStack, xjmr, ctx); @@ -367,7 +367,7 @@ } sink.write('>'); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); serializeParams(params, actualMsgEncStyle, sink, nsStack, xjmr, ctx); @@ -404,7 +404,7 @@ ser.marshall(inScopeEncStyle, Parameter.class, param, null, sink, nsStack, xjmr, ctx); - sink.write(StringUtils.lineSeparator); + sink.write(Envelope.LINE_SEPARATOR); } } }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>