You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2002/08/03 23:25:25 UTC
cvs commit: xml-axis/java/test/message TestMessageElement.java
gdaniels 2002/08/03 14:25:25
Modified: java/src/org/apache/axis/description OperationDesc.java
java/src/org/apache/axis/encoding
DeserializationContextImpl.java Deserializer.java
DeserializerImpl.java
java/src/org/apache/axis/encoding/ser ArrayDeserializer.java
BeanDeserializer.java
JAFDataHandlerDeserializer.java
MapDeserializer.java QNameDeserializer.java
SimpleDeserializer.java VectorDeserializer.java
java/src/org/apache/axis/message BodyBuilder.java
EnvelopeBuilder.java HeaderBuilder.java
MessageElement.java RPCHandler.java SOAPBody.java
SOAPHandler.java SOAPHeader.java
java/test/message TestMessageElement.java
Log:
Revamp a few routines for consistency. Our routines (startElement, the
MessageElement constructor, etc.) now ALL expect a prefix, not a
QName.
Fixes bug #11315:
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=11315
Revision Changes Path
1.19 +0 -2 xml-axis/java/src/org/apache/axis/description/OperationDesc.java
Index: OperationDesc.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/description/OperationDesc.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- OperationDesc.java 23 Jul 2002 22:11:28 -0000 1.18
+++ OperationDesc.java 3 Aug 2002 21:25:24 -0000 1.19
@@ -59,8 +59,6 @@
import java.util.Iterator;
import java.lang.reflect.Method;
-import org.apache.axis.AxisProperties;
-
import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
1.44 +1 -1 xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java
Index: DeserializationContextImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- DeserializationContextImpl.java 26 Jul 2002 20:29:23 -0000 1.43
+++ DeserializationContextImpl.java 3 Aug 2002 21:25:24 -0000 1.44
@@ -871,7 +871,7 @@
pushElementHandler(nextHandler);
- nextHandler.startElement(namespace, localName, qName,
+ nextHandler.startElement(namespace, localName, prefix,
attributes, this);
if (!doneParsing && (recorder != null)) {
1.34 +2 -2 xml-axis/java/src/org/apache/axis/encoding/Deserializer.java
Index: Deserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/Deserializer.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Deserializer.java 27 Jun 2002 22:42:29 -0000 1.33
+++ Deserializer.java 3 Aug 2002 21:25:24 -0000 1.34
@@ -243,12 +243,12 @@
* involves obtaining a correct Deserializer and plugging its handler.
* @param namespace is the namespace of the element
* @param localName is the name of the element
- * @param qName is the prefixed qname of the element
+ * @param prefix is the prefix of the element
* @param attributes are the attributes on the element...used to get the type
* @param context is the DeserializationContext
*/
public void onStartElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException;
1.25 +8 -8 xml-axis/java/src/org/apache/axis/encoding/DeserializerImpl.java
Index: DeserializerImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializerImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DeserializerImpl.java 3 Jul 2002 17:50:26 -0000 1.24
+++ DeserializerImpl.java 3 Aug 2002 21:25:24 -0000 1.25
@@ -286,7 +286,7 @@
* - calling onStartElement to do the actual deserialization if not nill or href cases.
* @param namespace is the namespace of the element
* @param localName is the name of the element
- * @param qName is the prefixed qName of the element
+ * @param prefix is the prefix of the element
* @param attributes are the attributes on the element...used to get the type
* @param context is the DeserializationContext
*
@@ -314,11 +314,11 @@
* See the pre-existing Deserializers for more information.
*/
public void startElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException
{
- super.startElement(namespace, localName, qName, attributes, context);
+ super.startElement(namespace, localName, prefix, attributes, context);
// If the nil attribute is present and true, set the value to null
// and return since there is nothing to deserialize.
@@ -377,7 +377,7 @@
Deserializer dser = (Deserializer)context.getDeserializerForType(defaultType );
if(null != dser){
dser.startElement(namespace, localName,
- qName, attributes,
+ prefix, attributes,
context);
ref = dser.getValue();
@@ -392,7 +392,7 @@
} else {
isHref = false;
- onStartElement(namespace, localName, qName, attributes,
+ onStartElement(namespace, localName, prefix, attributes,
context);
}
}
@@ -404,12 +404,12 @@
* involves obtaining a correct Deserializer and plugging its handler.
* @param namespace is the namespace of the element
* @param localName is the name of the element
- * @param qName is the prefixed qName of the element
+ * @param prefix is the prefix of the element
* @param attributes are the attributes on the element...used to get the type
* @param context is the DeserializationContext
*/
public void onStartElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException
{
@@ -442,7 +442,7 @@
dser.moveValueTargets(this);
context.replaceElementHandler((SOAPHandler) dser);
// And don't forget to give it the start event...
- dser.startElement(namespace, localName, qName,
+ dser.startElement(namespace, localName, prefix,
attributes, context);
} else {
throw new SAXException(
1.25 +2 -2 xml-axis/java/src/org/apache/axis/encoding/ser/ArrayDeserializer.java
Index: ArrayDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ArrayDeserializer.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ArrayDeserializer.java 22 Jul 2002 06:23:01 -0000 1.24
+++ ArrayDeserializer.java 3 Aug 2002 21:25:24 -0000 1.25
@@ -111,12 +111,12 @@
* involves obtaining a correct Deserializer and plugging its handler.
* @param namespace is the namespace of the element
* @param localName is the name of the element
- * @param qName is the prefixed qname of the element
+ * @param prefix is the prefix of the element
* @param attributes are the attrs on the element...used to get the type
* @param context is the DeserializationContext
*/
public void onStartElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException
{
1.42 +6 -6 xml-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java
Index: BeanDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- BeanDeserializer.java 30 Jul 2002 06:16:04 -0000 1.41
+++ BeanDeserializer.java 3 Aug 2002 21:25:25 -0000 1.42
@@ -145,13 +145,13 @@
* at this point so that it occurs BEFORE href/id processing.
* @param namespace is the namespace of the element
* @param localName is the name of the element
- * @param qName is the prefixed qName of the element
+ * @param prefix is the prefix of the element
* @param attributes are the attributes on the element...used to get the
* type
* @param context is the DeserializationContext
*/
public void startElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException
{
@@ -169,7 +169,7 @@
}
// Invoke super.startElement to do the href/id processing.
super.startElement(namespace, localName,
- qName, attributes, context);
+ prefix, attributes, context);
}
/**
@@ -328,13 +328,13 @@
* nil.)
* @param namespace is the namespace of the element
* @param localName is the name of the element
- * @param qName is the prefixed qName of the element
+ * @param prefix is the prefix of the element
* @param attributes are the attributes on the element...used to get the
* type
* @param context is the DeserializationContext
*/
public void onStartElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException {
@@ -394,7 +394,7 @@
// Success! Create an object from the string and set
// it in the bean
try {
- dSer.onStartElement(namespace, localName, qName,
+ dSer.onStartElement(namespace, localName, prefix,
attributes, context);
Object val = ((SimpleDeserializer)dSer).
makeValue(attributes.getValue(i));
1.13 +2 -3 xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerDeserializer.java
Index: JAFDataHandlerDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerDeserializer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JAFDataHandlerDeserializer.java 3 Jul 2002 17:50:22 -0000 1.12
+++ JAFDataHandlerDeserializer.java 3 Aug 2002 21:25:25 -0000 1.13
@@ -55,7 +55,6 @@
package org.apache.axis.encoding.ser;
-import org.apache.axis.AxisProperties;
import org.apache.axis.attachments.AttachmentUtils;
import org.apache.axis.encoding.DeserializationContext;
import org.apache.axis.encoding.DeserializerImpl;
@@ -80,13 +79,13 @@
LogFactory.getLog(JAFDataHandlerDeserializer.class.getName());
public void startElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException {
if (!context.isDoneParsing()) {
if (myElement == null) {
- myElement = makeNewElement(namespace, localName, qName, attributes, context);
+ myElement = makeNewElement(namespace, localName, prefix, attributes, context);
context.pushNewElement(myElement);
}
}
1.17 +2 -3 xml-axis/java/src/org/apache/axis/encoding/ser/MapDeserializer.java
Index: MapDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/MapDeserializer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MapDeserializer.java 3 Jul 2002 17:50:22 -0000 1.16
+++ MapDeserializer.java 3 Aug 2002 21:25:25 -0000 1.17
@@ -55,7 +55,6 @@
package org.apache.axis.encoding.ser;
-import org.apache.axis.AxisProperties;
import org.apache.axis.Constants;
import org.apache.axis.encoding.DeserializationContext;
import org.apache.axis.encoding.Deserializer;
@@ -101,12 +100,12 @@
* Simply creates map.
* @param namespace is the namespace of the element
* @param localName is the name of the element
- * @param qName is the prefixed qname of the element
+ * @param prefix is the prefix of the element
* @param attributes are the attributes on the element...used to get the type
* @param context is the DeserializationContext
*/
public void onStartElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException {
if (log.isDebugEnabled()) {
1.3 +1 -3 xml-axis/java/src/org/apache/axis/encoding/ser/QNameDeserializer.java
Index: QNameDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/QNameDeserializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- QNameDeserializer.java 11 Jun 2002 14:53:56 -0000 1.2
+++ QNameDeserializer.java 3 Aug 2002 21:25:25 -0000 1.3
@@ -57,8 +57,6 @@
import org.apache.axis.encoding.DeserializationContext;
-import org.apache.axis.utils.JavaUtils;
-
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -96,7 +94,7 @@
} // makeValue
public void onStartElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException
{
1.21 +2 -2 xml-axis/java/src/org/apache/axis/encoding/ser/SimpleDeserializer.java
Index: SimpleDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/SimpleDeserializer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SimpleDeserializer.java 8 Jul 2002 14:37:44 -0000 1.20
+++ SimpleDeserializer.java 3 Aug 2002 21:25:25 -0000 1.21
@@ -259,12 +259,12 @@
* deserialization (i.e. the element is not an href and the value is not nil.)
* @param namespace is the namespace of the element
* @param localName is the name of the element
- * @param qName is the prefixed qName of the element
+ * @param prefix is the prefix of the element
* @param attributes are the attributes on the element...used to get the type
* @param context is the DeserializationContext
*/
public void onStartElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException
{
1.16 +2 -3 xml-axis/java/src/org/apache/axis/encoding/ser/VectorDeserializer.java
Index: VectorDeserializer.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/VectorDeserializer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- VectorDeserializer.java 3 Jul 2002 17:50:22 -0000 1.15
+++ VectorDeserializer.java 3 Aug 2002 21:25:25 -0000 1.16
@@ -55,7 +55,6 @@
package org.apache.axis.encoding.ser;
-import org.apache.axis.AxisProperties;
import org.apache.axis.Constants;
import org.apache.axis.encoding.DeserializationContext;
import org.apache.axis.encoding.Deserializer;
@@ -94,12 +93,12 @@
* Simply creates
* @param namespace is the namespace of the element
* @param localName is the name of the element
- * @param qName is the prefixed qname of the element
+ * @param prefix is the prefix of the element
* @param attributes are the attributes on the element...used to get the type
* @param context is the DeserializationContext
*/
public void onStartElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException {
if (log.isDebugEnabled()) {
1.46 +8 -8 xml-axis/java/src/org/apache/axis/message/BodyBuilder.java
Index: BodyBuilder.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/BodyBuilder.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- BodyBuilder.java 1 Aug 2002 22:13:08 -0000 1.45
+++ BodyBuilder.java 3 Aug 2002 21:25:25 -0000 1.46
@@ -92,22 +92,22 @@
}
public void startElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException
{
- super.startElement(namespace, localName, qName, attributes, context);
+ super.startElement(namespace, localName, prefix, attributes, context);
if (!context.isDoneParsing()) {
envelope.setBody((SOAPBody)myElement);
}
}
public MessageElement makeNewElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context) {
return new SOAPBody(namespace,
localName,
- qName,
+ prefix,
attributes,
context,
context.getMessageContext().getSOAPConstants());
@@ -165,19 +165,19 @@
} else if (!gotRPCElement) {
if (isRoot && (style != Style.MESSAGE)) {
gotRPCElement = true;
-
+
try {
-
+
element = new RPCElement(namespace, localName, prefix,
attributes, context, operations);
-
+
} catch (org.apache.axis.AxisFault e) {
// SAXException is already known to this method, so I
// don't have an exception-handling propogation explosion.
//
throw new SAXException(e);
}
-
+
// Only deserialize this way if there is a unique operation
// for this QName. If there are overloads,
// we'll need to start recording. If we're making a high-
1.24 +1 -6 xml-axis/java/src/org/apache/axis/message/EnvelopeBuilder.java
Index: EnvelopeBuilder.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/EnvelopeBuilder.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- EnvelopeBuilder.java 11 Jun 2002 14:53:58 -0000 1.23
+++ EnvelopeBuilder.java 3 Aug 2002 21:25:25 -0000 1.24
@@ -98,7 +98,7 @@
}
public void startElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException
{
@@ -120,11 +120,6 @@
// Indicate what version of SOAP we're using to anyone else involved
// in processing this message.
context.getMessageContext().setSOAPConstants(soapConstants);
-
- String prefix = "";
- int idx = qName.indexOf(":");
- if (idx > 0)
- prefix = qName.substring(0, idx);
envelope.setPrefix(prefix);
envelope.setNamespaceURI(namespace);
1.19 +2 -2 xml-axis/java/src/org/apache/axis/message/HeaderBuilder.java
Index: HeaderBuilder.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/HeaderBuilder.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- HeaderBuilder.java 10 Jul 2002 19:32:13 -0000 1.18
+++ HeaderBuilder.java 3 Aug 2002 21:25:25 -0000 1.19
@@ -82,13 +82,13 @@
}
public void startElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException
{
if (!context.isDoneParsing()) {
if (myElement == null) {
- myElement = new SOAPHeader(namespace, localName, qName,
+ myElement = new SOAPHeader(namespace, localName, prefix,
attributes, context,
envelope.getSOAPConstants());
envelope.setHeader((SOAPHeader)myElement);
1.119 +4 -6 xml-axis/java/src/org/apache/axis/message/MessageElement.java
Index: MessageElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/MessageElement.java,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- MessageElement.java 23 Jul 2002 10:01:42 -0000 1.118
+++ MessageElement.java 3 Aug 2002 21:25:25 -0000 1.119
@@ -190,21 +190,19 @@
name = text.getLocalName();
}
- public MessageElement(String namespace, String localPart, String qName,
+ public MessageElement(String namespace, String localPart, String prefix,
Attributes attributes, DeserializationContext context)
{
if (log.isDebugEnabled()) {
- log.debug(JavaUtils.getMessage("newElem00", super.toString(), "" + qName));
+ log.debug(JavaUtils.getMessage("newElem00", super.toString(),
+ "{" + prefix + "}" + localPart));
for (int i = 0; attributes != null && i < attributes.getLength(); i++) {
log.debug(" " + attributes.getQName(i) + " = '" + attributes.getValue(i) + "'");
}
}
this.namespaceURI = namespace;
this.name = localPart;
-
- int idx = qName.indexOf(":");
- if (idx > 0)
- this.prefix = qName.substring(0, idx);
+ this.prefix = prefix;
this.context = context;
this.startEventIndex = context.getStartOfMappingsPos();
1.55 +6 -5 xml-axis/java/src/org/apache/axis/message/RPCHandler.java
Index: RPCHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCHandler.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- RPCHandler.java 20 Jul 2002 00:30:20 -0000 1.54
+++ RPCHandler.java 3 Aug 2002 21:25:25 -0000 1.55
@@ -122,16 +122,16 @@
* (this allows re-use of RPCHandlers)
* @param namespace is the namespace of the element
* @param localName is the name of the element
- * @param qName is the prefixed qName of the element
+ * @param prefix is the prefix of the element
* @param attributes are the attributes on the element...used to get the type
* @param context is the DeserializationContext
*/
public void startElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException
{
- super.startElement(namespace, localName, qName, attributes, context);
+ super.startElement(namespace, localName, prefix, attributes, context);
currentParam = null;
}
@@ -156,8 +156,9 @@
}
if (!context.isDoneParsing()) {
- context.pushNewElement(new MessageElement(namespace,
- localName, prefix+":"+localName,attributes,context));
+ context.pushNewElement(new MessageElement(namespace, localName,
+ prefix, attributes,
+ context));
}
MessageElement curEl = context.getCurElement();
1.27 +2 -2 xml-axis/java/src/org/apache/axis/message/SOAPBody.java
Index: SOAPBody.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPBody.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- SOAPBody.java 3 Jul 2002 17:50:28 -0000 1.26
+++ SOAPBody.java 3 Aug 2002 21:25:25 -0000 1.27
@@ -99,10 +99,10 @@
}
}
- public SOAPBody(String namespace, String localPart, String qName,
+ public SOAPBody(String namespace, String localPart, String prefix,
Attributes attributes, DeserializationContext context,
SOAPConstants soapConsts) {
- super(namespace, localPart, qName, attributes, context);
+ super(namespace, localPart, prefix, attributes, context);
soapConstants = soapConsts;
}
1.9 +5 -4 xml-axis/java/src/org/apache/axis/message/SOAPHandler.java
Index: SOAPHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SOAPHandler.java 21 Jun 2002 20:50:16 -0000 1.8
+++ SOAPHandler.java 3 Aug 2002 21:25:25 -0000 1.9
@@ -69,25 +69,26 @@
public MessageElement myElement = null;
public void startElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
throws SAXException
{
// By default, make a new element
if (!context.isDoneParsing()) {
if (myElement == null) {
- myElement = makeNewElement(namespace, localName, qName, attributes, context);
+ myElement = makeNewElement(namespace, localName, prefix,
+ attributes, context);
}
context.pushNewElement(myElement);
}
}
public MessageElement makeNewElement(String namespace, String localName,
- String qName, Attributes attributes,
+ String prefix, Attributes attributes,
DeserializationContext context)
{
return new MessageElement(namespace, localName,
- qName, attributes, context);
+ prefix, attributes, context);
}
public void endElement(String namespace, String localName,
1.52 +2 -2 xml-axis/java/src/org/apache/axis/message/SOAPHeader.java
Index: SOAPHeader.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeader.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- SOAPHeader.java 10 Jul 2002 19:32:13 -0000 1.51
+++ SOAPHeader.java 3 Aug 2002 21:25:25 -0000 1.52
@@ -104,10 +104,10 @@
}
}
- public SOAPHeader(String namespace, String localPart, String qName,
+ public SOAPHeader(String namespace, String localPart, String prefix,
Attributes attributes, DeserializationContext context,
SOAPConstants soapConsts) {
- super(namespace, localPart, qName, attributes, context);
+ super(namespace, localPart, prefix, attributes, context);
soapConstants = soapConsts;
}
1.3 +2 -2 xml-axis/java/test/message/TestMessageElement.java
Index: TestMessageElement.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/message/TestMessageElement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestMessageElement.java 8 Apr 2002 14:19:44 -0000 1.2
+++ TestMessageElement.java 3 Aug 2002 21:25:25 -0000 1.3
@@ -97,7 +97,7 @@
eb);
SOAPElement parent = new MessageElement("parent.names",
"parent",
- "parns:parent",
+ "parns",
null,
dc);
Name c1 = new PrefixedQName("child1.names", "child1" ,"c1ns");
@@ -130,7 +130,7 @@
eb);
SOAPElement parent = new MessageElement("parent.names",
"parent",
- "parns:parent",
+ "parns",
null,
dc);
SOAPElement child1 = parent.addChildElement("child1");