snichol 2002/11/18 10:52:23
Modified: java/src/org/apache/soap/encoding SOAPMappingRegistry.java
Added: java/src/org/apache/soap/encoding/soapenc
CleanSerializer.java SimpleSerializer.java
Log:
Move simple and clean serializers to standalone classes for use by other
code.
Revision Changes Path
1.1
xml-soap/java/src/org/apache/soap/encoding/soapenc/CleanSerializer.java
Index: CleanSerializer.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "SOAP" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 2000, International
* Business Machines, Inc., http://www.apache.org. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.soap.encoding.soapenc;
import java.io.IOException;
import java.io.Writer;
import org.apache.soap.Utils;
import org.apache.soap.encoding.soapenc.SoapEncUtils;
import org.apache.soap.rpc.SOAPContext;
import org.apache.soap.util.xml.NSStack;
import org.apache.soap.util.xml.Serializer;
import org.apache.soap.util.xml.XMLJavaMappingRegistry;
/**
* A <code>CleanSerializer</code> can be used to serialize simple types.
* This serializer runs its content through a mechanism to replace
* the characters {&, ", ', <, >} with their appropriate escape
* sequences.
*
* @author Matthew J. Duftler ([EMAIL PROTECTED])
* @author Sanjiva Weerawarana ([EMAIL PROTECTED])
* @author Scott Nichol ([EMAIL PROTECTED])
*/
public class CleanSerializer implements Serializer {
public void marshall(String inScopeEncStyle, Class javaType, Object src,
Object context, Writer sink, NSStack nsStack,
XMLJavaMappingRegistry xjmr, SOAPContext ctx)
throws IllegalArgumentException, IOException {
nsStack.pushScope();
if (src == null) {
SoapEncUtils.generateNullStructure(inScopeEncStyle, javaType, context,
sink, nsStack, xjmr, ctx);
} else {
SoapEncUtils.generateStructureHeader(inScopeEncStyle,
javaType,
context,
sink,
nsStack,
xjmr,
ctx);
sink.write(Utils.cleanString(src.toString()));
sink.write("</");
sink.write(context.toString());
sink.write('>');
}
nsStack.popScope();
}
}
1.1
xml-soap/java/src/org/apache/soap/encoding/soapenc/SimpleSerializer.java
Index: SimpleSerializer.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "SOAP" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation and was
* originally based on software copyright (c) 2000, International
* Business Machines, Inc., http://www.apache.org. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.soap.encoding.soapenc;
import java.io.IOException;
import java.io.Writer;
import org.apache.soap.encoding.soapenc.SoapEncUtils;
import org.apache.soap.rpc.SOAPContext;
import org.apache.soap.util.xml.NSStack;
import org.apache.soap.util.xml.Serializer;
import org.apache.soap.util.xml.XMLJavaMappingRegistry;
/**
* A <code>SimpleSerializer</code> can be used to serialize simple types.
* This serializer does not apply escape sequences to its content.
* This serializer should be used for numbers and other things that
* will not have any of the following characters: {&, ", ', <, >}
*
* @author Matthew J. Duftler ([EMAIL PROTECTED])
* @author Sanjiva Weerawarana ([EMAIL PROTECTED])
* @author Scott Nichol ([EMAIL PROTECTED])
*/
public class SimpleSerializer implements Serializer {
public void marshall(String inScopeEncStyle, Class javaType, Object src,
Object context, Writer sink, NSStack nsStack,
XMLJavaMappingRegistry xjmr, SOAPContext ctx)
throws IllegalArgumentException, IOException {
nsStack.pushScope();
if (src == null) {
SoapEncUtils.generateNullStructure(inScopeEncStyle, javaType, context,
sink, nsStack, xjmr, ctx);
} else {
SoapEncUtils.generateStructureHeader(inScopeEncStyle,
javaType,
context,
sink,
nsStack,
xjmr,
ctx);
sink.write(src.toString());
sink.write("</");
sink.write(context.toString());
sink.write('>');
}
nsStack.popScope();
}
}
1.34 +2 -62
xml-soap/java/src/org/apache/soap/encoding/SOAPMappingRegistry.java
Index: SOAPMappingRegistry.java
===================================================================
RCS file:
/home/cvs/xml-soap/java/src/org/apache/soap/encoding/SOAPMappingRegistry.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- SOAPMappingRegistry.java 6 Nov 2002 15:11:08 -0000 1.33
+++ SOAPMappingRegistry.java 18 Nov 2002 18:52:23 -0000 1.34
@@ -245,74 +245,14 @@
the characters {&, ", ', <, >} with their appropriate escape
sequences.
*/
- private static Serializer cleanSer = new Serializer()
- {
- public void marshall(String inScopeEncStyle, Class javaType, Object src,
- Object context, Writer sink, NSStack nsStack,
- XMLJavaMappingRegistry xjmr, SOAPContext ctx)
- throws IllegalArgumentException, IOException {
- nsStack.pushScope();
-
- if (src == null)
- {
- SoapEncUtils.generateNullStructure(inScopeEncStyle, javaType, context,
- sink, nsStack, xjmr, ctx);
- }
- else
- {
- SoapEncUtils.generateStructureHeader(inScopeEncStyle,
- javaType,
- context,
- sink,
- nsStack,
- xjmr,
- ctx);
-
- sink.write(Utils.cleanString(src.toString()));
- sink.write("</");
- sink.write(context.toString());
- sink.write('>');
- }
- nsStack.popScope();
- }
- };
+ private static Serializer cleanSer = new CleanSerializer();
/*
This serializer does not apply escape sequences to its content.
This serializer should be used for numbers and other things that
will not have any of the following characters: {&, ", ', <, >}
*/
- private static Serializer ser = new Serializer()
- {
- public void marshall(String inScopeEncStyle, Class javaType, Object src,
- Object context, Writer sink, NSStack nsStack,
- XMLJavaMappingRegistry xjmr, SOAPContext ctx)
- throws IllegalArgumentException, IOException {
- nsStack.pushScope();
-
- if (src == null)
- {
- SoapEncUtils.generateNullStructure(inScopeEncStyle, javaType, context,
- sink, nsStack, xjmr, ctx);
- }
- else
- {
- SoapEncUtils.generateStructureHeader(inScopeEncStyle,
- javaType,
- context,
- sink,
- nsStack,
- xjmr,
- ctx);
-
- sink.write(src.toString ());
- sink.write("</");
- sink.write(context.toString ());
- sink.write('>');
- }
- nsStack.popScope();
- }
- };
+ private static Serializer ser = new SimpleSerializer();
private static Serializer serializers [] = {
cleanSer, // String
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
