You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/04/18 09:38:52 UTC
svn commit: r1094325 - in /geronimo/bundles/trunk/axiom-all: ./
src/main/java/ src/main/java/org/ src/main/java/org/apache/
src/main/java/org/apache/axiom/ src/main/java/org/apache/axiom/soap/
src/main/java/org/apache/axiom/soap/impl/ src/main/java/org...
Author: xuhaihong
Date: Mon Apr 18 07:38:51 2011
New Revision: 1094325
URL: http://svn.apache.org/viewvc?rev=1094325&view=rev
Log:
GERONIMO-5913 Use a patched axiom-all for TCK testing, so that we could see those real issues.
Added:
geronimo/bundles/trunk/axiom-all/src/main/java/
geronimo/bundles/trunk/axiom-all/src/main/java/org/
geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/
geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/axiom/
geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/axiom/soap/
geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/axiom/soap/impl/
geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/axiom/soap/impl/llom/
geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java (with props)
Modified:
geronimo/bundles/trunk/axiom-all/pom.xml
Modified: geronimo/bundles/trunk/axiom-all/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axiom-all/pom.xml?rev=1094325&r1=1094324&r2=1094325&view=diff
==============================================================================
--- geronimo/bundles/trunk/axiom-all/pom.xml (original)
+++ geronimo/bundles/trunk/axiom-all/pom.xml Mon Apr 18 07:38:51 2011
@@ -156,6 +156,11 @@
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
<version>1.0.1</version>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>1.5.3</version>
+ </dependency>
</dependencies>
<build>
@@ -169,6 +174,10 @@
<Export-Package>org.apache.axiom*;version="${pkgVersion}";-split-package:=merge-first</Export-Package>
<Import-Package>org.jaxen*;resolution:=optional,*</Import-Package>
<!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+ <Include-Resource>
+ {maven-resources},
+ org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.class=target/classes/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.class
+ </Include-Resource>
</instructions>
</configuration>
</plugin>
Added: geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?rev=1094325&view=auto
==============================================================================
--- geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java (added)
+++ geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java Mon Apr 18 07:38:51 2011
@@ -0,0 +1,355 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.axiom.soap.impl.llom;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.axiom.om.OMConstants;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
+import org.apache.axiom.om.impl.llom.OMNodeImpl;
+import org.apache.axiom.om.impl.util.OMSerializerUtil;
+import org.apache.axiom.om.impl.builder.StAXBuilder;
+import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAP12Version;
+import org.apache.axiom.soap.SOAPBody;
+import org.apache.axiom.soap.SOAPConstants;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axiom.soap.SOAPProcessingException;
+import org.apache.axiom.soap.SOAPVersion;
+import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+/** Class SOAPEnvelopeImpl */
+public class SOAPEnvelopeImpl extends SOAPElement
+ implements SOAPEnvelope, OMConstants {
+ private static Log log = LogFactory.getLog(SOAPEnvelopeImpl.class);
+ private static final boolean isDebugEnabled = log.isDebugEnabled();
+
+ /**
+ * Constructor
+ * @param builder the OMXMLParserWrapper building this envelope
+ * @param factory the SOAPFactory building this envelope
+ */
+ public SOAPEnvelopeImpl(OMXMLParserWrapper builder, SOAPFactory factory) {
+ super(null, SOAPConstants.SOAPENVELOPE_LOCAL_NAME, builder, factory);
+ }
+
+ /**
+ * Constructor
+ * @param ns OMNamespace for this envelope
+ * @param factory SOAPFactory associated with this envelope
+ */
+ public SOAPEnvelopeImpl(OMNamespace ns, SOAPFactory factory) {
+ super(SOAPConstants.SOAPENVELOPE_LOCAL_NAME, ns, factory);
+ }
+
+ public SOAPVersion getVersion() {
+ return ((SOAPFactory)factory).getSOAPVersion();
+ }
+
+ /**
+ * Returns the <CODE>SOAPHeader</CODE> object for this <CODE> SOAPEnvelope</CODE> object. <P>
+ * This SOAPHeader will just be a container for all the headers in the <CODE>OMMessage</CODE>
+ * </P>
+ *
+ * @return the <CODE>SOAPHeader</CODE> object or <CODE> null</CODE> if there is none
+ * @throws OMException if there is a problem obtaining the <CODE>SOAPHeader</CODE> object
+ */
+ public SOAPHeader getHeader() throws OMException {
+ // The soap header is the first element in the envelope.
+ OMElement e = getFirstElement();
+ if (e instanceof SOAPHeader) {
+ return (SOAPHeader)e;
+ }
+
+ return null;
+ }
+
+ /**
+ * Check that a node is allowed as a child of a SOAP envelope.
+ *
+ * @param child
+ */
+ private void checkChild(OMNode child) {
+ if ((child instanceof OMElement)
+ && !(child instanceof SOAPHeader || child instanceof SOAPBody)) {
+ throw new SOAPProcessingException(
+ "SOAP Envelope can not have children other than SOAP Header and Body",
+ SOAP12Constants.FAULT_CODE_SENDER);
+ }
+ }
+
+ /**
+ * Add a SOAPHeader or SOAPBody object
+ * @param child an OMNode to add - must be either a SOAPHeader or a SOAPBody
+ */
+ public void addChild(OMNode child) {
+ // SOAP 1.1 allows for arbitrary elements after SOAPBody so do NOT check for
+ // node types when appending to SOAP 1.1 envelope.
+ if (getVersion() instanceof SOAP12Version) {
+ checkChild(child);
+ }
+
+ if (child instanceof SOAPHeader) {
+ // The SOAPHeader is added before the SOAPBody
+ // We must be sensitive to the state of the parser. It is possible that the
+ // has not been processed yet.
+ if (this.done) {
+ // Parsing is complete, therefore it is safe to
+ // call getBody.
+ SOAPBody body = getBody();
+ if (body != null) {
+ body.insertSiblingBefore(child);
+ return;
+ }
+ } else {
+ // Flow to here indicates that we are still expanding the
+ // envelope. The body or body contents may not be
+ // parsed yet. We can't use getBody() yet...it will
+ // cause a failure. So instead, carefully find the
+ // body and insert the header. If the body is not found,
+ // this indicates that it has not been parsed yet...and
+ // the code will fall through to the super.addChild.
+ OMNode node = this.lastChild;
+ while (node != null) {
+ if (node instanceof SOAPBody) {
+ node.insertSiblingBefore(child);
+ return;
+ }
+ node = node.getPreviousOMSibling();
+ }
+ }
+ }
+ super.addChild(child);
+ }
+
+ /**
+ * Returns the <CODE>SOAPBody</CODE> object associated with this <CODE>SOAPEnvelope</CODE>
+ * object. <P> This SOAPBody will just be a container for all the BodyElements in the
+ * <CODE>OMMessage</CODE> </P>
+ *
+ * @return the <CODE>SOAPBody</CODE> object for this <CODE> SOAPEnvelope</CODE> object or
+ * <CODE>null</CODE> if there is none
+ * @throws OMException if there is a problem obtaining the <CODE>SOAPBody</CODE> object
+ */
+ public SOAPBody getBody() throws OMException {
+ //check for the first element
+ OMElement element = getFirstElement();
+ if (element != null) {
+ if (SOAPConstants.BODY_LOCAL_NAME.equals(element.getLocalName())) {
+ return (SOAPBody) element;
+ } else { // if not second element SHOULD be the body
+ OMNode node = element.getNextOMSibling();
+ while (node != null && node.getType() != OMNode.ELEMENT_NODE) {
+ node = node.getNextOMSibling();
+ }
+ if (node == null) {
+ // The envelope only contains a header
+ return null;
+ } else if (SOAPConstants.BODY_LOCAL_NAME.equals(((OMElement)node).getLocalName())) {
+ return (SOAPBody)node;
+ } else {
+ throw new OMException("SOAPEnvelope must contain a body element " +
+ "which is either first or second child element of the SOAPEnvelope.");
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Method detach
+ *
+ * @throws OMException
+ */
+ public OMNode detach() throws OMException {
+// throw new OMException("Root Element can not be detached");
+ // I'm confused why this threw an exception as above. One should be able to create
+ // a SOAP envelope and be able to detach from the its parent document.
+ // The example is if I want to send a SOAPEnvelope inside another SOAP message, then this will
+ // not allow to do that.
+ // Must be an idea of a DOM guy ;)
+ return this;
+ }
+
+ protected void checkParent(OMElement parent) throws SOAPProcessingException {
+ // here do nothing as SOAPEnvelope doesn't have a parent !!!
+ }
+
+ public void internalSerialize(XMLStreamWriter writer2, boolean cache)
+ throws XMLStreamException {
+ MTOMXMLStreamWriter writer = (MTOMXMLStreamWriter) writer2;
+ if (!writer.isIgnoreXMLDeclaration()) {
+ String charSetEncoding = writer.getCharSetEncoding();
+ String xmlVersion = writer.getXmlVersion();
+ writer.getXmlStreamWriter().writeStartDocument(
+ charSetEncoding == null ? OMConstants.DEFAULT_CHAR_SET_ENCODING
+ : charSetEncoding,
+ xmlVersion == null ? OMConstants.DEFAULT_XML_VERSION : xmlVersion);
+ }
+ if (cache) {
+ //in this case we don't care whether the elements are built or not
+ //we just call the serializeAndConsume methods
+ OMSerializerUtil.serializeStartpart(this, writer);
+ //serialize children
+ OMElement header = getHeader();
+ if(header == null) {
+ header = ((SOAPFactory)factory).createSOAPHeader(this);
+ }
+ //if ((header != null) && (header.getFirstOMChild() != null)) {
+ ((SOAPHeaderImpl) header).internalSerialize(writer, true);
+ //}
+ SOAPBody body = getBody();
+ //REVIEW: getBody has statements to return null..Can it be null in any case?
+ if (body != null) {
+ ((SOAPBodyImpl) body).internalSerialize(writer, true);
+ }
+ OMSerializerUtil.serializeEndpart(writer);
+
+ } else {
+ //Now the caching is supposed to be off. However caching been switched off
+ //has nothing to do if the element is already built!
+ if (this.done || (this.builder == null)) {
+ OMSerializerUtil.serializeStartpart(this, writer);
+ OMElement header = getHeader();
+ if(header == null) {
+ header = ((SOAPFactory)factory).createSOAPHeader(this);
+ }
+ //if ((header != null) && (header.getFirstOMChild() != null)) {
+ serializeInternally((OMNodeImpl) header, writer);
+ //}
+ SOAPBody body = getBody();
+ if (body != null) {
+ serializeInternally((OMNodeImpl) body, writer);
+ }
+ OMSerializerUtil.serializeEndpart(writer);
+ } else {
+ OMSerializerUtil.serializeByPullStream(this, writer, cache);
+ }
+ // let's try to close the builder/parser here since we are now done with the
+ // non-caching code block serializing the top-level SOAPEnvelope element
+ // TODO: should use 'instance of OMXMLParserWrapper' instead? StAXBuilder is more generic
+ if ((builder != null) && (builder instanceof StAXBuilder)) {
+ try {
+ if (isDebugEnabled) {
+ log.debug("closing builder: " + builder);
+ }
+ StAXBuilder staxBuilder = (StAXBuilder) builder;
+ staxBuilder.close();
+ } catch (Exception e) {
+ if (isDebugEnabled) {
+ log.error("Could not close builder or parser due to: ", e);
+ }
+ }
+ } else {
+ if (isDebugEnabled) {
+ log.debug("Could not close builder or parser due to:");
+ if (builder == null) {
+ log.debug("builder is null");
+ }
+ if ((builder != null) && !(builder instanceof StAXBuilder)) {
+ log.debug("builder is not instance of " + StAXBuilder.class.getName());
+ }
+ }
+ }
+ }
+ }
+
+ private void serializeInternally(OMNodeImpl child, MTOMXMLStreamWriter writer)
+ throws XMLStreamException {
+ if ((!(child instanceof OMElement)) || child.isComplete() || child.builder == null) {
+ child.internalSerialize(writer, false);
+ } else {
+ OMElement element = (OMElement) child;
+ element.getBuilder().setCache(false);
+ OMSerializerUtil.serializeByPullStream(element, writer, false);
+ }
+ child.getNextOMSibling();
+ }
+
+ public boolean hasFault() {
+ QName payloadQName = this.getPayloadQName_Optimized();
+ if (payloadQName != null) {
+ if (SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(payloadQName.getLocalPart())) {
+ String ns = payloadQName.getNamespaceURI();
+ return (ns != null &&
+ (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns) ||
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(ns)));
+ }
+ }
+
+ // Fallback: Get the body and get the fault information from the body
+ SOAPBody body = this.getBody();
+ return (body == null) ? false : body.hasFault();
+ }
+
+ public String getSOAPBodyFirstElementLocalName() {
+ QName payloadQName = this.getPayloadQName_Optimized();
+ if (payloadQName != null) {
+ return payloadQName.getLocalPart();
+ }
+ SOAPBody body = this.getBody();
+ return (body == null) ? null : body.getFirstElementLocalName();
+ }
+
+ public OMNamespace getSOAPBodyFirstElementNS() {
+ QName payloadQName = this.getPayloadQName_Optimized();
+ if (payloadQName != null) {
+ return this.factory.createOMNamespace(payloadQName.getNamespaceURI(),
+ payloadQName.getPrefix());
+ }
+ SOAPBody body = this.getBody();
+ return (body == null) ? null : body.getFirstElementNS();
+ }
+
+ /**
+ * Use a parser property to fetch the first element in the body.
+ * Returns null if this optimized property is not set or not available.
+ * @return The qname of the first element in the body or null
+ */
+ private QName getPayloadQName_Optimized() {
+ // The parser may expose a SOAPBODY_FIRST_CHILD_ELEMENT_QNAME property
+ // Use that QName to determine if there is a fault
+ OMXMLParserWrapper builder = this.getBuilder();
+ if (builder instanceof StAXSOAPModelBuilder) {
+ try {
+ QName payloadQName = (QName) ((StAXSOAPModelBuilder) builder).
+ getReaderProperty(SOAPConstants.SOAPBODY_FIRST_CHILD_ELEMENT_QNAME);
+ return payloadQName;
+ } catch (Throwable e) {
+ // The parser may not support this property.
+ // In such cases, processing continues below in the fallback approach
+ }
+
+ }
+ return null;
+ }
+}
Propchange: geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/bundles/trunk/axiom-all/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain