You are viewing a plain text version of this content. The canonical link for it is here.
Posted to soap-dev@ws.apache.org by du...@apache.org on 2002/04/16 19:14:14 UTC
cvs commit: xml-soap/java/src/org/apache/soap/util/xml PrefixedName.java
duftler 02/04/16 10:14:14
Modified: java/src/org/apache/soap/encoding/soapenc
ParameterSerializer.java SoapEncUtils.java
Added: java/src/org/apache/soap/util/xml PrefixedName.java
Log:
Started to add the ability to serialize elements with qualified names. If
PrefixedName objects are not explicitly used as the context arguments
for serialization, the behavior is exactly the same as it was before.
Revision Changes Path
1.10 +7 -2 xml-soap/java/src/org/apache/soap/encoding/soapenc/ParameterSerializer.java
Index: ParameterSerializer.java
===================================================================
RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/encoding/soapenc/ParameterSerializer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ParameterSerializer.java 19 May 2001 04:29:02 -0000 1.9
+++ ParameterSerializer.java 16 Apr 2002 17:14:14 -0000 1.10
@@ -86,9 +86,14 @@
String name = param.getName();
Object value = param.getValue();
+ if (!(context instanceof PrefixedName))
+ {
+ context = name;
+ }
+
if (value == null && !type.isArray())
{
- SoapEncUtils.generateNullStructure(inScopeEncStyle, type, name,
+ SoapEncUtils.generateNullStructure(inScopeEncStyle, type, context,
sink, nsStack, xjmr);
}
else
@@ -99,7 +104,7 @@
: inScopeEncStyle;
Serializer s = xjmr.querySerializer(type, actualEncStyle);
- s.marshall(inScopeEncStyle, type, value, name,
+ s.marshall(inScopeEncStyle, type, value, context,
sink, nsStack, xjmr, ctx);
}
1.8 +29 -1 xml-soap/java/src/org/apache/soap/encoding/soapenc/SoapEncUtils.java
Index: SoapEncUtils.java
===================================================================
RCS file: /home/cvs/xml-soap/java/src/org/apache/soap/encoding/soapenc/SoapEncUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SoapEncUtils.java 19 May 2001 04:37:52 -0000 1.7
+++ SoapEncUtils.java 16 Apr 2002 17:14:14 -0000 1.8
@@ -128,8 +128,36 @@
{
QName elementType = xjmr.queryElementType(javaType,
Constants.NS_URI_SOAP_ENC);
+ String namespaceDecl = "";
- sink.write('<' + context.toString());
+ if (context instanceof PrefixedName)
+ {
+ PrefixedName pname = (PrefixedName)context;
+ QName qname = pname.getQName();
+
+ if (qname != null)
+ {
+ String namespaceURI = qname.getNamespaceURI();
+
+ if (namespaceURI != null && !namespaceURI.equals(""))
+ {
+ if (pname.getPrefix() == null)
+ {
+ String prefix = nsStack.getPrefixFromURI(namespaceURI);
+
+ if (prefix == null)
+ {
+ prefix = nsStack.addNSDeclaration(namespaceURI);
+ namespaceDecl = " xmlns:" + prefix + "=\"" + namespaceURI + '\"';
+ }
+
+ pname.setPrefix(prefix);
+ }
+ }
+ }
+ }
+
+ sink.write('<' + context.toString() + namespaceDecl);
// Get prefixes for the needed namespaces.
String xsiNSPrefix = nsStack.getPrefixFromURI(
1.1 xml-soap/java/src/org/apache/soap/util/xml/PrefixedName.java
Index: PrefixedName.java
===================================================================
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 2002 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 apache@apache.org.
*
* 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.util.xml;
/**
* A <code>PrefixedName</code> object can be used as the context argument
* for serialization, if qualified element names are desired.
*
* @author Matthew J. Duftler (duftler@us.ibm.com)
*/
public class PrefixedName
{
private String prefix = null;
private QName qname = null;
public PrefixedName(String prefix, QName qname)
{
this.prefix = prefix;
this.qname = qname;
}
public void setPrefix(String prefix)
{
this.prefix = prefix;
}
public String getPrefix()
{
return prefix;
}
public void setQName(QName qname)
{
this.qname = qname;
}
public QName getQName()
{
return qname;
}
public String toString()
{
return ((prefix != null && !prefix.equals(""))
? prefix + ':'
: "") +
qname.getLocalPart();
}
}