Author: ruchithf
Date: Sat Sep 30 05:12:11 2006
New Revision: 451587
URL: http://svn.apache.org/viewvc?view=rev&rev=451587
Log:
ElementHelper - Aviod adding child elements that are already added
Fix for WSCOMMONS-103
NOTE: The latest Axis2 build passes with these changes
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/SOAP11BuilderHelper.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderBlockImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderBlockImpl.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/SOAP11BuilderHelper.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/SOAP11BuilderHelper.java?view=diff&rev=451587&r1=451586&r2=451587
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/SOAP11BuilderHelper.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/SOAP11BuilderHelper.java
Sat Sep 30 05:12:11 2006
@@ -148,8 +148,7 @@
int token = parser.next();
while (token != XMLStreamReader.END_ELEMENT) {
if (token == XMLStreamReader.CHARACTERS) {
- OMText text = factory.createOMText(value,
parser.getText());
- value.addChild(text);
+ factory.createOMText(value, parser.getText());
} else {
throw new SOAPProcessingException(
"Only Characters are allowed here");
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java?view=diff&rev=451587&r1=451586&r2=451587
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
Sat Sep 30 05:12:11 2006
@@ -24,6 +24,7 @@
import org.apache.axiom.om.impl.dom.ElementImpl;
import org.apache.axiom.om.impl.dom.NamespaceImpl;
import org.apache.axiom.om.impl.dom.ParentNode;
+import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
@@ -48,6 +49,12 @@
this.setNamespace(ns);
}
+ public SOAPHeaderBlockImpl(String localName, OMNamespace ns,
+ SOAPFactory factory) throws SOAPProcessingException {
+ super(((OMDOMFactory)factory).getDocument(), localName,(NamespaceImpl)
ns, factory);
+ this.setNamespace(ns);
+ }
+
/**
* Constructor SOAPHeaderBlockImpl.
*
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java?view=diff&rev=451587&r1=451586&r2=451587
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java
Sat Sep 30 05:12:11 2006
@@ -69,6 +69,11 @@
return new SOAP11HeaderImpl(envelope, builder, this);
}
+
+ public SOAPHeaderBlock createSOAPHeaderBlock(String localName, OMNamespace
ns) throws SOAPProcessingException {
+ return new SOAP11HeaderBlockImpl(localName, ns, this);
+ }
+
public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
OMNamespace ns, SOAPHeader parent) throws SOAPProcessingException {
return new SOAP11HeaderBlockImpl(localName, ns, parent, this);
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderBlockImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderBlockImpl.java?view=diff&rev=451587&r1=451586&r2=451587
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderBlockImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11HeaderBlockImpl.java
Sat Sep 30 05:12:11 2006
@@ -39,6 +39,10 @@
checkParent(parent);
}
+ public SOAP11HeaderBlockImpl(String localName, OMNamespace ns, SOAPFactory
factory) {
+ super(localName, ns, factory);
+ }
+
/**
* Constructor SOAPHeaderBlockImpl
*
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java?view=diff&rev=451587&r1=451586&r2=451587
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java
Sat Sep 30 05:12:11 2006
@@ -37,6 +37,7 @@
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.dom.SOAPEnvelopeImpl;
import org.apache.axiom.soap.impl.dom.factory.DOMSOAPFactory;
+import org.apache.axiom.soap.impl.dom.soap11.SOAP11HeaderBlockImpl;
public class SOAP12Factory extends DOMSOAPFactory {
@@ -65,6 +66,10 @@
public SOAPHeader createSOAPHeader(SOAPEnvelope envelope,
OMXMLParserWrapper builder) {
return new SOAP12HeaderImpl(envelope, builder, this);
+ }
+
+ public SOAPHeaderBlock createSOAPHeaderBlock(String localName, OMNamespace
ns) throws SOAPProcessingException {
+ return new SOAP12HeaderBlockImpl(localName, ns, this);
}
public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderBlockImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderBlockImpl.java?view=diff&rev=451587&r1=451586&r2=451587
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderBlockImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12HeaderBlockImpl.java
Sat Sep 30 05:12:11 2006
@@ -38,6 +38,10 @@
super(localName, ns, parent, factory);
checkParent(parent);
}
+
+ public SOAP12HeaderBlockImpl(String localName, OMNamespace ns, SOAPFactory
factory) {
+ super(localName, ns, factory);
+ }
/**
* Constructor SOAPHeaderBlockImpl
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
