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 [12/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/...
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java Wed Mar 7 06:59:00 2007
@@ -17,14 +17,21 @@
package org.apache.axiom.om.impl.llom;
-import org.apache.axiom.om.*;
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMConstants;
+import org.apache.axiom.om.OMContainer;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
import org.apache.axiom.om.impl.OMNamespaceImpl;
import org.apache.axiom.om.impl.builder.XOPBuilder;
import org.apache.axiom.om.impl.util.OMSerializerUtil;
-import org.apache.axiom.om.util.Base64;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.om.util.TextHelper;
+import org.apache.axiom.om.util.UUIDGenerator;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -33,9 +40,7 @@
import java.io.InputStream;
public class OMTextImpl extends OMNodeImpl implements OMText, OMConstants {
- /**
- * Field nameSpace used when serializing Binary stuff as MTOM optimized.
- */
+ /** Field nameSpace used when serializing Binary stuff as MTOM optimized. */
public static final OMNamespace XOP_NS = new OMNamespaceImpl(
"http://www.w3.org/2004/08/xop/include", "xop");
@@ -51,27 +56,19 @@
protected boolean isBinary = false;
- /**
- * Field contentID for the mime part used when serializing Binary stuff as
- * MTOM optimized.
- */
+ /** Field contentID for the mime part used when serializing Binary stuff as MTOM optimized. */
private String contentID = null;
/**
- * Field dataHandler contains the DataHandler
- * Declaring as Object to remove the dependency on
+ * Field dataHandler contains the DataHandler Declaring as Object to remove the dependency on
* Javax.activation.DataHandler
*/
private Object dataHandlerObject = null;
- /**
- * Field localName used when serializing Binary stuff as MTOM optimized.
- */
+ /** Field localName used when serializing Binary stuff as MTOM optimized. */
protected String localName = "Include";
- /**
- * Field attributes used when serializing Binary stuff as MTOM optimized.
- */
+ /** Field attributes used when serializing Binary stuff as MTOM optimized. */
protected OMAttribute attribute;
private static final String EMTPY_STRING = "";
@@ -92,7 +89,7 @@
public OMTextImpl(String s, int nodeType, OMFactory factory) {
this(null, s, nodeType, factory);
}
-
+
/**
* Constructor OMTextImpl.
*
@@ -126,7 +123,8 @@
OMFactory factory) {
super(parent, factory, true);
this.calcNS = true;
- this.textNS = ((OMElementImpl) parent).handleNamespace(text.getNamespaceURI(), text.getPrefix());
+ this.textNS =
+ ((OMElementImpl) parent).handleNamespace(text.getNamespaceURI(), text.getPrefix());
this.value = text == null ? EMTPY_STRING : text.getLocalPart();
this.nodeType = nodeType;
}
@@ -142,8 +140,7 @@
/**
* @param parent
- * @param s -
- * base64 encoded String representation of Binary
+ * @param s - base64 encoded String representation of Binary
* @param mimeType of the Binary
*/
public OMTextImpl(OMContainer parent, String s, String mimeType,
@@ -156,9 +153,7 @@
this.nodeType = TEXT_NODE;
}
- /**
- * @param dataHandler To send binary optimised content Created programatically.
- */
+ /** @param dataHandler To send binary optimised content Created programatically. */
public OMTextImpl(Object dataHandler, OMFactory factory) {
this(dataHandler, true, factory);
}
@@ -179,9 +174,9 @@
/**
* @param contentID
* @param parent
- * @param builder Used when the builder is encountered with a XOP:Include tag
- * Stores a reference to the builder and the content-id. Supports
- * deferred parsing of MIME messages.
+ * @param builder Used when the builder is encountered with a XOP:Include tag Stores a
+ * reference to the builder and the content-id. Supports deferred parsing of
+ * MIME messages.
*/
public OMTextImpl(String contentID, OMContainer parent,
OMXMLParserWrapper builder, OMFactory factory) {
@@ -218,9 +213,7 @@
}
}
- /**
- * Returns the value.
- */
+ /** Returns the value. */
public String getText() throws OMException {
if (getNamespace() != null) {
return getTextString();
@@ -252,12 +245,10 @@
}
- /**
- * Returns the value.
- */
+ /** Returns the value. */
public QName getTextAsQName() throws OMException {
OMNamespace ns = getNamespace();
- if (ns != null) {
+ if (ns != null) {
String prefix = ns.getPrefix();
String name = ns.getNamespaceURI();
if (prefix == null || "".equals(prefix)) {
@@ -275,11 +266,11 @@
}
}
}
-
- /* (non-Javadoc)
- * @see org.apache.axiom.om.OMText#getNamespace()
- */
- public OMNamespace getNamespace() {
+
+ /* (non-Javadoc)
+ * @see org.apache.axiom.om.OMText#getNamespace()
+ */
+ public OMNamespace getNamespace() {
// If the namespace has already been determined, return it
// Otherwise calculate the namespace if the text contains a colon and is not detached.
if (calcNS) {
@@ -292,17 +283,17 @@
int colon = text.indexOf(':');
if (colon > 0) {
textNS = ((OMElementImpl) getParent()).
- findNamespaceURI(text.substring(0,colon));
+ findNamespaceURI(text.substring(0, colon));
if (textNS != null) {
charArray = null;
- value = text.substring(colon+1);
+ value = text.substring(colon + 1);
}
}
}
}
}
- return textNS;
- }
+ return textNS;
+ }
public boolean isOptimized() {
return optimize;
@@ -316,17 +307,16 @@
}
/**
- * Receiving binary can happen as either MTOM attachments or as Base64 Text
- * In the case of Base64 user has to explicitly specify that the content is
- * binary, before calling getDataHandler(), getInputStream()....
- */
- public void setBinary(boolean value) {
- isBinary = value;
- }
-
- public boolean isBinary()
- {
- return isBinary;
+ * Receiving binary can happen as either MTOM attachments or as Base64 Text In the case of
+ * Base64 user has to explicitly specify that the content is binary, before calling
+ * getDataHandler(), getInputStream()....
+ */
+ public void setBinary(boolean value) {
+ isBinary = value;
+ }
+
+ public boolean isBinary() {
+ return isBinary;
}
@@ -339,7 +329,8 @@
OMNamespace ns = getNamespace();
if ((value != null || charArray != null || ns != null) & isBinary) {
String text = ns == null ? getTextFromProperPlace() : getTextString();
- return org.apache.axiom.attachments.utils.DataHandlerUtils.getDataHandlerFromText(text, mimeType);
+ return org.apache.axiom.attachments.utils.DataHandlerUtils
+ .getDataHandlerFromText(text, mimeType);
} else {
if (dataHandlerObject == null) {
@@ -377,7 +368,8 @@
getDataHandler();
}
InputStream inStream;
- javax.activation.DataHandler dataHandler = (javax.activation.DataHandler) dataHandlerObject;
+ javax.activation.DataHandler dataHandler =
+ (javax.activation.DataHandler) dataHandlerObject;
try {
inStream = dataHandler.getDataSource().getInputStream();
} catch (IOException e) {
@@ -404,13 +396,13 @@
}
private void internalSerializeLocal(XMLStreamWriter writer2) throws XMLStreamException {
-
- if ((!this.isBinary) ||(!this.isOptimized()) ) {
+
+ if ((!this.isBinary) || (!this.isOptimized())) {
writeOutput(writer2);
} else {
//check whether we have a MTOMXMLStreamWriter. if so
//we can optimize the writing!
- if (writer2 instanceof MTOMXMLStreamWriter){
+ if (writer2 instanceof MTOMXMLStreamWriter) {
MTOMXMLStreamWriter writer = (MTOMXMLStreamWriter) writer2;
if (writer.isOptimized()) {
if (contentID == null) {
@@ -418,7 +410,8 @@
}
// send binary as MTOM optimised
this.attribute = new OMAttributeImpl("href",
- new OMNamespaceImpl("", ""), "cid:" + getContentID(), this.factory);
+ new OMNamespaceImpl("", ""),
+ "cid:" + getContentID(), this.factory);
this.serializeStartpart(writer);
writer.writeOptimized(this);
writer.writeEndElement();
@@ -426,9 +419,9 @@
//do normal base64
writeOutput(writer);
}
- }else{
- //we do not have a optimized writer. Just do the normal
- //base64 writing
+ } else {
+ //we do not have a optimized writer. Just do the normal
+ //base64 writing
writeOutput(writer2);
}
@@ -447,17 +440,17 @@
writer.writeStartElement(nameSpaceName, this
.getLocalName());
} else {
- // According to StAX, setPrefix must occur before
- // writeStartElement
- if (OMSerializerUtil.isSetPrefixBeforeStartElement(writer)) {
- writer.setPrefix(prefix, nameSpaceName);
- writer.writeStartElement(prefix, this.getLocalName(),
- nameSpaceName);
- } else {
- writer.writeStartElement(prefix, this.getLocalName(),
- nameSpaceName);
- writer.setPrefix(prefix, nameSpaceName);
- }
+ // According to StAX, setPrefix must occur before
+ // writeStartElement
+ if (OMSerializerUtil.isSetPrefixBeforeStartElement(writer)) {
+ writer.setPrefix(prefix, nameSpaceName);
+ writer.writeStartElement(prefix, this.getLocalName(),
+ nameSpaceName);
+ } else {
+ writer.writeStartElement(prefix, this.getLocalName(),
+ nameSpaceName);
+ writer.setPrefix(prefix, nameSpaceName);
+ }
}
// add the elements attribute "href"
serializeAttribute(this.attribute, writer);
@@ -523,16 +516,16 @@
}
}
- /* (non-Javadoc)
- * @see org.apache.axiom.om.OMNode#buildAll()
- */
- public void buildWithAttachments() {
- if (!this.done) {
- this.build();
- }
- if (isOptimized()) {
- this.getDataHandler();
- }
- }
+ /* (non-Javadoc)
+ * @see org.apache.axiom.om.OMNode#buildAll()
+ */
+ public void buildWithAttachments() {
+ if (!this.done) {
+ this.build();
+ }
+ if (isOptimized()) {
+ this.getDataHandler();
+ }
+ }
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java Wed Mar 7 06:59:00 2007
@@ -16,23 +16,40 @@
package org.apache.axiom.om.impl.llom.factory;
-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.OMDataSource;
+import org.apache.axiom.om.OMDocType;
+import org.apache.axiom.om.OMDocument;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMProcessingInstruction;
+import org.apache.axiom.om.OMText;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.OMNamespaceImpl;
-import org.apache.axiom.om.impl.llom.*;
+import org.apache.axiom.om.impl.llom.OMAttributeImpl;
+import org.apache.axiom.om.impl.llom.OMCommentImpl;
+import org.apache.axiom.om.impl.llom.OMDocTypeImpl;
+import org.apache.axiom.om.impl.llom.OMDocumentImpl;
+import org.apache.axiom.om.impl.llom.OMElementImpl;
+import org.apache.axiom.om.impl.llom.OMProcessingInstructionImpl;
+import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
+import org.apache.axiom.om.impl.llom.OMTextImpl;
import javax.xml.namespace.QName;
import java.util.HashMap;
import java.util.Map;
-/**
- * Class OMLinkedListImplFactory
- */
+/** Class OMLinkedListImplFactory */
public class OMLinkedListImplFactory implements OMFactory {
private static final String uriAndPrefixSeparator = ";";
/**
- * This is a map of namespaces with the namespace URI as the key and
- * Namespace object itself as the value.
+ * This is a map of namespaces with the namespace URI as the key and Namespace object itself as
+ * the value.
*/
protected Map namespaceTable = new HashMap(5);
@@ -64,7 +81,7 @@
OMContainer parent,
OMXMLParserWrapper builder) {
return new OMElementImpl(localName, ns, parent,
- builder, this);
+ builder, this);
}
/**
@@ -78,8 +95,8 @@
public OMElement createOMElement(String localName, String namespaceURI,
String namespacePrefix) {
return this.createOMElement(localName,
- this.createOMNamespace(namespaceURI,
- namespacePrefix));
+ this.createOMNamespace(namespaceURI,
+ namespacePrefix));
}
/**
@@ -115,7 +132,7 @@
*/
public OMNamespace createOMNamespace(String uri, String prefix) {
String key = uri;
- if(prefix != null && prefix.length() > 0) {
+ if (prefix != null && prefix.length() > 0) {
key = key + uriAndPrefixSeparator + prefix;
}
OMNamespace existingNamespaceObject = (OMNamespace) namespaceTable.get(key);
@@ -244,7 +261,8 @@
* @param piData
* @return Returns OMProcessingInstruction.
*/
- public OMProcessingInstruction createOMProcessingInstruction(OMContainer parent, String piTarget, String piData) {
+ public OMProcessingInstruction createOMProcessingInstruction(OMContainer parent,
+ String piTarget, String piData) {
return new OMProcessingInstructionImpl(parent, piTarget, piData, this);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMXMLBuilderFactory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMXMLBuilderFactory.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMXMLBuilderFactory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMXMLBuilderFactory.java Wed Mar 7 06:59:00 2007
@@ -23,28 +23,18 @@
import javax.xml.stream.XMLStreamReader;
-/**
- * Class OMXMLBuilderFactory
- */
+/** Class OMXMLBuilderFactory */
public class OMXMLBuilderFactory {
- /**
- * Field PARSER_XPP
- */
+ /** Field PARSER_XPP */
public static final String PARSER_XPP = "XPP";
- /**
- * Field PARSER_STAX
- */
+ /** Field PARSER_STAX */
public static final String PARSER_STAX = "StAX";
- /**
- * Field MODEL_SOAP_SPECIFIC
- */
+ /** Field MODEL_SOAP_SPECIFIC */
public static final String MODEL_SOAP_SPECIFIC = "SOAP_SPECIFIC";
- /**
- * Field MODEL_OM
- */
+ /** Field MODEL_OM */
public static final String MODEL_OM = "OM_ONLY";
/**
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/AXIOMUtil.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/AXIOMUtil.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/AXIOMUtil.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/AXIOMUtil.java Wed Mar 7 06:59:00 2007
@@ -32,8 +32,9 @@
* @throws XMLStreamException
*/
public static OMElement stringToOM(String xmlFragment) throws XMLStreamException {
- if(xmlFragment != null){
- return new StAXOMBuilder(new ByteArrayInputStream(xmlFragment.getBytes())).getDocumentElement();
+ if (xmlFragment != null) {
+ return new StAXOMBuilder(new ByteArrayInputStream(xmlFragment.getBytes()))
+ .getDocumentElement();
}
return null;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/XMLComparator.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/XMLComparator.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/XMLComparator.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/util/XMLComparator.java Wed Mar 7 06:59:00 2007
@@ -28,31 +28,28 @@
import java.util.Vector;
-/**
- * @deprecated This class is outdated. Please use XmlUnit to compate two xml files.
- */
+/** @deprecated This class is outdated. Please use XmlUnit to compate two xml files. */
public class XMLComparator {
- /**
- * Eran Chinthaka (chinthaka@apache.org)
- */
+ /** Eran Chinthaka (chinthaka@apache.org) */
private Log log = LogFactory.getLog(getClass());
private Vector ignorableNamespaceList = new Vector();
- public void addIgnorableNamespace(String nsURI){
+ public void addIgnorableNamespace(String nsURI) {
ignorableNamespaceList.add(nsURI);
}
- public void clearIgnorableNamespaces(){
+ public void clearIgnorableNamespaces() {
ignorableNamespaceList.clear();
}
- public boolean compare(OMElement elementOne, OMElement elementTwo) throws XMLComparisonException {
+ public boolean compare(OMElement elementOne, OMElement elementTwo)
+ throws XMLComparisonException {
//ignore if the elements belong to any of the ignorable namespaces list
if (isIgnorable(elementOne) ||
- isIgnorable(elementTwo)){
+ isIgnorable(elementTwo)) {
return true;
}
@@ -71,8 +68,8 @@
log.info(
"Now Checking " + elementOne.getLocalName() + " and " +
- elementTwo.getLocalName() +
- "=============================");
+ elementTwo.getLocalName() +
+ "=============================");
log.info("Comparing Element Names .......");
compare("Elements names are not equal. ",
@@ -120,25 +117,26 @@
}
- private boolean isIgnorable(OMElement elt){
- if (elt!=null){
+ private boolean isIgnorable(OMElement elt) {
+ if (elt != null) {
OMNamespace namespace = elt.getNamespace();
- if (namespace!=null){
- return ignorableNamespaceList.contains(namespace.getNamespaceURI());
- }else{
- return false;
+ if (namespace != null) {
+ return ignorableNamespaceList.contains(namespace.getNamespaceURI());
+ } else {
+ return false;
}
- }else{
+ } else {
return false;
}
}
- private void compareChildren(OMElement elementOne, OMElement elementTwo) throws XMLComparisonException {
+ private void compareChildren(OMElement elementOne, OMElement elementTwo)
+ throws XMLComparisonException {
//ignore if the elements belong to any of the ignorable namespaces list
if (isIgnorable(elementOne) ||
- isIgnorable(elementTwo)){
- return ;
+ isIgnorable(elementTwo)) {
+ return;
}
Iterator elementOneChildren = elementOne.getChildren();
while (elementOneChildren.hasNext()) {
@@ -147,16 +145,16 @@
OMElement elementOneChild = (OMElement) omNode;
OMElement elementTwoChild = null;
//Do the comparison only if the element is not ignorable
- if (!isIgnorable(elementOneChild)){
+ if (!isIgnorable(elementOneChild)) {
elementTwoChild = elementTwo.getFirstChildWithName(
elementOneChild.getQName());
//Do the comparison only if the element is not ignorable
- if (!isIgnorable(elementTwoChild)){
+ if (!isIgnorable(elementTwoChild)) {
if (elementTwoChild == null) {
throw new XMLComparisonException(
" There is no " + elementOneChild.getLocalName() +
- " element under " +
- elementTwo.getLocalName());
+ " element under " +
+ elementTwo.getLocalName());
}
}
}
@@ -166,7 +164,8 @@
}
- private void compareAttibutes(OMElement elementOne, OMElement elementTwo) throws XMLComparisonException {
+ private void compareAttibutes(OMElement elementOne, OMElement elementTwo)
+ throws XMLComparisonException {
int elementOneAtribCount = 0;
int elementTwoAtribCount = 0;
Iterator attributes = elementOne.getAllAttributes();
@@ -177,8 +176,8 @@
if (attr == null) {
throw new XMLComparisonException(
"Attributes are not the same in two elements. Attribute " +
- omAttribute.getLocalName() +
- " != ");
+ omAttribute.getLocalName() +
+ " != ");
}
elementOneAtribCount++;
}
@@ -196,7 +195,8 @@
}
}
- private void compare(String failureNotice, String one, String two) throws XMLComparisonException {
+ private void compare(String failureNotice, String one, String two)
+ throws XMLComparisonException {
if (!one.equals(two)) {
throw new XMLComparisonException(
failureNotice + one + " != " + two);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPBodyImpl.java Wed Mar 7 06:59:00 2007
@@ -31,26 +31,20 @@
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPProcessingException;
-/**
- * Class SOAPBodyImpl
- */
+/** Class SOAPBodyImpl */
public abstract class SOAPBodyImpl extends SOAPElement
implements SOAPBody, OMConstants {
- /**
- * Field hasSOAPFault
- */
+ /** Field hasSOAPFault */
private boolean hasSOAPFault = false;
- protected SOAPBodyImpl(String localName, OMNamespace ns,
- SOAPFactory factory) {
+ protected SOAPBodyImpl(String localName, OMNamespace ns,
+ SOAPFactory factory) {
super(localName, ns, factory);
}
- /**
- * @param envelope
- */
- public SOAPBodyImpl(SOAPEnvelope envelope, SOAPFactory factory)
- throws SOAPProcessingException {
+ /** @param envelope */
+ public SOAPBodyImpl(SOAPEnvelope envelope, SOAPFactory factory)
+ throws SOAPProcessingException {
super(envelope, SOAPConstants.BODY_LOCAL_NAME, true, factory);
}
@@ -61,14 +55,14 @@
* @param envelope
* @param builder
*/
- public SOAPBodyImpl(SOAPEnvelope envelope, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ public SOAPBodyImpl(SOAPEnvelope envelope, OMXMLParserWrapper builder,
+ SOAPFactory factory) {
super(envelope, SOAPConstants.BODY_LOCAL_NAME, builder, factory);
}
/**
- * 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
@@ -79,12 +73,11 @@
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 boolean hasFault() {
if (hasSOAPFault) {
@@ -98,9 +91,9 @@
&&
(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
element.getNamespace().getNamespaceURI())
- ||
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
- element.getNamespace().getNamespaceURI()))) { //added this line
+ ||
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
+ element.getNamespace().getNamespaceURI()))) { //added this line
hasSOAPFault = true;
return true;
} else {
@@ -110,11 +103,9 @@
}
/**
- * 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 SOAPFault getFault() {
OMElement element = getFirstElement();
@@ -127,9 +118,9 @@
&&
(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
element.getNamespace().getNamespaceURI())
- ||
- SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
- element.getNamespace().getNamespaceURI()))) { //added this line
+ ||
+ SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
+ element.getNamespace().getNamespaceURI()))) { //added this line
hasSOAPFault = true;
return (SOAPFault) element;
} else {
@@ -161,6 +152,7 @@
}
public OMNode detach() throws OMException {
- throw new SOAPProcessingException("Can not detach SOAP Body, SOAP Envelope must have a Body !!");
+ throw new SOAPProcessingException(
+ "Can not detach SOAP Body, SOAP Envelope must have a Body !!");
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPElement.java Wed Mar 7 06:59:00 2007
@@ -60,14 +60,12 @@
* @param localName
* @param ns
*/
- protected SOAPElement(String localName, OMNamespace ns,
- SOAPFactory factory) {
+ protected SOAPElement(String localName, OMNamespace ns,
+ SOAPFactory factory) {
super(localName, ns, factory);
}
- /**
- * This has to be implemented by all the derived classes to check for the correct parent.
- */
+ /** This has to be implemented by all the derived classes to check for the correct parent. */
protected abstract void checkParent(OMElement parent) throws SOAPProcessingException;
public void setParent(OMContainer element) {
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPEnvelopeImpl.java Wed Mar 7 06:59:00 2007
@@ -16,10 +16,6 @@
package org.apache.axiom.soap.impl.llom;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMElement;
@@ -39,41 +35,36 @@
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPProcessingException;
-/**
- * Class SOAPEnvelopeImpl
- */
+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 final QName HEADER_QNAME = new QName(SOAPConstants.HEADER_LOCAL_NAME);
- /**
- * @param builder
- */
+ /** @param builder */
public SOAPEnvelopeImpl(OMXMLParserWrapper builder, SOAPFactory factory) {
super(null, SOAPConstants.SOAPENVELOPE_LOCAL_NAME, builder, factory);
this.factory = factory;
}
- /**
- * @param ns
- */
+ /** @param ns */
public SOAPEnvelopeImpl(OMNamespace ns, SOAPFactory factory) {
super(SOAPConstants.SOAPENVELOPE_LOCAL_NAME, ns, factory);
this.factory = factory;
}
/**
- * 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>
+ * 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
* @throws OMException
*/
public SOAPHeader getHeader() throws OMException {
@@ -91,7 +82,7 @@
return null;
}
- return (SOAPHeader)header;
+ return (SOAPHeader) header;
}
private void inferFactory() {
@@ -106,9 +97,11 @@
}
public void addChild(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);
+ 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);
} else {
if (this.done && (child instanceof SOAPHeader)) {
SOAPBody body = getBody();
@@ -122,15 +115,14 @@
}
/**
- * 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
+ * @return the <CODE>SOAPBody</CODE> object for this <CODE> SOAPEnvelope</CODE> object or
+ * <CODE>null</CODE> if there is none
* @throws org.apache.axiom.om.OMException
- * if there is a problem obtaining
- * the <CODE>SOAPBody</CODE> object
+ * if there is a problem obtaining the <CODE>SOAPBody</CODE> object
* @throws OMException
*/
public SOAPBody getBody() throws OMException {
@@ -150,7 +142,8 @@
SOAPConstants.BODY_LOCAL_NAME.equals(element.getLocalName())) {
return (SOAPBody) element;
} else {
- throw new OMException("SOAPEnvelope must contain a body element which is either first or second child element of the SOAPEnvelope.");
+ throw new OMException(
+ "SOAPEnvelope must contain a body element which is either first or second child element of the SOAPEnvelope.");
}
}
}
@@ -177,61 +170,61 @@
}
protected 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 = getFirstChildWithName(HEADER_QNAME);
- if ((header != null) && (header.getFirstOMChild() != null)) {
- ((SOAPHeaderImpl) header).internalSerialize(writer);
- }
- SOAPBody body = getBody();
- //REVIEW: getBody has statements to return null..Can it be null in any case?
- if (body != null) {
- ((SOAPBodyImpl) body).internalSerialize(writer);
- }
- 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 = getFirstChildWithName(HEADER_QNAME);
- 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);
- }
- }
- }
-
- private void serializeInternally(OMNodeImpl child, MTOMXMLStreamWriter writer)
- throws XMLStreamException {
- if ((!(child instanceof OMElement)) || child.isComplete() || child.builder == null) {
- child.internalSerializeAndConsume(writer);
- } else {
- OMElement element = (OMElement) child;
- element.getBuilder().setCache(false);
- OMSerializerUtil.serializeByPullStream(element, writer, false);
- }
- child = (OMNodeImpl) child.getNextOMSibling();
- }
+ 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 = getFirstChildWithName(HEADER_QNAME);
+ if ((header != null) && (header.getFirstOMChild() != null)) {
+ ((SOAPHeaderImpl) header).internalSerialize(writer);
+ }
+ SOAPBody body = getBody();
+ //REVIEW: getBody has statements to return null..Can it be null in any case?
+ if (body != null) {
+ ((SOAPBodyImpl) body).internalSerialize(writer);
+ }
+ 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 = getFirstChildWithName(HEADER_QNAME);
+ 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);
+ }
+ }
+ }
+
+ private void serializeInternally(OMNodeImpl child, MTOMXMLStreamWriter writer)
+ throws XMLStreamException {
+ if ((!(child instanceof OMElement)) || child.isComplete() || child.builder == null) {
+ child.internalSerializeAndConsume(writer);
+ } else {
+ OMElement element = (OMElement) child;
+ element.getBuilder().setCache(false);
+ OMSerializerUtil.serializeByPullStream(element, writer, false);
+ }
+ child = (OMNodeImpl) child.getNextOMSibling();
+ }
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultCodeImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultCodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultCodeImpl.java Wed Mar 7 06:59:00 2007
@@ -39,14 +39,14 @@
}
public SOAPFaultCodeImpl(SOAPFault parent, String localName, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, localName, builder, factory);
}
public SOAPFaultCodeImpl(SOAPFault parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
this(parent, SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME, builder,
- factory);
+ factory);
}
public SOAPFaultCodeImpl(SOAPFault parent,
@@ -54,16 +54,16 @@
boolean extractNamespaceFromParent,
SOAPFactory factory) throws SOAPProcessingException {
super(parent,
- localName,
- extractNamespaceFromParent, factory);
+ localName,
+ extractNamespaceFromParent, factory);
}
public SOAPFaultCodeImpl(SOAPFault parent,
boolean extractNamespaceFromParent,
SOAPFactory factory) throws SOAPProcessingException {
this(parent,
- SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME,
- extractNamespaceFromParent, factory);
+ SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME,
+ extractNamespaceFromParent, factory);
}
public void setValue(SOAPFaultValue value) throws SOAPProcessingException {
@@ -72,7 +72,7 @@
public SOAPFaultValue getValue() {
return (SOAPFaultValue) ElementHelper.getChildWithName(this,
- SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME);
+ SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME);
}
public void setSubCode(SOAPFaultSubCode value) throws SOAPProcessingException {
@@ -81,7 +81,7 @@
public SOAPFaultSubCode getSubCode() {
return (SOAPFaultSubCode) ElementHelper.getChildWithName(this,
- SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME);
+ SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME);
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultDetailImpl.java Wed Mar 7 06:59:00 2007
@@ -21,9 +21,8 @@
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.llom.OMNodeImpl;
-import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter;
-import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
@@ -42,18 +41,18 @@
}
protected SOAPFaultDetailImpl(SOAPFault parent,
- boolean extractNamespaceFromParent,
+ boolean extractNamespaceFromParent,
SOAPFactory factory) throws SOAPProcessingException {
super(parent,
- SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME,
- extractNamespaceFromParent, factory);
+ SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME,
+ extractNamespaceFromParent, factory);
}
protected SOAPFaultDetailImpl(SOAPFault parent,
OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME, builder,
- factory);
+ factory);
}
public void addDetailEntry(OMElement detailElement) {
@@ -64,7 +63,8 @@
return this.getChildren();
}
- protected void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
+ protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+ throws XMLStreamException {
// select the builder
short builderType = PULL_TYPE_BUILDER; // default is pull type
if (builder != null) {
@@ -72,12 +72,13 @@
}
if ((builderType == PUSH_TYPE_BUILDER)
&& (builder.getRegisteredContentHandler() == null)) {
- builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(writer));
+ builder.registerExternalContentHandler(
+ new StreamWriterToContentHandlerConverter(writer));
}
- OMSerializerUtil.serializeStartpart(this,
- SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME,
- writer);
+ OMSerializerUtil.serializeStartpart(this,
+ SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME,
+ writer);
String text = this.getText();
writer.writeCharacters(text);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultImpl.java Wed Mar 7 06:59:00 2007
@@ -23,9 +23,9 @@
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.OMNodeEx;
-import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.om.impl.llom.OMElementImpl;
import org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPConstants;
@@ -45,9 +45,7 @@
import java.io.StringWriter;
import java.util.Iterator;
-/**
- * Class SOAPFaultImpl
- */
+/** Class SOAPFaultImpl */
public abstract class SOAPFaultImpl extends SOAPElement
implements SOAPFault, OMConstants {
@@ -63,7 +61,8 @@
* @param parent
* @param e
*/
- public SOAPFaultImpl(SOAPBody parent, Exception e, SOAPFactory factory) throws SOAPProcessingException {
+ public SOAPFaultImpl(SOAPBody parent, Exception e, SOAPFactory factory)
+ throws SOAPProcessingException {
super(parent, SOAPConstants.SOAPFAULT_LOCAL_NAME, true, factory);
setException(e);
}
@@ -84,12 +83,13 @@
* @param builder
*/
public SOAPFaultImpl(SOAPBody parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, SOAPConstants.SOAPFAULT_LOCAL_NAME, builder, factory);
}
- protected abstract SOAPFaultDetail getNewSOAPFaultDetail(SOAPFault fault) throws SOAPProcessingException;
+ protected abstract SOAPFaultDetail getNewSOAPFaultDetail(SOAPFault fault)
+ throws SOAPProcessingException;
// --------------- Getters and Settors --------------------------- //
@@ -138,9 +138,7 @@
SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME);
}
- /**
- * If exception detailElement is not there we will return null
- */
+ /** If exception detailElement is not there we will return null */
public Exception getException() throws OMException {
SOAPFaultDetail detail = getDetail();
if (detail == null) {
@@ -193,7 +191,8 @@
return null;
}
- protected void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
+ protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+ throws XMLStreamException {
// select the builder
short builderType = PULL_TYPE_BUILDER; // default is pull type
if (builder != null) {
@@ -201,7 +200,8 @@
}
if ((builderType == PUSH_TYPE_BUILDER)
&& (builder.getRegisteredContentHandler() == null)) {
- builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(writer));
+ builder.registerExternalContentHandler(
+ new StreamWriterToContentHandlerConverter(writer));
}
// this is a special case. This fault element may contain its children in any order. But spec mandates a specific order
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultNodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultNodeImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultNodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultNodeImpl.java Wed Mar 7 06:59:00 2007
@@ -19,8 +19,8 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.OMNodeEx;
-import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
@@ -53,47 +53,49 @@
return this.getText();
}
- protected void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
- // select the builder
- short builderType = PULL_TYPE_BUILDER; // default is pull type
- if (builder != null) {
- builderType = this.builder.getBuilderType();
- }
- if ((builderType == PUSH_TYPE_BUILDER)
- && (builder.getRegisteredContentHandler() == null)) {
- builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(writer));
- }
+ protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+ throws XMLStreamException {
+ // select the builder
+ short builderType = PULL_TYPE_BUILDER; // default is pull type
+ if (builder != null) {
+ builderType = this.builder.getBuilderType();
+ }
+ if ((builderType == PUSH_TYPE_BUILDER)
+ && (builder.getRegisteredContentHandler() == null)) {
+ builder.registerExternalContentHandler(
+ new StreamWriterToContentHandlerConverter(writer));
+ }
- if (!cache) {
- //No caching
- if (this.firstChild != null) {
+ if (!cache) {
+ //No caching
+ if (this.firstChild != null) {
+ OMSerializerUtil.serializeStartpart(this, writer);
+ ((OMNodeEx) firstChild).internalSerializeAndConsume(writer);
+ OMSerializerUtil.serializeEndpart(writer);
+ } else if (!this.done) {
+ if (builderType == PULL_TYPE_BUILDER) {
+ OMSerializerUtil.serializeByPullStream(this, writer);
+ } else {
OMSerializerUtil.serializeStartpart(this, writer);
- ((OMNodeEx)firstChild).internalSerializeAndConsume(writer);
+ builder.setCache(cache);
+ builder.next();
OMSerializerUtil.serializeEndpart(writer);
- } else if (!this.done) {
- if (builderType == PULL_TYPE_BUILDER) {
- OMSerializerUtil.serializeByPullStream(this, writer);
- } else {
- OMSerializerUtil.serializeStartpart(this, writer);
- builder.setCache(cache);
- builder.next();
- OMSerializerUtil.serializeEndpart(writer);
- }
- } else {
- OMSerializerUtil.serializeNormal(this, writer, cache);
}
- // do not serialise the siblings
-
-
} else {
- //Cached
OMSerializerUtil.serializeNormal(this, writer, cache);
-
- // do not serialise the siblings
}
+ // do not serialise the siblings
+
+ } else {
+ //Cached
+ OMSerializerUtil.serializeNormal(this, writer, cache);
+ // do not serialise the siblings
}
+
+
+ }
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultReasonImpl.java Wed Mar 7 06:59:00 2007
@@ -18,8 +18,8 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPFactory;
@@ -28,9 +28,9 @@
import org.apache.axiom.soap.SOAPFaultText;
import org.apache.axiom.soap.SOAPProcessingException;
-import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
public abstract class SOAPFaultReasonImpl extends SOAPElement implements SOAPFaultReason {
@@ -47,19 +47,17 @@
public SOAPFaultReasonImpl(SOAPFault parent, OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME, builder,
- factory);
+ factory);
}
- /**
- * @param parent
- */
+ /** @param parent */
public SOAPFaultReasonImpl(OMElement parent,
boolean extractNamespaceFromParent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent,
- SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME,
- extractNamespaceFromParent,
- factory);
+ SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME,
+ extractNamespaceFromParent,
+ factory);
}
public void addSOAPText(SOAPFaultText soapFaultText) throws SOAPProcessingException {
@@ -68,7 +66,7 @@
public SOAPFaultText getFirstSOAPText() {
return (SOAPFaultText) ElementHelper.getChildWithName(this,
- SOAP12Constants.SOAP_FAULT_TEXT_LOCAL_NAME);
+ SOAP12Constants.SOAP_FAULT_TEXT_LOCAL_NAME);
}
public List getAllSoapTexts() {
@@ -87,8 +85,8 @@
Iterator childrenIter = this.getChildren();
while (childrenIter.hasNext()) {
OMNode node = (OMNode) childrenIter.next();
- if (node.getType() == OMNode.ELEMENT_NODE && (node instanceof SOAPFaultTextImpl) && language.equals(((SOAPFaultTextImpl) node).getLang()))
- {
+ if (node.getType() == OMNode.ELEMENT_NODE && (node instanceof SOAPFaultTextImpl) &&
+ language.equals(((SOAPFaultTextImpl) node).getLang())) {
return (SOAPFaultText) node;
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultRoleImpl.java Wed Mar 7 06:59:00 2007
@@ -19,8 +19,8 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.OMNodeEx;
-import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.om.impl.serialize.StreamWriterToContentHandlerConverter;
+import org.apache.axiom.om.impl.util.OMSerializerUtil;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
@@ -29,7 +29,8 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-public abstract class SOAPFaultRoleImpl extends SOAPElement implements org.apache.axiom.soap.SOAPFaultRole {
+public abstract class SOAPFaultRoleImpl extends SOAPElement
+ implements org.apache.axiom.soap.SOAPFaultRole {
protected SOAPFaultRoleImpl(OMNamespace ns, SOAPFactory factory) {
super(SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME, ns, factory);
@@ -39,9 +40,9 @@
boolean extractNamespaceFromParent,
SOAPFactory factory) throws SOAPProcessingException {
super(parent,
- SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME,
- extractNamespaceFromParent,
- factory);
+ SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME,
+ extractNamespaceFromParent,
+ factory);
}
public SOAPFaultRoleImpl(SOAPFault parent, OMXMLParserWrapper builder,
@@ -57,7 +58,8 @@
return this.getText();
}
- protected void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
+ protected void internalSerialize(XMLStreamWriter writer, boolean cache)
+ throws XMLStreamException {
// select the builder
short builderType = PULL_TYPE_BUILDER; // default is pull type
if (builder != null) {
@@ -65,14 +67,15 @@
}
if ((builderType == PUSH_TYPE_BUILDER)
&& (builder.getRegisteredContentHandler() == null)) {
- builder.registerExternalContentHandler(new StreamWriterToContentHandlerConverter(writer));
+ builder.registerExternalContentHandler(
+ new StreamWriterToContentHandlerConverter(writer));
}
if (!cache) {
//No caching
if (this.firstChild != null) {
OMSerializerUtil.serializeStartpart(this, writer);
- ((OMNodeEx)firstChild).internalSerializeAndConsume(writer);
+ ((OMNodeEx) firstChild).internalSerializeAndConsume(writer);
OMSerializerUtil.serializeEndpart(writer);
} else if (!this.done) {
if (builderType == PULL_TYPE_BUILDER) {
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultSubCodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultSubCodeImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultSubCodeImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultSubCodeImpl.java Wed Mar 7 06:59:00 2007
@@ -37,7 +37,7 @@
protected SOAPFaultSubCodeImpl(OMElement parent, String localName,
- SOAPFactory factory) throws SOAPProcessingException {
+ SOAPFactory factory) throws SOAPProcessingException {
super(parent, localName, true, factory);
}
@@ -56,7 +56,7 @@
if (value == null) {
value =
(SOAPFaultValue) ElementHelper.getChildWithName(this,
- SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME);
+ SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME);
}
return value;
}
@@ -70,7 +70,7 @@
if (subCode == null) {
subCode =
(SOAPFaultSubCode) ElementHelper.getChildWithName(this,
- SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME);
+ SOAP12Constants.SOAP_FAULT_SUB_CODE_LOCAL_NAME);
}
return subCode;
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultTextImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultTextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultTextImpl.java Wed Mar 7 06:59:00 2007
@@ -52,7 +52,7 @@
OMXMLParserWrapper builder,
SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_TEXT_LOCAL_NAME, builder,
- factory);
+ factory);
this.langNamespace = factory.createOMNamespace(
SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_URI,
SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX);
@@ -76,8 +76,8 @@
langAttr =
this.getAttribute(
new QName(langNamespace.getNamespaceURI(),
- SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME,
- SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX));
+ SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME,
+ SOAP12Constants.SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX));
}
return langAttr == null ? null : langAttr.getAttributeValue();
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultValueImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultValueImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultValueImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPFaultValueImpl.java Wed Mar 7 06:59:00 2007
@@ -29,7 +29,7 @@
protected SOAPFaultValueImpl(OMElement parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME, true,
- factory);
+ factory);
}
protected SOAPFaultValueImpl(OMNamespace ns, SOAPFactory factory) {
@@ -37,15 +37,15 @@
}
protected SOAPFaultValueImpl(OMElement parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME, builder,
- factory);
+ factory);
}
protected SOAPFaultValueImpl(String localName, OMElement parent, SOAPFactory factory)
throws SOAPProcessingException {
super(parent, localName, true,
- factory);
+ factory);
}
protected SOAPFaultValueImpl(OMNamespace ns, String localName, SOAPFactory factory) {
@@ -53,8 +53,8 @@
}
protected SOAPFaultValueImpl(OMElement parent, String localName, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, localName, builder,
- factory);
+ factory);
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java Wed Mar 7 06:59:00 2007
@@ -31,9 +31,7 @@
import javax.xml.namespace.QName;
-/**
- * Class SOAPHeaderBlockImpl
- */
+/** Class SOAPHeaderBlockImpl */
public abstract class SOAPHeaderBlockImpl extends OMElementImpl
implements SOAPHeaderBlock {
@@ -47,7 +45,7 @@
/**
* @param localName
* @param ns
- * @param parent
+ * @param parent
*/
public SOAPHeaderBlockImpl(String localName,
OMNamespace ns,
@@ -75,7 +73,7 @@
/**
* @param attributeName
* @param attrValue
- * @param soapEnvelopeNamespaceURI
+ * @param soapEnvelopeNamespaceURI
*/
protected void setAttribute(String attributeName,
String attrValue,
@@ -86,9 +84,10 @@
omAttribute.setAttributeValue(attrValue);
} else {
OMAttribute attribute = new OMAttributeImpl(attributeName,
- new OMNamespaceImpl(soapEnvelopeNamespaceURI,
- SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX),
- attrValue, this.factory);
+ new OMNamespaceImpl(
+ soapEnvelopeNamespaceURI,
+ SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX),
+ attrValue, this.factory);
this.addAttribute(attribute);
}
}
@@ -97,7 +96,7 @@
* Method getAttribute.
*
* @param attrName
- * @param soapEnvelopeNamespaceURI
+ * @param soapEnvelopeNamespaceURI
* @return Returns String.
*/
protected String getAttribute(String attrName,
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderImpl.java Wed Mar 7 06:59:00 2007
@@ -16,15 +16,22 @@
package org.apache.axiom.soap.impl.llom;
-import org.apache.axiom.om.*;
-import org.apache.axiom.soap.*;
+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.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.SOAPHeaderBlock;
+import org.apache.axiom.soap.SOAPProcessingException;
import java.util.ArrayList;
import java.util.Iterator;
-/**
- * Class SOAPHeaderImpl
- */
+/** Class SOAPHeaderImpl */
public abstract class SOAPHeaderImpl extends SOAPElement implements SOAPHeader {
@@ -32,9 +39,7 @@
super(SOAPConstants.HEADER_LOCAL_NAME, ns, factory);
}
- /**
- * @param envelope
- */
+ /** @param envelope */
public SOAPHeaderImpl(SOAPEnvelope envelope, SOAPFactory factory)
throws SOAPProcessingException {
super(envelope, SOAPConstants.HEADER_LOCAL_NAME, true, factory);
@@ -48,18 +53,18 @@
* @param builder
*/
public SOAPHeaderImpl(SOAPEnvelope envelope, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(envelope, SOAPConstants.HEADER_LOCAL_NAME, builder, factory);
}
/**
- * 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
* @throws OMException
@@ -70,28 +75,25 @@
/**
* Returns a list of all the <CODE>SOAPHeaderBlock</CODE> objects in this
- * <CODE>SOAPHeader</CODE> object that have the the specified actor. An
- * actor is a global attribute that indicates the intermediate parties to
- * whom the message should be sent. An actor receives the message and then
- * sends it to the next actor. The default actor is the ultimate intended
- * recipient for the message, so if no actor attribute is included in a
- * <CODE>SOAPHeader</CODE> object, the message is sent to its ultimate
- * destination.
- *
- * @param paramRole a <CODE>String</CODE> giving the URI of the actor for
- * which to search
- * @return an <CODE>Iterator</CODE> object over all the <CODE>
- * SOAPHeaderBlock</CODE> objects that contain the specified actor
+ * <CODE>SOAPHeader</CODE> object that have the the specified actor. An actor is a global
+ * attribute that indicates the intermediate parties to whom the message should be sent. An
+ * actor receives the message and then sends it to the next actor. The default actor is the
+ * ultimate intended recipient for the message, so if no actor attribute is included in a
+ * <CODE>SOAPHeader</CODE> object, the message is sent to its ultimate destination.
+ *
+ * @param paramRole a <CODE>String</CODE> giving the URI of the actor for which to search
+ * @return an <CODE>Iterator</CODE> object over all the <CODE> SOAPHeaderBlock</CODE> objects
+ * that contain the specified actor
* @see #extractHeaderBlocks(String) extractHeaderBlocks(java.lang.String)
*/
public Iterator examineHeaderBlocks(String paramRole) {
Iterator headerBlocksIter = this.getChildren();
ArrayList headersWithGivenActor = new ArrayList();
-
- if(paramRole == null || "".equals(paramRole)){
- return returnAllSOAPHeaders(this.getChildren());
- }
-
+
+ if (paramRole == null || "".equals(paramRole)) {
+ return returnAllSOAPHeaders(this.getChildren());
+ }
+
while (headerBlocksIter.hasNext()) {
Object o = headerBlocksIter.next();
if (o instanceof SOAPHeaderBlock) {
@@ -106,45 +108,40 @@
}
private Iterator returnAllSOAPHeaders(Iterator children) {
- ArrayList headers = new ArrayList();
- while (children.hasNext()) {
+ ArrayList headers = new ArrayList();
+ while (children.hasNext()) {
Object o = children.next();
if (o instanceof SOAPHeaderBlock) {
headers.add(o);
}
}
-
- return headers.iterator();
-
- }
- /**
+ return headers.iterator();
+
+ }
+
+ /**
* 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 an <CODE>Iterator</CODE> object over all the <CODE>
- * SOAPHeaderBlock</CODE> objects that contain the specified role
+ * <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 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
- * actor and that have a MustUnderstand attribute whose value is equivalent
- * to <code>true</code>.
- *
- * @param actor a <code>String</code> giving the URI of the actor for which
- * to search
- * @return an <code>Iterator</code> object over all the
- * <code>SOAPHeaderBlock</code> objects that contain the specified
- * actor and are marked as MustUnderstand
+ * Returns an <code>Iterator</code> over all the <code>SOAPHeaderBlock</code> objects in this
+ * <code>SOAPHeader</code> object that have the specified actor and that have a MustUnderstand
+ * attribute whose value is equivalent to <code>true</code>.
+ *
+ * @param actor a <code>String</code> giving the URI of the actor for which to search
+ * @return an <code>Iterator</code> object over all the <code>SOAPHeaderBlock</code> objects
+ * that contain the specified actor and are marked as MustUnderstand
*/
public Iterator examineMustUnderstandHeaderBlocks(String actor) {
Iterator headerBlocksIter = this.getChildren();
@@ -165,27 +162,23 @@
}
/**
- * Returns an <code>Iterator</code> over all the <code>SOAPHeaderBlock</code>
- * objects in this <code>SOAPHeader</code> object. Not that this will return
- * elements containing the QName (http://schemas.xmlsoap.org/soap/envelope/,
- * Header)
- *
- * @return 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. Not that this will return elements containing the QName
+ * (http://schemas.xmlsoap.org/soap/envelope/, Header)
+ *
+ * @return an <code>Iterator</code> object over all the <code>SOAPHeaderBlock</code> objects
+ * contained by this <code>SOAPHeader</code>
*/
public Iterator examineAllHeaderBlocks() {
return this.getChildrenWithName(null);
}
/**
- * 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 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 an <code>Iterator</code> object over all the <code>SOAPHeaderBlock</code> objects
+ * contained by this <code>SOAPHeader</code>
*/
public Iterator extractAllHeaderBlocks() {
throw new UnsupportedOperationException(); // TODO implement this
@@ -207,11 +200,11 @@
header = (OMElement) node;
OMNamespace namespace = header.getNamespace();
if (nsURI == null) {
- if(namespace == null) {
+ if (namespace == null) {
headers.add(header);
}
- } else{
- if(namespace!=null){
+ } else {
+ if (namespace != null) {
if (nsURI.equals(namespace.getNamespaceURI())) {
headers.add(header);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPMessageImpl.java Wed Mar 7 06:59:00 2007
@@ -53,18 +53,21 @@
}
public void setOMDocumentElement(OMElement rootElement) {
- throw new UnsupportedOperationException("This is not allowed. Use set SOAPEnvelope instead");
+ throw new UnsupportedOperationException(
+ "This is not allowed. Use set SOAPEnvelope instead");
}
public void setFirstChild(OMNode firstChild) {
- throw new UnsupportedOperationException("This is not allowed. Use set SOAPEnvelope instead");
+ throw new UnsupportedOperationException(
+ "This is not allowed. Use set SOAPEnvelope instead");
}
- protected void internalSerialize(XMLStreamWriter writer, boolean cache, boolean includeXMLDeclaration) throws XMLStreamException {
+ protected void internalSerialize(XMLStreamWriter writer, boolean cache,
+ boolean includeXMLDeclaration) throws XMLStreamException {
if (cache) {
- ((OMNodeEx)this.documentElement).internalSerialize(writer);
+ ((OMNodeEx) this.documentElement).internalSerialize(writer);
} else {
- ((OMNodeEx)this.documentElement).internalSerializeAndConsume(writer);
+ ((OMNodeEx) this.documentElement).internalSerializeAndConsume(writer);
}
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPTextImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPTextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPTextImpl.java Wed Mar 7 06:59:00 2007
@@ -30,9 +30,9 @@
}
protected SOAPTextImpl(OMElement parent, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(parent, SOAP12Constants.SOAP_FAULT_TEXT_LOCAL_NAME, builder,
- factory);
+ factory);
}
public void setLang(String lang) {
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11BodyImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11BodyImpl.java?view=diff&rev=515594&r1=515593&r2=515594
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11BodyImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11BodyImpl.java Wed Mar 7 06:59:00 2007
@@ -26,9 +26,7 @@
import org.apache.axiom.soap.impl.llom.SOAPBodyImpl;
public class SOAP11BodyImpl extends SOAPBodyImpl {
- /**
- * @param envelope
- */
+ /** @param envelope */
public SOAP11BodyImpl(SOAPEnvelope envelope, SOAPFactory factory)
throws SOAPProcessingException {
super(envelope, factory);
@@ -36,7 +34,7 @@
public SOAP11BodyImpl(SOAPFactory factory) throws SOAPProcessingException {
super(SOAPConstants.BODY_LOCAL_NAME, factory.getNamespace(),
- factory);
+ factory);
}
/**
@@ -46,11 +44,11 @@
* @param builder
*/
public SOAP11BodyImpl(SOAPEnvelope envelope, OMXMLParserWrapper builder,
- SOAPFactory factory) {
+ SOAPFactory factory) {
super(envelope, builder, factory);
}
public SOAPFault addFault(Exception e) throws OMException {
- return ((SOAP11Factory)this.factory).createSOAPFault(this, e);
+ return ((SOAP11Factory) this.factory).createSOAPFault(this, e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org