You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by gd...@apache.org on 2007/03/07 15:59:13 UTC
svn commit: r515594 [5/19] - in
/webservices/commons/trunk/modules/axiom/modules:
axiom-api/src/main/java/org/apache/axiom/attachments/
axiom-api/src/main/java/org/apache/axiom/attachments/utils/
axiom-api/src/main/java/org/apache/axiom/om/ axiom-api/s...
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/xpath/DocumentNavigator.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/xpath/DocumentNavigator.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/xpath/DocumentNavigator.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/xpath/DocumentNavigator.java Wed Mar 7 06:59:00 2007
@@ -1,10 +1,24 @@
package org.apache.axiom.om.xpath;
-import org.apache.axiom.om.*;
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMComment;
+import org.apache.axiom.om.OMContainer;
+import org.apache.axiom.om.OMDocument;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMProcessingInstruction;
+import org.apache.axiom.om.OMText;
import org.apache.axiom.om.impl.OMNamespaceImpl;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.util.StAXUtils;
-import org.jaxen.*;
+import org.jaxen.BaseXPath;
+import org.jaxen.DefaultNavigator;
+import org.jaxen.FunctionCallException;
+import org.jaxen.JaxenConstants;
+import org.jaxen.UnsupportedAxisException;
+import org.jaxen.XPath;
import org.jaxen.saxpath.SAXPathException;
import org.jaxen.util.SingleObjectIterator;
@@ -23,13 +37,12 @@
private static final long serialVersionUID = 7325116153349780805L;
/**
- * Returns a parsed form of the given xpath string, which will be suitable
- * for queries on documents that use the same navigator as this one.
+ * Returns a parsed form of the given xpath string, which will be suitable for queries on
+ * documents that use the same navigator as this one.
*
* @param xpath the XPath expression
* @return Returns a new XPath expression object.
- * @throws SAXPathException if the string is not a syntactically
- * correct XPath expression
+ * @throws SAXPathException if the string is not a syntactically correct XPath expression
* @see XPath
*/
public XPath parseXPath(String xpath) throws SAXPathException {
@@ -115,12 +128,12 @@
}
/**
- * Returns whether the given object is a document node. A document node
- * is the node that is selected by the xpath expression <code>/</code>.
+ * Returns whether the given object is a document node. A document node is the node that is
+ * selected by the xpath expression <code>/</code>.
*
* @param object the object to test
- * @return Returns <code>true</code> if the object is a document node,
- * else <code>false</code> .
+ * @return Returns <code>true</code> if the object is a document node, else <code>false</code>
+ * .
*/
public boolean isDocument(Object object) {
return object instanceof OMDocument;
@@ -130,8 +143,8 @@
* Returns whether the given object is an element node.
*
* @param object the object to test
- * @return Returns <code>true</code> if the object is an element node,
- * else <code>false</code> .
+ * @return Returns <code>true</code> if the object is an element node, else <code>false</code>
+ * .
*/
public boolean isElement(Object object) {
return object instanceof OMElement;
@@ -141,8 +154,8 @@
* Returns whether the given object is an attribute node.
*
* @param object the object to test
- * @return Returns <code>true</code> if the object is an attribute node,
- * else <code>false</code> .
+ * @return Returns <code>true</code> if the object is an attribute node, else <code>false</code>
+ * .
*/
public boolean isAttribute(Object object) {
return object instanceof OMAttribute;
@@ -152,8 +165,8 @@
* Returns whether the given object is a namespace node.
*
* @param object the object to test
- * @return Returns <code>true</code> if the object is a namespace node,
- * else <code>false</code> .
+ * @return Returns <code>true</code> if the object is a namespace node, else <code>false</code>
+ * .
*/
public boolean isNamespace(Object object) {
return object instanceof OMNamespace;
@@ -163,8 +176,7 @@
* Returns whether the given object is a comment node.
*
* @param object the object to test
- * @return Returns <code>true</code> if the object is a comment node,
- * else <code>false</code> .
+ * @return Returns <code>true</code> if the object is a comment node, else <code>false</code> .
*/
public boolean isComment(Object object) {
return (object instanceof OMComment);
@@ -174,8 +186,7 @@
* Returns whether the given object is a text node.
*
* @param object the object to test
- * @return Returns <code>true</code> if the object is a text node,
- * else <code>false</code> .
+ * @return Returns <code>true</code> if the object is a text node, else <code>false</code> .
*/
public boolean isText(Object object) {
return (object instanceof OMText);
@@ -185,17 +196,16 @@
* Returns whether the given object is a processing-instruction node.
*
* @param object the object to test
- * @return Returns <code>true</code> if the object is a processing-instruction node,
- * else <code>false</code> .
+ * @return Returns <code>true</code> if the object is a processing-instruction node, else
+ * <code>false</code> .
*/
public boolean isProcessingInstruction(Object object) {
return (object instanceof OMProcessingInstruction);
}
/**
- * Retrieves the string-value of a comment node.
- * This may be the empty string if the comment is empty,
- * but must not be null.
+ * Retrieves the string-value of a comment node. This may be the empty string if the comment is
+ * empty, but must not be null.
*
* @param object the comment node
* @return Returns the string-value of the node.
@@ -205,9 +215,8 @@
}
/**
- * Retrieves the string-value of an element node.
- * This may be the empty string if the element is empty,
- * but must not be null.
+ * Retrieves the string-value of an element node. This may be the empty string if the element is
+ * empty, but must not be null.
*
* @param object the comment node.
* @return Returns the string-value of the node.
@@ -233,9 +242,8 @@
}
/**
- * Retrieves the string-value of an attribute node.
- * This should be the XML 1.0 normalized attribute value.
- * This may be the empty string but must not be null.
+ * Retrieves the string-value of an attribute node. This should be the XML 1.0 normalized
+ * attribute value. This may be the empty string but must not be null.
*
* @param object the attribute node
* @return Returns the string-value of the node.
@@ -245,9 +253,8 @@
}
/**
- * Retrieves the string-value of a namespace node.
- * This is generally the namespace URI.
- * This may be the empty string but must not be null.
+ * Retrieves the string-value of a namespace node. This is generally the namespace URI. This may
+ * be the empty string but must not be null.
*
* @param object the namespace node
* @return Returns the string-value of the node.
@@ -257,9 +264,8 @@
}
/**
- * Retrieve the string-value of a text node.
- * This must not be null and should not be the empty string.
- * The XPath data model does not allow empty text nodes.
+ * Retrieve the string-value of a text node. This must not be null and should not be the empty
+ * string. The XPath data model does not allow empty text nodes.
*
* @param object the text node
* @return Returns the string-value of the node.
@@ -279,13 +285,12 @@
}
/**
- * Retrieves an <code>Iterator</code> matching the <code>child</code>
- * XPath axis.
+ * Retrieves an <code>Iterator</code> matching the <code>child</code> XPath axis.
*
* @param contextNode the original context node
* @return Returns an Iterator capable of traversing the axis, not null.
- * @throws UnsupportedAxisException if the semantics of the child axis are
- * not supported by this object model
+ * @throws UnsupportedAxisException if the semantics of the child axis are not supported by this
+ * object model
*/
public Iterator getChildAxisIterator(Object contextNode) throws UnsupportedAxisException {
if (contextNode instanceof OMContainer) {
@@ -300,13 +305,12 @@
}
/**
- * Retrieves an <code>Iterator</code> matching the <code>attribute</code>
- * XPath axis.
+ * Retrieves an <code>Iterator</code> matching the <code>attribute</code> XPath axis.
*
* @param contextNode the original context node
* @return Returns an Iterator capable of traversing the axis, not null.
- * @throws UnsupportedAxisException if the semantics of the attribute axis are
- * not supported by this object model
+ * @throws UnsupportedAxisException if the semantics of the attribute axis are not supported by
+ * this object model
*/
public Iterator getAttributeAxisIterator(Object contextNode) throws UnsupportedAxisException {
if (isElement(contextNode)) {
@@ -314,8 +318,9 @@
Iterator i = ((OMElement) contextNode).getAllAttributes();
while (i != null && i.hasNext()) {
attributes.add(new OMAttributeEx((OMAttribute) i.next(),
- (OMContainer) contextNode, ((OMElement) contextNode)
- .getOMFactory()));
+ (OMContainer) contextNode,
+ ((OMElement) contextNode)
+ .getOMFactory()));
}
return attributes.iterator();
}
@@ -323,13 +328,12 @@
}
/**
- * Retrieves an <code>Iterator</code> matching the <code>namespace</code>
- * XPath axis.
+ * Retrieves an <code>Iterator</code> matching the <code>namespace</code> XPath axis.
*
* @param contextNode the original context node
* @return Returns an Iterator capable of traversing the axis, not null.
- * @throws UnsupportedAxisException if the semantics of the namespace axis are
- * not supported by this object model
+ * @throws UnsupportedAxisException if the semantics of the namespace axis are not supported by
+ * this object model
*/
public Iterator getNamespaceAxisIterator(Object contextNode) throws UnsupportedAxisException {
if (!(contextNode instanceof OMContainer &&
@@ -378,13 +382,12 @@
}
/**
- * Retrieves an <code>Iterator</code> matching the <code>self</code> xpath
- * axis.
+ * Retrieves an <code>Iterator</code> matching the <code>self</code> xpath axis.
*
* @param contextNode the original context node
* @return Returns an Iterator capable of traversing the axis, not null.
- * @throws UnsupportedAxisException if the semantics of the self axis are
- * not supported by this object model
+ * @throws UnsupportedAxisException if the semantics of the self axis are not supported by this
+ * object model
*/
public Iterator getSelfAxisIterator(Object contextNode) throws UnsupportedAxisException {
//TODO: Fix this better?
@@ -392,29 +395,29 @@
}
/**
- * Retrieves an <code>Iterator</code> matching the
- * <code>descendant-or-self</code> XPath axis.
+ * Retrieves an <code>Iterator</code> matching the <code>descendant-or-self</code> XPath axis.
*
* @param contextNode the original context node
* @return Returns an Iterator capable of traversing the axis, not null.
- * @throws UnsupportedAxisException if the semantics of the descendant-or-self axis are
- * not supported by this object model
+ * @throws UnsupportedAxisException if the semantics of the descendant-or-self axis are not
+ * supported by this object model
*/
- public Iterator getDescendantOrSelfAxisIterator(Object contextNode) throws UnsupportedAxisException {
+ public Iterator getDescendantOrSelfAxisIterator(Object contextNode)
+ throws UnsupportedAxisException {
//TODO: Fix this better?
return super.getDescendantOrSelfAxisIterator(contextNode);
}
/**
- * Retrieves an <code>Iterator</code> matching the
- * <code>ancestor-or-self</code> XPath axis.
+ * Retrieves an <code>Iterator</code> matching the <code>ancestor-or-self</code> XPath axis.
*
* @param contextNode the original context node
* @return Returns an Iterator capable of traversing the axis, not null.
- * @throws UnsupportedAxisException if the semantics of the ancestor-or-self axis are
- * not supported by this object model
+ * @throws UnsupportedAxisException if the semantics of the ancestor-or-self axis are not
+ * supported by this object model
*/
- public Iterator getAncestorOrSelfAxisIterator(Object contextNode) throws UnsupportedAxisException {
+ public Iterator getAncestorOrSelfAxisIterator(Object contextNode)
+ throws UnsupportedAxisException {
//TODO: Fix this better?
return super.getAncestorOrSelfAxisIterator(contextNode);
}
@@ -424,8 +427,8 @@
*
* @param contextNode the original context node
* @return Returns an Iterator capable of traversing the axis, not null.
- * @throws UnsupportedAxisException if the semantics of the parent axis are
- * not supported by this object model
+ * @throws UnsupportedAxisException if the semantics of the parent axis are not supported by
+ * this object model
*/
public Iterator getParentAxisIterator(Object contextNode) throws UnsupportedAxisException {
if (contextNode instanceof OMNode) {
@@ -441,13 +444,12 @@
}
/**
- * Retrieves an <code>Iterator</code> matching the <code>ancestor</code>
- * XPath axis.
+ * Retrieves an <code>Iterator</code> matching the <code>ancestor</code> XPath axis.
*
* @param contextNode the original context node
* @return Returns an Iterator capable of traversing the axis, not null.
- * @throws UnsupportedAxisException if the semantics of the ancestor axis are
- * not supported by this object model
+ * @throws UnsupportedAxisException if the semantics of the ancestor axis are not supported by
+ * this object model
*/
public Iterator getAncestorAxisIterator(Object contextNode) throws UnsupportedAxisException {
//TODO: Fix this better?
@@ -455,15 +457,15 @@
}
/**
- * Retrieves an <code>Iterator</code> matching the
- * <code>following-sibling</code> XPath axis.
+ * Retrieves an <code>Iterator</code> matching the <code>following-sibling</code> XPath axis.
*
* @param contextNode the original context node
* @return Returns an Iterator capable of traversing the axis, not null.
- * @throws UnsupportedAxisException if the semantics of the following-sibling axis are
- * not supported by this object model
+ * @throws UnsupportedAxisException if the semantics of the following-sibling axis are not
+ * supported by this object model
*/
- public Iterator getFollowingSiblingAxisIterator(Object contextNode) throws UnsupportedAxisException {
+ public Iterator getFollowingSiblingAxisIterator(Object contextNode)
+ throws UnsupportedAxisException {
ArrayList list = new ArrayList();
if (contextNode != null && contextNode instanceof OMNode) {
while (contextNode != null && contextNode instanceof OMNode) {
@@ -476,15 +478,15 @@
}
/**
- * Retrieves an <code>Iterator</code> matching the
- * <code>preceding-sibling</code> XPath axis.
+ * Retrieves an <code>Iterator</code> matching the <code>preceding-sibling</code> XPath axis.
*
* @param contextNode the original context node
* @return Returns an Iterator capable of traversing the axis, not null.
- * @throws UnsupportedAxisException if the semantics of the preceding-sibling axis are
- * not supported by this object model
+ * @throws UnsupportedAxisException if the semantics of the preceding-sibling axis are not
+ * supported by this object model
*/
- public Iterator getPrecedingSiblingAxisIterator(Object contextNode) throws UnsupportedAxisException {
+ public Iterator getPrecedingSiblingAxisIterator(Object contextNode)
+ throws UnsupportedAxisException {
ArrayList list = new ArrayList();
if (contextNode != null && contextNode instanceof OMNode) {
while (contextNode != null && contextNode instanceof OMNode) {
@@ -497,13 +499,12 @@
}
/**
- * Retrieves an <code>Iterator</code> matching the <code>following</code>
- * XPath axis.
+ * Retrieves an <code>Iterator</code> matching the <code>following</code> XPath axis.
*
* @param contextNode the original context node
* @return Returns an Iterator capable of traversing the axis, not null.
- * @throws UnsupportedAxisException if the semantics of the following axis are
- * not supported by this object model
+ * @throws UnsupportedAxisException if the semantics of the following axis are not supported by
+ * this object model
*/
public Iterator getFollowingAxisIterator(Object contextNode) throws UnsupportedAxisException {
//TODO: Fix this better?
@@ -515,8 +516,8 @@
*
* @param contextNode the original context node
* @return Returns an Iterator capable of traversing the axis, not null.
- * @throws UnsupportedAxisException if the semantics of the preceding axis are
- * not supported by this object model
+ * @throws UnsupportedAxisException if the semantics of the preceding axis are not supported by
+ * this object model
*/
public Iterator getPrecedingAxisIterator(Object contextNode) throws UnsupportedAxisException {
//TODO: Fix this better?
@@ -561,18 +562,14 @@
}
/**
- * Returns the element whose ID is given by elementId.
- * If no such element exists, returns null.
- * Attributes with the name "ID" are not of type ID unless so defined.
- * Implementations that do not know whether attributes are of type ID or
- * not are expected to return null.
+ * Returns the element whose ID is given by elementId. If no such element exists, returns null.
+ * Attributes with the name "ID" are not of type ID unless so defined. Implementations that do
+ * not know whether attributes are of type ID or not are expected to return null.
*
- * @param contextNode a node from the document in which to look for the
- * id
+ * @param contextNode a node from the document in which to look for the id
* @param elementId id to look for
- * @return Returns element whose ID is given by elementId, or null if no such
- * element exists in the document or if the implementation
- * does not know about attribute types.
+ * @return Returns element whose ID is given by elementId, or null if no such element exists in
+ * the document or if the implementation does not know about attribute types.
*/
public Object getElementById(Object contextNode, String elementId) {
//TODO: Fix this better?
@@ -600,13 +597,11 @@
}
/**
- * Translates a namespace prefix to a namespace URI, <b>possibly</b>
- * considering a particular element node.
+ * Translates a namespace prefix to a namespace URI, <b>possibly</b> considering a particular
+ * element node.
* <p/>
- * Strictly speaking, prefix-to-URI translation should occur
- * irrespective of any element in the document. This method
- * is provided to allow a non-conforming ease-of-use enhancement.
- * </p>
+ * Strictly speaking, prefix-to-URI translation should occur irrespective of any element in the
+ * document. This method is provided to allow a non-conforming ease-of-use enhancement. </p>
*
* @param prefix the prefix to translate
* @param element the element to consider during translation
@@ -638,8 +633,8 @@
}
/**
- * Returns a number that identifies the type of node that the given
- * object represents in this navigator. See org.jaxen.pattern.Pattern
+ * Returns a number that identifies the type of node that the given object represents in this
+ * navigator. See org.jaxen.pattern.Pattern
*
* @param node ????
* @return Returns short.
@@ -652,13 +647,11 @@
/**
* Returns the parent of the given context node.
* <p/>
- * The parent of any node must either be a document
- * node or an element node.
+ * The parent of any node must either be a document node or an element node.
*
* @param contextNode the context node
* @return Returns the parent of the context node, or null if this is a document node.
- * @throws UnsupportedAxisException if the parent axis is not
- * supported by the model
+ * @throws UnsupportedAxisException if the parent axis is not supported by the model
* @see #isDocument
* @see #isElement
*/
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAP11Constants.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAP11Constants.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAP11Constants.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAP11Constants.java Wed Mar 7 06:59:00 2007
@@ -18,27 +18,18 @@
public interface SOAP11Constants extends SOAPConstants {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
- public static final String SOAP_ENVELOPE_NAMESPACE_URI = "http://schemas.xmlsoap.org/soap/envelope/";
+ /** Eran Chinthaka (chinthaka@apache.org) */
+ public static final String SOAP_ENVELOPE_NAMESPACE_URI =
+ "http://schemas.xmlsoap.org/soap/envelope/";
- /**
- * Field ATTR_ACTOR
- */
+ /** Field ATTR_ACTOR */
public static final String ATTR_ACTOR = "actor";
- /**
- * Field SOAP_FAULT_CODE_LOCAL_NAME
- */
+ /** Field SOAP_FAULT_CODE_LOCAL_NAME */
public static final String SOAP_FAULT_CODE_LOCAL_NAME = "faultcode";
- /**
- * Field SOAP_FAULT_STRING_LOCAL_NAME
- */
+ /** Field SOAP_FAULT_STRING_LOCAL_NAME */
public static final String SOAP_FAULT_STRING_LOCAL_NAME = "faultstring";
- /**
- * Field SOAP_FAULT_ACTOR_LOCAL_NAME
- */
+ /** Field SOAP_FAULT_ACTOR_LOCAL_NAME */
public static final String SOAP_FAULT_ACTOR_LOCAL_NAME = "faultactor";
public static final String SOAP_FAULT_DETAIL_LOCAL_NAME = "detail";
@@ -46,7 +37,7 @@
//SOAP 1.2 Content Type
public static final String SOAP_11_CONTENT_TYPE = "text/xml";
- // -------- SOAP Fault Codes ------------------------------
+ // -------- SOAP Fault Codes ------------------------------
public static final String FAULT_CODE_SENDER = "Client";
public static final String FAULT_CODE_RECEIVER = "Server";
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAP12Constants.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAP12Constants.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAP12Constants.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAP12Constants.java Wed Mar 7 06:59:00 2007
@@ -18,9 +18,7 @@
public interface SOAP12Constants extends SOAPConstants {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+ /** Eran Chinthaka (chinthaka@apache.org) */
public String SOAP_ENVELOPE_NAMESPACE_URI =
"http://www.w3.org/2003/05/soap-envelope";
@@ -44,7 +42,8 @@
public static final String SOAP_FAULT_REASON_LOCAL_NAME = "Reason";
public static final String SOAP_FAULT_TEXT_LOCAL_NAME = "Text";
public static final String SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME = "lang";
- public static final String SOAP_FAULT_TEXT_LANG_ATTR_NS_URI = "http://www.w3.org/XML/1998/namespace";
+ public static final String SOAP_FAULT_TEXT_LANG_ATTR_NS_URI =
+ "http://www.w3.org/XML/1998/namespace";
public static final String SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX = "xml";
// SOAP Fault Node
@@ -65,6 +64,7 @@
public static final String SOAP_ROLE_NEXT = "http://www.w3.org/2003/05/soap-envelope/role/next";
public static final String SOAP_ROLE_NONE = "http://www.w3.org/2003/05/soap-envelope/role/none";
- public static final String SOAP_ROLE_ULTIMATE_RECEIVER = "http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver";
-
+ public static final String SOAP_ROLE_ULTIMATE_RECEIVER =
+ "http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver";
+
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPBody.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPBody.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPBody.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPBody.java Wed Mar 7 06:59:00 2007
@@ -20,19 +20,17 @@
import org.apache.axiom.om.OMException;
/**
- * An object that represents the contents of the SOAP body
- * element in a SOAP message. B SOAP body element consists of XML data
- * that affects the way the application-specific content is processed.
- * <P>
- * B <code>SOAPBody</code> object contains <code>OMBodyBlock</code>
- * objects, which have the content for the SOAP body.
- * B <code>SOAPFault</code> object, which carries status and/or
- * error information, is an example of a <code>OMBodyBlock</code> object.
+ * An object that represents the contents of the SOAP body element in a SOAP message. B SOAP body
+ * element consists of XML data that affects the way the application-specific content is processed.
+ * <p/>
+ * B <code>SOAPBody</code> object contains <code>OMBodyBlock</code> objects, which have the content
+ * for the SOAP body. B <code>SOAPFault</code> object, which carries status and/or error
+ * information, is an example of a <code>OMBodyBlock</code> object.
*/
public interface SOAPBody extends OMElement {
/**
- * Creates a new <code>SOAPFault</code> object and adds it to
- * this <code>SOAPBody</code> object.
+ * Creates a new <code>SOAPFault</code> object and adds it to this <code>SOAPBody</code>
+ * object.
*
* @param e
* @return the new <code>SOAPFault</code> object
@@ -44,21 +42,18 @@
public abstract SOAPFault addFault(Exception e) throws OMException;
/**
- * Indicates whether a <code>SOAPFault</code> object exists in
- * this <code>SOAPBody</code> object.
+ * Indicates whether a <code>SOAPFault</code> object exists in this <code>SOAPBody</code>
+ * object.
*
- * @return <code>true</code> if a <code>SOAPFault</code> object exists in
- * this <code>SOAPBody</code> object; <code>false</code>
- * otherwise
+ * @return <code>true</code> if a <code>SOAPFault</code> object exists in this
+ * <code>SOAPBody</code> object; <code>false</code> otherwise
*/
public abstract boolean hasFault();
/**
- * Returns the <code>SOAPFault</code> object in this <code>SOAPBody</code>
- * object.
+ * Returns the <code>SOAPFault</code> object in this <code>SOAPBody</code> object.
*
- * @return the <code>SOAPFault</code> object in this <code>SOAPBody</code>
- * object
+ * @return the <code>SOAPFault</code> object in this <code>SOAPBody</code> object
*/
public abstract SOAPFault getFault();
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPConstants.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPConstants.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPConstants.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPConstants.java Wed Mar 7 06:59:00 2007
@@ -20,56 +20,38 @@
/**
* Eran Chinthaka (chinthaka@apache.org)
*/
- /**
- * Field SOAP_DEFAULT_NAMESPACE_PREFIX
- */
+ /** Field SOAP_DEFAULT_NAMESPACE_PREFIX */
public static final String SOAP_DEFAULT_NAMESPACE_PREFIX = "soapenv";
- /**
- * Field SOAPENVELOPE_LOCAL_NAME
- */
+ /** Field SOAPENVELOPE_LOCAL_NAME */
public static final String SOAPENVELOPE_LOCAL_NAME = "Envelope";
- /**
- * Field HEADER_LOCAL_NAME
- */
+ /** Field HEADER_LOCAL_NAME */
public static final String HEADER_LOCAL_NAME = "Header";
- /**
- * Field BODY_LOCAL_NAME
- */
+ /** Field BODY_LOCAL_NAME */
public static final String BODY_LOCAL_NAME = "Body";
- /**
- * Field BODY_NAMESPACE_PREFIX
- */
+ /** Field BODY_NAMESPACE_PREFIX */
public static final String BODY_NAMESPACE_PREFIX =
SOAP_DEFAULT_NAMESPACE_PREFIX;
- /**
- * Field BODY_FAULT_LOCAL_NAME
- */
+ /** Field BODY_FAULT_LOCAL_NAME */
public static final String BODY_FAULT_LOCAL_NAME = "Fault";
- /**
- * Field ATTR_MUSTUNDERSTAND
- */
+ /** Field ATTR_MUSTUNDERSTAND */
public static final String ATTR_MUSTUNDERSTAND = "mustUnderstand";
public static final String ATTR_MUSTUNDERSTAND_TRUE = "true";
public static final String ATTR_MUSTUNDERSTAND_FALSE = "false";
public static final String ATTR_MUSTUNDERSTAND_0 = "0";
public static final String ATTR_MUSTUNDERSTAND_1 = "1";
- /**
- * Field SOAPFAULT_LOCAL_NAME
- */
+ /** Field SOAPFAULT_LOCAL_NAME */
public static final String SOAPFAULT_LOCAL_NAME = "Fault";
- /**
- * Field SOAPFAULT_DETAIL_LOCAL_NAME
- */
+ /** Field SOAPFAULT_DETAIL_LOCAL_NAME */
public static final String SOAPFAULT_DETAIL_LOCAL_NAME = "detail";
public static final String SOAP_FAULT_DETAIL_EXCEPTION_ENTRY = "Exception";
// -------- SOAP Fault Codes ------------------------------
public static final String FAULT_CODE_VERSION_MISMATCH = "VersionMismatch";
- public static final String FAULT_CODE_MUST_UNDERSTAND = "MustUnderstand";
+ public static final String FAULT_CODE_MUST_UNDERSTAND = "MustUnderstand";
public static final String FAULT_CODE_DATA_ENCODING_UNKNOWN = "DataEncodingUnknown";
// Followings are different in SOAP 1.1 and 1.2 specifications
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPEnvelope.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPEnvelope.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPEnvelope.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPEnvelope.java Wed Mar 7 06:59:00 2007
@@ -19,37 +19,27 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
-/**
- * Interface SOAPEnvelope
- */
+/** Interface SOAPEnvelope */
public interface SOAPEnvelope extends OMElement {
/**
- * 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>
+ * 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
+ * @return the <CODE>SOAPHeader</CODE> object or <CODE> null</CODE> if there is none
* @throws org.apache.axiom.om.OMException
- * if there is a problem
- * obtaining the <CODE>SOAPHeader</CODE> object
+ * if there is a problem obtaining the <CODE>SOAPHeader</CODE> object
*/
public abstract SOAPHeader getHeader() throws OMException;
/**
- * 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>
+ * 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
+ * @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 abstract SOAPBody getBody() throws OMException;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFactory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFactory.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFactory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFactory.java Wed Mar 7 06:59:00 2007
@@ -22,21 +22,20 @@
public interface SOAPFactory extends OMFactory {
-
+
public String getSoapVersionURI();
-
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+
+ /** Eran Chinthaka (chinthaka@apache.org) */
public SOAPMessage createSOAPMessage();
+
public SOAPMessage createSOAPMessage(OMXMLParserWrapper builder);
+
public SOAPMessage createSOAPMessage(SOAPEnvelope envelope, OMXMLParserWrapper parserWrapper);
- /**
- * @return Returns SOAPEnvelope.
- */
+ /** @return Returns SOAPEnvelope. */
public SOAPEnvelope createSOAPEnvelope() throws SOAPProcessingException;
+
public SOAPEnvelope createSOAPEnvelope(OMXMLParserWrapper builder);
/**
@@ -44,6 +43,7 @@
* @return Returns SOAPHeader.
*/
public SOAPHeader createSOAPHeader(SOAPEnvelope envelope) throws SOAPProcessingException;
+
public SOAPHeader createSOAPHeader() throws SOAPProcessingException;
/**
@@ -62,6 +62,7 @@
public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
OMNamespace ns,
SOAPHeader parent) throws SOAPProcessingException;
+
public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
OMNamespace ns) throws SOAPProcessingException;
@@ -75,7 +76,8 @@
public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
OMNamespace ns,
SOAPHeader parent,
- OMXMLParserWrapper builder) throws SOAPProcessingException;
+ OMXMLParserWrapper builder)
+ throws SOAPProcessingException;
/**
* @param parent
@@ -85,6 +87,7 @@
public SOAPFault createSOAPFault(SOAPBody parent, Exception e) throws SOAPProcessingException;
public SOAPFault createSOAPFault(SOAPBody parent) throws SOAPProcessingException;
+
public SOAPFault createSOAPFault() throws SOAPProcessingException;
/**
@@ -100,6 +103,7 @@
* @return Returns SOAPBody.
*/
public SOAPBody createSOAPBody(SOAPEnvelope envelope) throws SOAPProcessingException;
+
public SOAPBody createSOAPBody() throws SOAPProcessingException;
/**
@@ -121,6 +125,7 @@
* @return Returns SOAPFaultCode.
*/
public SOAPFaultCode createSOAPFaultCode(SOAPFault parent) throws SOAPProcessingException;
+
public SOAPFaultCode createSOAPFaultCode() throws SOAPProcessingException;
/**
@@ -133,10 +138,10 @@
public SOAPFaultCode createSOAPFaultCode(SOAPFault parent,
OMXMLParserWrapper builder);
-
/*========================
- = SOAPFaultCodeValue =
- ======================== */
+ = SOAPFaultCodeValue =
+ ======================== */
+
/**
* Value eii under Code (parent)
*
@@ -144,6 +149,7 @@
* @return Returns SOAPFaultValue.
*/
public SOAPFaultValue createSOAPFaultValue(SOAPFaultCode parent) throws SOAPProcessingException;
+
public SOAPFaultValue createSOAPFaultValue() throws SOAPProcessingException;
/**
@@ -168,14 +174,17 @@
*/
//added
- public SOAPFaultValue createSOAPFaultValue(SOAPFaultSubCode parent) throws SOAPProcessingException;
+ public SOAPFaultValue createSOAPFaultValue(SOAPFaultSubCode parent)
+ throws SOAPProcessingException;
//added
public SOAPFaultValue createSOAPFaultValue(SOAPFaultSubCode parent,
OMXMLParserWrapper builder);
//changed
- public SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultCode parent) throws SOAPProcessingException;
+ public SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultCode parent)
+ throws SOAPProcessingException;
+
public SOAPFaultSubCode createSOAPFaultSubCode() throws SOAPProcessingException;
/**
@@ -195,7 +204,8 @@
* @param parent
* @return Returns SOAPFaultSubCode.
*/
- public SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultSubCode parent) throws SOAPProcessingException;
+ public SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultSubCode parent)
+ throws SOAPProcessingException;
/**
* SubCode eii under SubCode (parent)
@@ -207,10 +217,9 @@
public SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultSubCode parent,
OMXMLParserWrapper builder);
-
/*========================
- = SOAPFaultReason =
- ======================== */
+ = SOAPFaultReason =
+ ======================== */
/**
* Reason eii under SOAPFault (parent)
@@ -219,6 +228,7 @@
* @return Returns SOAPFaultReason.
*/
public SOAPFaultReason createSOAPFaultReason(SOAPFault parent) throws SOAPProcessingException;
+
public SOAPFaultReason createSOAPFaultReason() throws SOAPProcessingException;
/**
@@ -242,6 +252,7 @@
* @return Returns SOAPFaultText.
*/
public SOAPFaultText createSOAPFaultText(SOAPFaultReason parent) throws SOAPProcessingException;
+
public SOAPFaultText createSOAPFaultText() throws SOAPProcessingException;
/**
@@ -254,10 +265,9 @@
public SOAPFaultText createSOAPFaultText(SOAPFaultReason parent,
OMXMLParserWrapper builder);
-
/*========================
- = SOAPFaultNode =
- ======================== */
+ = SOAPFaultNode =
+ ======================== */
/**
* Node eii under SOAPFault (parent)
@@ -266,6 +276,7 @@
* @return Returns SOAPFaultNode.
*/
public SOAPFaultNode createSOAPFaultNode(SOAPFault parent) throws SOAPProcessingException;
+
public SOAPFaultNode createSOAPFaultNode() throws SOAPProcessingException;
/**
@@ -289,6 +300,7 @@
* @return Returns SOAPFaultRole.
*/
public SOAPFaultRole createSOAPFaultRole(SOAPFault parent) throws SOAPProcessingException;
+
public SOAPFaultRole createSOAPFaultRole() throws SOAPProcessingException;
/**
@@ -312,6 +324,7 @@
* @return Returns SOAPFaultDetail.
*/
public SOAPFaultDetail createSOAPFaultDetail(SOAPFault parent) throws SOAPProcessingException;
+
public SOAPFaultDetail createSOAPFaultDetail() throws SOAPProcessingException;
/**
@@ -326,15 +339,15 @@
/**
- * Method getDefaultEnvelope. This returns a SOAP envelope consisting with an empty Header and a Body.
- * This is just a util method which can be used everywhere.
+ * Method getDefaultEnvelope. This returns a SOAP envelope consisting with an empty Header and a
+ * Body. This is just a util method which can be used everywhere.
*
* @return Returns SOAPEnvelope.
*/
public SOAPEnvelope getDefaultEnvelope() throws SOAPProcessingException;
public SOAPEnvelope getDefaultFaultEnvelope() throws SOAPProcessingException;
-
+
public OMNamespace getNamespace();
-
+
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFault.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFault.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFault.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFault.java Wed Mar 7 06:59:00 2007
@@ -21,24 +21,18 @@
/**
- * An element in the <CODE>SOAPBody</CODE> object that contains
- * error and/or status information. This information may relate to
- * errors in the <CODE>OMMessage</CODE> object or to problems
- * that are not related to the content in the message itself.
- * Problems not related to the message itself are generally errors
- * in processing, such as the inability to communicate with an
- * upstream server.
- * <P>
- * The <CODE>SOAPFault</CODE> interface provides methods for
- * retrieving the information contained in a <CODE>
- * SOAPFault</CODE> object and for setting the fault code, the
- * fault actor, and a string describing the fault. B fault code is
- * one of the codes defined in the SOAP 1.1 specification that
- * describe the fault. An actor is an intermediate recipient to
- * whom a message was routed. The message path may include one or
- * more actors, or, if no actors are specified, the message goes
- * only to the default actor, which is the final intended
- * recipient.
+ * An element in the <CODE>SOAPBody</CODE> object that contains error and/or status information.
+ * This information may relate to errors in the <CODE>OMMessage</CODE> object or to problems that
+ * are not related to the content in the message itself. Problems not related to the message itself
+ * are generally errors in processing, such as the inability to communicate with an upstream
+ * server.
+ * <p/>
+ * The <CODE>SOAPFault</CODE> interface provides methods for retrieving the information contained in
+ * a <CODE> SOAPFault</CODE> object and for setting the fault code, the fault actor, and a string
+ * describing the fault. B fault code is one of the codes defined in the SOAP 1.1 specification that
+ * describe the fault. An actor is an intermediate recipient to whom a message was routed. The
+ * message path may include one or more actors, or, if no actors are specified, the message goes
+ * only to the default actor, which is the final intended recipient.
*/
public interface SOAPFault extends OMElement {
@@ -90,12 +84,8 @@
/**
* Returns Exception if there is one in the SOAP fault.
* <p/>
- * If the exception is like;
- * <SOAPFault>
- * <Detail>
- * <Exception> stack trace goes here </Exception>
- * </Detail>
- * </SOAPFault>
+ * If the exception is like; <SOAPFault> <Detail> <Exception> stack trace goes here </Exception>
+ * </Detail> </SOAPFault>
*
* @return Returns Exception.
* @throws org.apache.axiom.om.OMException
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultCode.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultCode.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultCode.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultCode.java Wed Mar 7 06:59:00 2007
@@ -23,24 +23,16 @@
* Eran Chinthaka (chinthaka@apache.org)
*/
- /**
- * @param value
- */
+ /** @param value */
public void setValue(SOAPFaultValue value) throws SOAPProcessingException;
- /**
- * @return Returns SOAPFaultValue.
- */
+ /** @return Returns SOAPFaultValue. */
public SOAPFaultValue getValue();
- /**
- * @param value
- */
+ /** @param value */
public void setSubCode(SOAPFaultSubCode value) throws SOAPProcessingException;
- /**
- * @return Returns SOAPFaultSubCode.
- */
+ /** @return Returns SOAPFaultSubCode. */
public SOAPFaultSubCode getSubCode();
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultDetail.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultDetail.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultDetail.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultDetail.java Wed Mar 7 06:59:00 2007
@@ -22,19 +22,15 @@
/**
- * The Detail element information item is intended for carrying application
- * specific error information related to the SOAP Body .
+ * The Detail element information item is intended for carrying application specific error
+ * information related to the SOAP Body .
* <p/>
- * The Detail element information item has:
- * A [local name] of Detail .
- * A [namespace name] of http://www.w3.org/2003/05/soap-envelope .
- * Zero or more attribute information items in its [attributes] property.
- * Zero or more child element information items in its [children] property.
+ * The Detail element information item has: A [local name] of Detail . A [namespace name] of
+ * http://www.w3.org/2003/05/soap-envelope . Zero or more attribute information items in its
+ * [attributes] property. Zero or more child element information items in its [children] property.
*/
public interface SOAPFaultDetail extends OMElement {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+ /** Eran Chinthaka (chinthaka@apache.org) */
public void addDetailEntry(OMElement detailElement);
public Iterator getAllDetailEntries();
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultNode.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultNode.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultNode.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultNode.java Wed Mar 7 06:59:00 2007
@@ -24,12 +24,11 @@
*/
/**
- * each SOAP node is identified by a URI. The value of the Node element
- * information item is the URI that identifies the SOAP node that generated
- * the fault. SOAP nodes that do not act as the ultimate SOAP receiver MUST
- * include this element information item. An ultimate SOAP receiver MAY
- * include this element information item to indicate explicitly that it
- * generated the fault.
+ * each SOAP node is identified by a URI. The value of the Node element information item is the
+ * URI that identifies the SOAP node that generated the fault. SOAP nodes that do not act as the
+ * ultimate SOAP receiver MUST include this element information item. An ultimate SOAP receiver
+ * MAY include this element information item to indicate explicitly that it generated the
+ * fault.
*
* @param uri
*/
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultReason.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultReason.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultReason.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultReason.java Wed Mar 7 06:59:00 2007
@@ -21,9 +21,7 @@
import java.util.List;
public interface SOAPFaultReason extends OMElement {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+ /** Eran Chinthaka (chinthaka@apache.org) */
public void addSOAPText(SOAPFaultText soapFaultText) throws SOAPProcessingException;
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultRole.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultRole.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultRole.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultRole.java Wed Mar 7 06:59:00 2007
@@ -20,21 +20,20 @@
/**
- * The Role element information item identifies the role the node was operating
- * in at the point the fault occurred.
+ * The Role element information item identifies the role the node was operating in at the point the
+ * fault occurred.
* <p/>
- * The Role element information item has:
- * A [local name] of Role .
- * A [namespace name] of http://www.w3.org/2003/05/soap-envelope .
+ * The Role element information item has: A [local name] of Role . A [namespace name] of
+ * http://www.w3.org/2003/05/soap-envelope .
*/
public interface SOAPFaultRole extends OMElement {
/**
* Eran Chinthaka (chinthaka@apache.org)
*/
-
+
/**
- * The value of the Role element information item MUST be one of the roles
- * assumed by the node during processing of the message
+ * The value of the Role element information item MUST be one of the roles assumed by the node
+ * during processing of the message
*
* @param uri
*/
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultText.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultText.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultText.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPFaultText.java Wed Mar 7 06:59:00 2007
@@ -26,7 +26,8 @@
/**
* lang is a mandatory attribute within the SOAPFaultText which must have
* SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_URI as the namespace URI and
- * SOAP12constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX or a capitalization thereof as the prefix
+ * SOAP12constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX or a capitalization thereof as the
+ * prefix
*
* @param lang
*/
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeader.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeader.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeader.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeader.java Wed Mar 7 06:59:00 2007
@@ -23,98 +23,79 @@
import java.util.ArrayList;
import java.util.Iterator;
-/**
- * Interface SOAPHeader
- */
+/** Interface SOAPHeader */
public interface SOAPHeader extends OMElement {
/**
- * Creates a new <CODE>SOAPHeaderBlock</CODE> object initialized with the
- * specified name and adds it to this <CODE>SOAPHeader</CODE> object.
+ * Creates a new <CODE>SOAPHeaderBlock</CODE> object initialized with the specified name and
+ * adds it to this <CODE>SOAPHeader</CODE> object.
*
* @param localName
* @param ns
- * @return the new <CODE>SOAPHeaderBlock</CODE> object that was inserted
- * into this <CODE>SOAPHeader</CODE> object
+ * @return the new <CODE>SOAPHeaderBlock</CODE> object that was inserted into this
+ * <CODE>SOAPHeader</CODE> object
* @throws org.apache.axiom.om.OMException
- * if a SOAP error occurs
+ * if a SOAP error occurs
*/
public abstract SOAPHeaderBlock addHeaderBlock(String localName,
- OMNamespace ns) throws OMException;
+ OMNamespace ns) throws OMException;
/**
* Returns a list of all the <CODE>SOAPHeaderBlock</CODE> objects in this
- * <CODE>SOAPHeader</CODE> object that have the the specified role. An
- * role is a global attribute that indicates the intermediate parties to
- * whom the message should be sent. An role receives the message and then
- * sends it to the next role. The default role is the ultimate intended
- * recipient for the message, so if no role attribute is included in a
- * <CODE>SOAPHeader</CODE> object, the message is sent to its ultimate
- * destination.
- *
- * @param role
- * a <CODE>String</CODE> giving the URI of the role for which
- * to search
- * @return Returns an <CODE>Iterator</CODE> object over all the <CODE>
- * SOAPHeaderBlock</CODE> objects that contain the specified role
- * @see #extractHeaderBlocks(java.lang.String)
- * extractHeaderBlocks(java.lang.String)
+ * <CODE>SOAPHeader</CODE> object that have the the specified role. An role is a global
+ * attribute that indicates the intermediate parties to whom the message should be sent. An role
+ * receives the message and then sends it to the next role. The default role is the ultimate
+ * intended recipient for the message, so if no role attribute is included in a
+ * <CODE>SOAPHeader</CODE> object, the message is sent to its ultimate destination.
+ *
+ * @param role a <CODE>String</CODE> giving the URI of the role for which to search
+ * @return Returns an <CODE>Iterator</CODE> object over all the <CODE> SOAPHeaderBlock</CODE>
+ * objects that contain the specified role
+ * @see #extractHeaderBlocks(String) extractHeaderBlocks(java.lang.String)
*/
public abstract Iterator examineHeaderBlocks(String role);
/**
* Returns a list of all the <CODE>SOAPHeaderBlock</CODE> objects in this
- * <CODE>SOAPHeader</CODE> object that have the the specified role and
- * detaches them from this <CODE>SOAPHeader</CODE> object.
- * <P>
- * This method allows an role to process only the parts of the <CODE>
- * SOAPHeader</CODE> object that apply to it and to remove them before
- * passing the message on to the next role.
- *
- * @param role
- * a <CODE>String</CODE> giving the URI of the role for which
- * to search
- * @return Returns an <CODE>Iterator</CODE> object over all the <CODE>
- * SOAPHeaderBlock</CODE> objects that contain the specified role
- * @see #examineHeaderBlocks(java.lang.String)
- * examineHeaderBlocks(java.lang.String)
+ * <CODE>SOAPHeader</CODE> object that have the the specified role and detaches them from this
+ * <CODE>SOAPHeader</CODE> object.
+ * <p/>
+ * This method allows an role to process only the parts of the <CODE> SOAPHeader</CODE> object
+ * that apply to it and to remove them before passing the message on to the next role.
+ *
+ * @param role a <CODE>String</CODE> giving the URI of the role for which to search
+ * @return Returns an <CODE>Iterator</CODE> object over all the <CODE> SOAPHeaderBlock</CODE>
+ * objects that contain the specified role
+ * @see #examineHeaderBlocks(String) examineHeaderBlocks(java.lang.String)
*/
public abstract Iterator extractHeaderBlocks(String role);
/**
- * Returns an <code>Iterator</code> over all the
- * <code>SOAPHeaderBlock</code> objects in this <code>SOAPHeader</code>
- * object that have the specified role and that have a MustUnderstand
+ * Returns an <code>Iterator</code> over all the <code>SOAPHeaderBlock</code> objects in this
+ * <code>SOAPHeader</code> object that have the specified role and that have a MustUnderstand
* attribute whose value is equivalent to <code>true</code>.
*
- * @param role
- * a <code>String</code> giving the URI of the role for which
- * to search
- * @return Returns an <code>Iterator</code> object over all the
- * <code>SOAPHeaderBlock</code> objects that contain the specified
- * role and are marked as MustUnderstand.
+ * @param role a <code>String</code> giving the URI of the role for which to search
+ * @return Returns an <code>Iterator</code> object over all the <code>SOAPHeaderBlock</code>
+ * objects that contain the specified role and are marked as MustUnderstand.
*/
public abstract Iterator examineMustUnderstandHeaderBlocks(String role);
/**
- * Returns an <code>Iterator</code> over all the
- * <code>SOAPHeaderBlock</code> objects in this <code>SOAPHeader</code>
- * object.
- *
- * @return an <code>Iterator</code> object over all the
- * <code>SOAPHeaderBlock</code> objects contained by this
- * <code>SOAPHeader</code>. If there are no header blocks then an
+ * Returns an <code>Iterator</code> over all the <code>SOAPHeaderBlock</code> objects in this
+ * <code>SOAPHeader</code> object.
+ *
+ * @return an <code>Iterator</code> object over all the <code>SOAPHeaderBlock</code> objects
+ * contained by this <code>SOAPHeader</code>. If there are no header blocks then an
* empty iterator is returned.
*/
public abstract Iterator examineAllHeaderBlocks();
/**
- * Returns an <code>Iterator</code> over all the
- * <code>SOAPHeaderBlock</code> objects in this <code>SOAPHeader </code>
- * object and detaches them from this <code>SOAPHeader</code> object.
- *
- * @return Returns an <code>Iterator</code> object over all the
- * <code>SOAPHeaderBlock</code> objects contained by this
- * <code>SOAPHeader</code>
+ * Returns an <code>Iterator</code> over all the <code>SOAPHeaderBlock</code> objects in this
+ * <code>SOAPHeader </code> object and detaches them from this <code>SOAPHeader</code> object.
+ *
+ * @return Returns an <code>Iterator</code> object over all the <code>SOAPHeaderBlock</code>
+ * objects contained by this <code>SOAPHeader</code>
*/
public abstract Iterator extractAllHeaderBlocks();
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeaderBlock.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeaderBlock.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeaderBlock.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeaderBlock.java Wed Mar 7 06:59:00 2007
@@ -19,44 +19,41 @@
import org.apache.axiom.om.OMElement;
/**
- * <P>An object representing the contents in the SOAP header part of the SOAP
- * envelope. The immediate children of a <CODE> SOAPHeader</CODE> object can be
- * represented only as <CODE> SOAPHeaderBlock</CODE> objects.</P> <P>B
- * <CODE>SOAPHeaderBlock</CODE> object can have other <CODE>OMElement</CODE>
- * objects as its children.</P>
+ * <P>An object representing the contents in the SOAP header part of the SOAP envelope. The
+ * immediate children of a <CODE> SOAPHeader</CODE> object can be represented only as <CODE>
+ * SOAPHeaderBlock</CODE> objects.</P> <P>B <CODE>SOAPHeaderBlock</CODE> object can have other
+ * <CODE>OMElement</CODE> objects as its children.</P>
*/
public interface SOAPHeaderBlock extends OMElement {
/**
- * Sets the actor associated with this <CODE> SOAPHeaderBlock</CODE> object
- * to the specified actor.
+ * Sets the actor associated with this <CODE> SOAPHeaderBlock</CODE> object to the specified
+ * actor.
*
* @param roleURI a <CODE>String</CODE> giving the URI of the actor to set
- * @throws java.lang.IllegalArgumentException
+ * @throws IllegalArgumentException
* if there is a problem in setting the actor.
* @see #getRole() getRole()
*/
public abstract void setRole(String roleURI);
/**
- * Returns the uri of the actor associated with this <CODE>
- * SOAPHeaderBlock</CODE> object.
+ * Returns the uri of the actor associated with this <CODE> SOAPHeaderBlock</CODE> object.
*
* @return a <CODE>String</CODE> giving the URI of the actor
- * @see #setRole(java.lang.String) setRole(java.lang.String)
+ * @see #setRole(String) setRole(java.lang.String)
*/
public abstract String getRole();
/**
- * Sets the mustUnderstand attribute for this <CODE> SOAPHeaderBlock</CODE>
- * object to be on or off. <P>If the mustUnderstand attribute is on, the
- * actor who receives the <CODE>SOAPHeaderBlock</CODE> must process it
- * correctly. This ensures, for example, that if the <CODE>
- * SOAPHeaderBlock</CODE> object modifies the message, that the message is
- * being modified correctly.</P>
- *
- * @param mustUnderstand <CODE>true</CODE> to set the mustUnderstand
- * attribute on; <CODE>false</CODE> to turn if off
- * @throws java.lang.IllegalArgumentException
+ * Sets the mustUnderstand attribute for this <CODE> SOAPHeaderBlock</CODE> object to be on or
+ * off. <P>If the mustUnderstand attribute is on, the actor who receives the
+ * <CODE>SOAPHeaderBlock</CODE> must process it correctly. This ensures, for example, that if
+ * the <CODE> SOAPHeaderBlock</CODE> object modifies the message, that the message is being
+ * modified correctly.</P>
+ *
+ * @param mustUnderstand <CODE>true</CODE> to set the mustUnderstand attribute on;
+ * <CODE>false</CODE> to turn if off
+ * @throws IllegalArgumentException
* if there is a problem in setting the actor.
* @see #getMustUnderstand() getMustUnderstand()
*/
@@ -65,12 +62,11 @@
public abstract void setMustUnderstand(String mustUnderstand) throws SOAPProcessingException;
/**
- * Returns whether the mustUnderstand attribute for this
- * <CODE>SOAPHeaderBlock</CODE> object is turned on.
+ * Returns whether the mustUnderstand attribute for this <CODE>SOAPHeaderBlock</CODE> object is
+ * turned on.
*
* @return <CODE>true</CODE> if the mustUnderstand attribute of this
- * <CODE>SOAPHeaderBlock</CODE> object is turned on;
- * <CODE>false</CODE> otherwise
+ * <CODE>SOAPHeaderBlock</CODE> object is turned on; <CODE>false</CODE> otherwise
*/
public abstract boolean getMustUnderstand() throws SOAPProcessingException;
@@ -78,29 +74,27 @@
public abstract boolean isProcessed();
/**
- * We need to know whether all the mustUnderstand headers have been
- * processed by the node. This will done by a specific validation handler at
- * the end of the execution chain. For this all the handlers who process a
- * particular header block must explicitly say that he processesd the header
- * by calling setProcessed()
- */
- public abstract void setProcessed();
-
-
- /**
- * Sets the relay attribute for this SOAPHeaderBlock to be either true or false.
- * The SOAP relay attribute is set to true to indicate that the SOAP header block must be
- * relayed by any node that is targeted by the header block but not actually process it.
- *
- * @param relay a <CODE>boolean</CODE> giving the value to be set
- */
- public abstract void setRelay(boolean relay);
-
- /**
- * Returns the relay status associated with this <CODE>
- * SOAPHeaderBlock</CODE> object.
- *
- * @return a <CODE>boolean</CODE> giving the relay status
- */
+ * We need to know whether all the mustUnderstand headers have been processed by the node. This
+ * will done by a specific validation handler at the end of the execution chain. For this all
+ * the handlers who process a particular header block must explicitly say that he processesd the
+ * header by calling setProcessed()
+ */
+ public abstract void setProcessed();
+
+
+ /**
+ * Sets the relay attribute for this SOAPHeaderBlock to be either true or false. The SOAP relay
+ * attribute is set to true to indicate that the SOAP header block must be relayed by any node
+ * that is targeted by the header block but not actually process it.
+ *
+ * @param relay a <CODE>boolean</CODE> giving the value to be set
+ */
+ public abstract void setRelay(boolean relay);
+
+ /**
+ * Returns the relay status associated with this <CODE> SOAPHeaderBlock</CODE> object.
+ *
+ * @return a <CODE>boolean</CODE> giving the relay status
+ */
public abstract boolean getRelay();
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPMessage.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPMessage.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPMessage.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPMessage.java Wed Mar 7 06:59:00 2007
@@ -21,6 +21,7 @@
public interface SOAPMessage extends OMDocument {
public SOAPEnvelope getSOAPEnvelope() throws SOAPProcessingException;
+
public void setSOAPEnvelope(SOAPEnvelope envelope) throws SOAPProcessingException;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPProcessingException.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPProcessingException.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPProcessingException.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPProcessingException.java Wed Mar 7 06:59:00 2007
@@ -21,12 +21,10 @@
public class SOAPProcessingException extends OMException {
private static final long serialVersionUID = -5432612295193716211L;
-
+
private String soapFaultCode;
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+ /** Eran Chinthaka (chinthaka@apache.org) */
public SOAPProcessingException(String message) {
super(message);
}
@@ -36,10 +34,11 @@
}
/**
- *
- * @param messageText - this will appear as the Text in the Reason information item of SOAP Fault
- * @param faultCode - this will appear as the Value in the Code information item of SOAP Fault
- * @param cause - this will appear under the Detail information item of SOAP Fault
+ * @param messageText - this will appear as the Text in the Reason information item of SOAP
+ * Fault
+ * @param faultCode - this will appear as the Value in the Code information item of SOAP
+ * Fault
+ * @param cause - this will appear under the Detail information item of SOAP Fault
*/
public SOAPProcessingException(String messageText, String faultCode, Throwable cause) {
super(messageText, cause);
@@ -47,9 +46,10 @@
}
/**
- *
- * @param messageText - this will appear as the Text in the Reason information item of SOAP Fault
- * @param faultCode - this will appear as the Value in the Code information item of SOAP Fault
+ * @param messageText - this will appear as the Text in the Reason information item of SOAP
+ * Fault
+ * @param faultCode - this will appear as the Value in the Code information item of SOAP
+ * Fault
*/
public SOAPProcessingException(String messageText, String faultCode) {
super(messageText);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/MTOMStAXSOAPModelBuilder.java Wed Mar 7 06:59:00 2007
@@ -21,99 +21,95 @@
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.om.impl.MTOMConstants;
-import org.apache.axiom.om.impl.OMNodeEx;
import org.apache.axiom.om.impl.OMContainerEx;
+import org.apache.axiom.om.impl.OMNodeEx;
import org.apache.axiom.om.impl.builder.XOPBuilder;
+import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.activation.DataHandler;
import javax.xml.stream.XMLStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
public class MTOMStAXSOAPModelBuilder extends StAXSOAPModelBuilder implements
- MTOMConstants, XOPBuilder {
+ MTOMConstants, XOPBuilder {
+
+ /** <code>Attachments</code> handles deferred parsing of incoming MIME Messages. */
+ Attachments attachments;
+
+ private Log log = LogFactory.getLog(getClass());
+
+ int partIndex = 0;
- /**
- * <code>Attachments</code> handles deferred parsing of incoming MIME
- * Messages.
- */
- Attachments attachments;
-
- private Log log = LogFactory.getLog(getClass());
-
- int partIndex = 0;
-
- public MTOMStAXSOAPModelBuilder(XMLStreamReader parser,
- SOAPFactory factory, Attachments attachments, String soapVersion) {
- super(parser, factory, soapVersion);
- this.attachments = attachments;
- }
-
- /**
- * @param reader
- * @param attachments
- */
- public MTOMStAXSOAPModelBuilder(XMLStreamReader reader,
- Attachments attachments, String soapVersion) {
- super(reader, soapVersion);
- this.attachments = attachments;
- }
-
- public MTOMStAXSOAPModelBuilder(XMLStreamReader reader,
- Attachments attachments) {
- super(reader);
- this.attachments = attachments;
- }
-
- protected OMNode createOMElement() throws OMException {
-
- String elementName = parser.getLocalName();
- String namespaceURI = parser.getNamespaceURI();
-
- // create an OMBlob if the element is an <xop:Include>
- if (XOP_INCLUDE.equalsIgnoreCase(elementName)
- && XOP_NAMESPACE_URI.equalsIgnoreCase(namespaceURI)) {
- elementLevel++;
- OMText node;
- String contentID = ElementHelper.getContentID(parser, getDocument()
- .getCharsetEncoding());
-
- if (lastNode == null) {
- throw new OMException(
- "XOP:Include element is not supported here");
- } else if (lastNode.isComplete() & lastNode.getParent() != null) {
- node = omfactory.createOMText(contentID, (OMElement) lastNode
- .getParent(), this);
- ((OMNodeEx) lastNode).setNextOMSibling(node);
- ((OMNodeEx) node).setPreviousOMSibling(lastNode);
- } else {
- OMContainerEx e = (OMContainerEx) lastNode;
- node = omfactory.createOMText(contentID, (OMElement) lastNode,
- this);
- e.setFirstChild(node);
- }
- return node;
-
- } else {
- return super.createOMElement();
- }
- }
-
- /* (non-Javadoc)
- * @see org.apache.axiom.soap.impl.builder.XOPBuilder#getDataHandler(java.lang.String)
- */
- public DataHandler getDataHandler(String blobContentID) throws OMException {
- DataHandler dataHandler = attachments.getDataHandler(blobContentID);
- if (dataHandler == null) {
- throw new OMException(
- "Referenced Attachment not found in the MIME Message. ContentID:"
- + blobContentID);
- }
- return dataHandler;
- }
+ public MTOMStAXSOAPModelBuilder(XMLStreamReader parser,
+ SOAPFactory factory, Attachments attachments,
+ String soapVersion) {
+ super(parser, factory, soapVersion);
+ this.attachments = attachments;
+ }
+
+ /**
+ * @param reader
+ * @param attachments
+ */
+ public MTOMStAXSOAPModelBuilder(XMLStreamReader reader,
+ Attachments attachments, String soapVersion) {
+ super(reader, soapVersion);
+ this.attachments = attachments;
+ }
+
+ public MTOMStAXSOAPModelBuilder(XMLStreamReader reader,
+ Attachments attachments) {
+ super(reader);
+ this.attachments = attachments;
+ }
+
+ protected OMNode createOMElement() throws OMException {
+
+ String elementName = parser.getLocalName();
+ String namespaceURI = parser.getNamespaceURI();
+
+ // create an OMBlob if the element is an <xop:Include>
+ if (XOP_INCLUDE.equalsIgnoreCase(elementName)
+ && XOP_NAMESPACE_URI.equalsIgnoreCase(namespaceURI)) {
+ elementLevel++;
+ OMText node;
+ String contentID = ElementHelper.getContentID(parser, getDocument()
+ .getCharsetEncoding());
+
+ if (lastNode == null) {
+ throw new OMException(
+ "XOP:Include element is not supported here");
+ } else if (lastNode.isComplete() & lastNode.getParent() != null) {
+ node = omfactory.createOMText(contentID, (OMElement) lastNode
+ .getParent(), this);
+ ((OMNodeEx) lastNode).setNextOMSibling(node);
+ ((OMNodeEx) node).setPreviousOMSibling(lastNode);
+ } else {
+ OMContainerEx e = (OMContainerEx) lastNode;
+ node = omfactory.createOMText(contentID, (OMElement) lastNode,
+ this);
+ e.setFirstChild(node);
+ }
+ return node;
+
+ } else {
+ return super.createOMElement();
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axiom.soap.impl.builder.XOPBuilder#getDataHandler(java.lang.String)
+ */
+ public DataHandler getDataHandler(String blobContentID) throws OMException {
+ DataHandler dataHandler = attachments.getDataHandler(blobContentID);
+ if (dataHandler == null) {
+ throw new OMException(
+ "Referenced Attachment not found in the MIME Message. ContentID:"
+ + blobContentID);
+ }
+ return dataHandler;
+ }
}
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=515594&r1=515593&r2=515594
==============================================================================
--- 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 Wed Mar 7 06:59:00 2007
@@ -17,7 +17,6 @@
package org.apache.axiom.soap.impl.builder;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMText;
import org.apache.axiom.om.impl.OMNodeEx;
import org.apache.axiom.om.impl.exception.OMBuilderException;
import org.apache.axiom.soap.SOAP11Constants;
@@ -25,8 +24,6 @@
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPFaultCode;
import org.apache.axiom.soap.SOAPFaultReason;
-import org.apache.axiom.soap.SOAPFaultText;
-import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
import org.w3c.dom.Element;
@@ -61,7 +58,7 @@
processAttributes(code);
processText(parser, code);
- ((OMNodeEx)code).setComplete(true);
+ ((OMNodeEx) code).setComplete(true);
element = code;
builder.elementLevel--;
@@ -74,7 +71,7 @@
processAttributes(reason);
processText(parser, reason);
- ((OMNodeEx)reason).setComplete(true);
+ ((OMNodeEx) reason).setComplete(true);
element = reason;
builder.elementLevel--;
@@ -83,13 +80,13 @@
} else if (SOAP_FAULT_ACTOR_LOCAL_NAME.equals(localName)) {
element =
factory.createSOAPFaultRole((SOAPFault) parent,
- builder);
+ builder);
processNamespaceData(element, false);
processAttributes(element);
} else if (SOAP_FAULT_DETAIL_LOCAL_NAME.equals(localName)) {
element =
factory.createSOAPFaultDetail((SOAPFault) parent,
- builder);
+ builder);
processNamespaceData(element, false);
processAttributes(element);
} else {
@@ -102,13 +99,13 @@
} else if (elementLevel == 5) {
- String parentTagName = "";
- if(parent instanceof Element) {
- parentTagName = ((Element)parent).getTagName();
- } else {
- parentTagName = parent.getLocalName();
- }
-
+ String parentTagName = "";
+ if (parent instanceof Element) {
+ parentTagName = ((Element) parent).getTagName();
+ } else {
+ parentTagName = parent.getLocalName();
+ }
+
if (parentTagName.equals(SOAP_FAULT_CODE_LOCAL_NAME)) {
throw new OMBuilderException(
"faultcode element should not have children");
@@ -131,9 +128,9 @@
} else if (elementLevel > 5) {
element =
this.factory.createOMElement(localName,
- null,
- parent,
- builder);
+ null,
+ parent,
+ builder);
processNamespaceData(element, false);
processAttributes(element);
}
@@ -146,7 +143,7 @@
int token = parser.next();
while (token != XMLStreamReader.END_ELEMENT) {
if (token == XMLStreamReader.CHARACTERS) {
- factory.createOMText(value, parser.getText());
+ factory.createOMText(value, parser.getText());
} else {
throw new SOAPProcessingException(
"Only Characters are allowed here");
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org