You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by gd...@apache.org on 2005/07/11 17:49:55 UTC
svn commit: r210150 [32/35] - in /webservices/axis/trunk/java: ./ etc/
modules/addressing/
modules/addressing/src/org/apache/axis2/handlers/addressing/
modules/addressing/test-resources/
modules/addressing/test/org/apache/axis2/handlers/addressing/ mod...
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/SAXOMBuilder.java Mon Jul 11 08:49:30 2005
@@ -26,141 +26,141 @@
import java.util.List;
public class SAXOMBuilder extends DefaultHandler {
- OMElement root = null;
+ OMElement root = null;
- OMNode lastNode = null;
+ OMNode lastNode = null;
- OMElement nextElem = null;
+ OMElement nextElem = null;
- OMFactory factory = OMAbstractFactory.getOMFactory();
+ OMFactory factory = OMAbstractFactory.getOMFactory();
- List prefixMappings = new ArrayList();
-
- public void setDocumentLocator(Locator arg0) {
- }
-
- public void startDocument() throws SAXException {
-
- }
-
- public void endDocument() throws SAXException {
- }
-
- protected OMElement createNextElement(String localName) throws OMException {
- OMElement e;
- if (lastNode == null) {
- root = e = factory.createOMElement(localName, null, null, null);
- } else if (lastNode.isComplete()) {
- e = factory.createOMElement(localName, null, lastNode.getParent(),
- null);
- lastNode.setNextSibling(e);
- e.setPreviousSibling(lastNode);
- } else {
- OMElement parent = (OMElement) lastNode;
- e = factory.createOMElement(localName, null, (OMElement) lastNode,
- null);
- parent.setFirstChild(e);
- }
- return e;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.xml.sax.ContentHandler#startPrefixMapping(java.lang.String,
- * java.lang.String)
- */
- public void startPrefixMapping(String prefix, String uri)
- throws SAXException {
- if (nextElem == null)
- nextElem = createNextElement(null);
- nextElem.declareNamespace(uri, prefix);
- }
-
- public void endPrefixMapping(String arg0) throws SAXException {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
- * java.lang.String, java.lang.String, org.xml.sax.Attributes)
- */
- public void startElement(String namespaceURI, String localName,
- String qName, Attributes atts) throws SAXException {
- if (localName == null || localName.trim().equals(""))
- localName = qName.substring(qName.indexOf(':') + 1);
- if (nextElem == null)
- nextElem = createNextElement(localName);
- else
- nextElem.setLocalName(localName);
- nextElem
- .setNamespace(nextElem.findNamespace(namespaceURI, null));
- int j = atts.getLength();
- for (int i = 0; i < j; i++)
- nextElem.addAttribute(atts.getLocalName(i), atts.getValue(i),
- nextElem.findNamespace(atts.getURI(i), null));
- lastNode = nextElem;
- nextElem = null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.xml.sax.ContentHandler#endElement(java.lang.String,
- * java.lang.String, java.lang.String)
- */
- public void endElement(String arg0, String arg1, String arg2)
- throws SAXException {
- if (lastNode.isComplete()) {
- OMContainer parent = lastNode.getParent();
- parent.setComplete(true);
- lastNode = (OMNode)parent;
- } else {
- OMElement e = (OMElement) lastNode;
- e.setComplete(true);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.xml.sax.ContentHandler#characters(char[], int, int)
- */
- public void characters(char[] ch, int start, int length)
- throws SAXException {
- if (lastNode == null) {
- throw new SAXException("");
- }
- OMNode node;
- if (lastNode.isComplete()) {
- node = factory.createText((OMElement)lastNode.getParent(), new String(ch,
- start, length));
- lastNode.setNextSibling(node);
- node.setPreviousSibling(lastNode);
- } else {
- OMElement e = (OMElement) lastNode;
- node = factory.createText(e, new String(ch, start, length));
- e.setFirstChild(node);
- }
- lastNode = node;
- }
-
- public void ignorableWhitespace(char[] arg0, int arg1, int arg2)
- throws SAXException {
- }
-
- public void processingInstruction(String arg0, String arg1)
- throws SAXException {
- }
-
- public void skippedEntity(String arg0) throws SAXException {
- }
-
- /**
- * @return Returns the root.
- */
- public OMElement getRootElement() {
- return root;
- }
+ List prefixMappings = new ArrayList();
+
+ public void setDocumentLocator(Locator arg0) {
+ }
+
+ public void startDocument() throws SAXException {
+
+ }
+
+ public void endDocument() throws SAXException {
+ }
+
+ protected OMElement createNextElement(String localName) throws OMException {
+ OMElement e;
+ if (lastNode == null) {
+ root = e = factory.createOMElement(localName, null, null, null);
+ } else if (lastNode.isComplete()) {
+ e = factory.createOMElement(localName, null, lastNode.getParent(),
+ null);
+ lastNode.setNextSibling(e);
+ e.setPreviousSibling(lastNode);
+ } else {
+ OMElement parent = (OMElement) lastNode;
+ e = factory.createOMElement(localName, null, (OMElement) lastNode,
+ null);
+ parent.setFirstChild(e);
+ }
+ return e;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.xml.sax.ContentHandler#startPrefixMapping(java.lang.String,
+ * java.lang.String)
+ */
+ public void startPrefixMapping(String prefix, String uri)
+ throws SAXException {
+ if (nextElem == null)
+ nextElem = createNextElement(null);
+ nextElem.declareNamespace(uri, prefix);
+ }
+
+ public void endPrefixMapping(String arg0) throws SAXException {
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
+ * java.lang.String, java.lang.String, org.xml.sax.Attributes)
+ */
+ public void startElement(String namespaceURI, String localName,
+ String qName, Attributes atts) throws SAXException {
+ if (localName == null || localName.trim().equals(""))
+ localName = qName.substring(qName.indexOf(':') + 1);
+ if (nextElem == null)
+ nextElem = createNextElement(localName);
+ else
+ nextElem.setLocalName(localName);
+ nextElem
+ .setNamespace(nextElem.findNamespace(namespaceURI, null));
+ int j = atts.getLength();
+ for (int i = 0; i < j; i++)
+ nextElem.addAttribute(atts.getLocalName(i), atts.getValue(i),
+ nextElem.findNamespace(atts.getURI(i), null));
+ lastNode = nextElem;
+ nextElem = null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.xml.sax.ContentHandler#endElement(java.lang.String,
+ * java.lang.String, java.lang.String)
+ */
+ public void endElement(String arg0, String arg1, String arg2)
+ throws SAXException {
+ if (lastNode.isComplete()) {
+ OMContainer parent = lastNode.getParent();
+ parent.setComplete(true);
+ lastNode = (OMNode) parent;
+ } else {
+ OMElement e = (OMElement) lastNode;
+ e.setComplete(true);
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.xml.sax.ContentHandler#characters(char[], int, int)
+ */
+ public void characters(char[] ch, int start, int length)
+ throws SAXException {
+ if (lastNode == null) {
+ throw new SAXException("");
+ }
+ OMNode node;
+ if (lastNode.isComplete()) {
+ node = factory.createText((OMElement) lastNode.getParent(), new String(ch,
+ start, length));
+ lastNode.setNextSibling(node);
+ node.setPreviousSibling(lastNode);
+ } else {
+ OMElement e = (OMElement) lastNode;
+ node = factory.createText(e, new String(ch, start, length));
+ e.setFirstChild(node);
+ }
+ lastNode = node;
+ }
+
+ public void ignorableWhitespace(char[] arg0, int arg1, int arg2)
+ throws SAXException {
+ }
+
+ public void processingInstruction(String arg0, String arg1)
+ throws SAXException {
+ }
+
+ public void skippedEntity(String arg0) throws SAXException {
+ }
+
+ /**
+ * @return Returns the root.
+ */
+ public OMElement getRootElement() {
+ return root;
+ }
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXBuilder.java Mon Jul 11 08:49:30 2005
@@ -118,13 +118,13 @@
String uri = parser.getAttributeNamespace(i);
if (uri.hashCode() != 0) {
ns = node.findNamespace(uri,
- parser.getAttributePrefix(i));
+ parser.getAttributePrefix(i));
}
// todo if the attributes are supposed to namespace qualified all the time
// todo then this should throw an exception here
node.addAttribute(parser.getAttributeLocalName(i),
- parser.getAttributeValue(i), ns);
+ parser.getAttributeValue(i), ns);
}
}
@@ -140,7 +140,7 @@
}
OMNode node;
if (lastNode.isComplete()) {
- node = omfactory.createText((OMElement)lastNode.getParent(), parser.getText());
+ node = omfactory.createText((OMElement) lastNode.getParent(), parser.getText());
lastNode.setNextSibling(node);
node.setPreviousSibling(lastNode);
} else {
@@ -188,7 +188,7 @@
if (lastNode != null) {
lastNode.setNextSibling(null);
} else {
- OMElement parent = (OMElement)elementImpl.getParent();
+ OMElement parent = (OMElement) elementImpl.getParent();
if (parent == null) {
throw new OMException();
}
@@ -274,8 +274,7 @@
*/
public void setCache(boolean b) {
if (parserAccessed && b) {
- throw new UnsupportedOperationException(
- "parser accessed. cannot set cache");
+ throw new UnsupportedOperationException("parser accessed. cannot set cache");
}
cache = b;
}
@@ -353,8 +352,7 @@
parserAccessed = true;
return parser;
} else {
- throw new UnsupportedOperationException(
- "cache must be switched off to access the parser");
+ throw new UnsupportedOperationException("cache must be switched off to access the parser");
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/builder/StAXOMBuilder.java Mon Jul 11 08:49:30 2005
@@ -26,13 +26,13 @@
* This will construct an OM without using SOAP specific classes like SOAPEnvelope, SOAPHeader, SOAPHeaderBlock and SOAPBody.
* And this will habe the Document concept also.
*/
-public class StAXOMBuilder extends StAXBuilder{
+public class StAXOMBuilder extends StAXBuilder {
/**
* Field document
*/
protected OMDocument document;
- /**
+ /**
* Constructor StAXOMBuilder
*
* @param ombuilderFactory
@@ -70,13 +70,13 @@
document.addChild(node);
} else if (lastNode.isComplete()) {
node = omfactory.createOMElement(elementName, null,
- lastNode.getParent(), this);
+ lastNode.getParent(), this);
lastNode.setNextSibling(node);
node.setPreviousSibling(lastNode);
} else {
OMElement e = (OMElement) lastNode;
node = omfactory.createOMElement(elementName, null,
- (OMElement) lastNode, this);
+ (OMElement) lastNode, this);
e.setFirstChild(node);
}
@@ -100,7 +100,7 @@
node = omfactory.createText(parser.getText());
document.addChild(node);
} else if (lastNode.isComplete()) {
- node = omfactory.createText((OMElement)lastNode.getParent(), parser.getText());
+ node = omfactory.createText((OMElement) lastNode.getParent(), parser.getText());
lastNode.setNextSibling(node);
node.setPreviousSibling(lastNode);
} else {
@@ -119,7 +119,7 @@
* @throws OMException
*/
protected OMNode createDTD() throws OMException {
- if(!parser.hasText())
+ if (!parser.hasText())
return null;
OMNode node = omfactory.createText(parser.getText());
document.addChild(node);
@@ -136,7 +136,7 @@
node.setType(OMNode.PI_NODE);
document.addChild(node);
} else if (lastNode.isComplete()) {
- node = omfactory.createText((OMElement)lastNode.getParent(), "<?" + target + " " + data + "?>");
+ node = omfactory.createText((OMElement) lastNode.getParent(), "<?" + target + " " + data + "?>");
node.setType(OMNode.PI_NODE);
lastNode.setNextSibling(node);
node.setPreviousSibling(lastNode);
@@ -196,7 +196,7 @@
break;
case XMLStreamConstants.END_ELEMENT:
if (lastNode.isComplete()) {
- OMElement parent = (OMElement)lastNode.getParent();
+ OMElement parent = (OMElement) lastNode.getParent();
parent.setComplete(true);
lastNode = parent;
} else {
@@ -223,7 +223,7 @@
throw new OMException();
}
////////////////////
- // if (!done) parser.next();
+ // if (!done) parser.next();
///////////////////
return token;
} catch (OMException e) {
@@ -249,10 +249,10 @@
* @param isSOAPElement
*/
protected void processNamespaceData(OMElement node, boolean isSOAPElement) {
- int namespaceCount = parser.getNamespaceCount();
+ int namespaceCount = parser.getNamespaceCount();
for (int i = 0; i < namespaceCount; i++) {
node.declareNamespace(parser.getNamespaceURI(i),
- parser.getNamespacePrefix(i));
+ parser.getNamespacePrefix(i));
}
// set the own namespace
@@ -266,14 +266,14 @@
if (namespace == null) {
namespace = node.declareNamespace(namespaceURI, "");
}
- if(node.getNamespace() == null){
+ if (node.getNamespace() == null) {
node.setNamespace(namespace);
}
} else {
namespace = node.findNamespace(namespaceURI, prefix);
- if(namespace == null){
+ if (namespace == null) {
node.setNamespace(omfactory.createOMNamespace(namespaceURI, prefix));
- }else{
+ } else {
node.setNamespace(namespace);
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/XMLComparisonException.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/XMLComparisonException.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/XMLComparisonException.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/exception/XMLComparisonException.java Mon Jul 11 08:49:30 2005
@@ -20,7 +20,7 @@
/**
* Eran Chinthaka (chinthaka@apache.org)
*/
-
+
public XMLComparisonException(String message) {
super(message);
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMLinkedListImplFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMLinkedListImplFactory.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMLinkedListImplFactory.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMLinkedListImplFactory.java Mon Jul 11 08:49:30 2005
@@ -58,7 +58,7 @@
OMContainer parent,
OMXMLParserWrapper builder) {
OMElementImpl element = new OMElementImpl(localName, ns, parent,
- builder);
+ builder);
return element;
}
@@ -73,8 +73,8 @@
public OMElement createOMElement(String localName, String namespaceURI,
String namespacePrefix) {
return this.createOMElement(localName,
- this.createOMNamespace(namespaceURI,
- namespacePrefix));
+ this.createOMNamespace(namespaceURI,
+ namespacePrefix));
}
/**
@@ -121,7 +121,7 @@
*/
public OMText createText(String s) {
OMTextImpl textNode = new OMTextImpl(s);
- ;
+ ;
return textNode;
}
@@ -138,8 +138,8 @@
}
public OMAttribute createOMAttribute(String localName, OMNamespace ns, String value) {
- return new OMAttributeImpl(localName, ns, value);
- }
+ return new OMAttributeImpl(localName, ns, value);
+ }
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMXMLBuilderFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMXMLBuilderFactory.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMXMLBuilderFactory.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/factory/OMXMLBuilderFactory.java Mon Jul 11 08:49:30 2005
@@ -53,8 +53,7 @@
* @param parser
* @return
*/
- public static StAXSOAPModelBuilder createStAXSOAPModelBuilder(
- SOAPFactory soapFactory, XMLStreamReader parser) {
+ public static StAXSOAPModelBuilder createStAXSOAPModelBuilder(SOAPFactory soapFactory, XMLStreamReader parser) {
return new StAXSOAPModelBuilder(parser);
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/mtom/MTOMStAXSOAPModelBuilder.java Mon Jul 11 08:49:30 2005
@@ -32,105 +32,101 @@
*/
public class MTOMStAXSOAPModelBuilder extends StAXSOAPModelBuilder {
- private Log log = LogFactory.getLog(getClass());
-
- /**
- * <code>mimeHelper</code> handles deffered parsing of incoming MIME
- * Messages
- */
- MIMEHelper mimeHelper;
-
- int partIndex = 0;
-
- public MTOMStAXSOAPModelBuilder(XMLStreamReader parser,
- SOAPFactory factory, MIMEHelper mimeHelper) {
- super(parser, factory);
- this.mimeHelper = mimeHelper;
- }
-
- /**
- * @param reader
- * @param mimeHelper2
- */
- public MTOMStAXSOAPModelBuilder(XMLStreamReader reader,
- MIMEHelper mimeHelper) {
- super(reader);
- this.mimeHelper = mimeHelper;
- }
-
- protected OMNode createOMElement() throws OMException {
-
- String elementName = parser.getLocalName();
-
- String namespaceURI = parser.getNamespaceURI();
-
- // create an OMBlob if the element is an <xop:Include>
- if (elementName.equalsIgnoreCase("Include")
- & namespaceURI
- .equalsIgnoreCase("http://www.w3.org/2004/08/xop/include")) {
-
- OMText node;
- String contentID = null;
- String contentIDName = null;
- OMAttribute Attr;
- if (lastNode == null) {
- // Decide whether to ckeck the level >3 or not
- throw new OMException(
- "XOP:Include element is not supported here");
- }
- if (parser.getAttributeCount() > 0) {
- contentID = parser.getAttributeValue(0);
- contentID = contentID.trim();
- contentIDName = parser.getAttributeLocalName(0);
- if (contentIDName.equalsIgnoreCase("href")
- & contentID.substring(0, 3).equalsIgnoreCase("cid")) {
- contentID = contentID.substring(4);
- } else {
- throw new OMException(
- "contentID not Found in XOP:Include element");
- }
- } else {
- throw new OMException(
- "Href attribute not found in XOP:Include element");
- }
-
- // This cannot happen. XOP:Include is always the only child of an parent element
- // cause it is same as having some text
- try{
- OMElement e = (OMElement) lastNode;
- node = new OMTextImpl(contentID, (OMElement) lastNode, this);
- e.setFirstChild(node);
- }catch(ClassCastException e)
- {
- throw new OMException("Last Node & Parent of an OMText should be an Element"+e);
- }
-
- return node;
-
- } else {
- OMElement node;
- if (lastNode == null) {
- node = constructNode(null, elementName, true);
- } else if (lastNode.isComplete()) {
- node = constructNode((OMElement)lastNode.getParent(), elementName, false);
- lastNode.setNextSibling(node);
- node.setPreviousSibling(lastNode);
- } else {
- OMElement e = (OMElement) lastNode;
- node = constructNode((OMElement) lastNode, elementName, false);
- e.setFirstChild(node);
- }
-
- // fill in the attributes
- processAttributes(node);
- //TODO Exception when trying to log . check this
- // log.info("Build the OMElelment {" + node.getLocalName() + '}'
- // + node.getLocalName() + "By the StaxSOAPModelBuilder");
- return node;
- }
- }
-
- public DataHandler getDataHandler(String blobContentID) throws OMException {
- return mimeHelper.getDataHandler(blobContentID);
- }
+ private Log log = LogFactory.getLog(getClass());
+
+ /**
+ * <code>mimeHelper</code> handles deffered parsing of incoming MIME
+ * Messages
+ */
+ MIMEHelper mimeHelper;
+
+ int partIndex = 0;
+
+ public MTOMStAXSOAPModelBuilder(XMLStreamReader parser,
+ SOAPFactory factory, MIMEHelper mimeHelper) {
+ super(parser, factory);
+ this.mimeHelper = mimeHelper;
+ }
+
+ /**
+ * @param reader
+ * @param mimeHelper2
+ */
+ public MTOMStAXSOAPModelBuilder(XMLStreamReader reader,
+ MIMEHelper mimeHelper) {
+ super(reader);
+ this.mimeHelper = mimeHelper;
+ }
+
+ protected OMNode createOMElement() throws OMException {
+
+ String elementName = parser.getLocalName();
+
+ String namespaceURI = parser.getNamespaceURI();
+
+ // create an OMBlob if the element is an <xop:Include>
+ if (elementName.equalsIgnoreCase("Include")
+ & namespaceURI
+ .equalsIgnoreCase("http://www.w3.org/2004/08/xop/include")) {
+
+ OMText node;
+ String contentID = null;
+ String contentIDName = null;
+ OMAttribute Attr;
+ if (lastNode == null) {
+ // Decide whether to ckeck the level >3 or not
+ throw new OMException("XOP:Include element is not supported here");
+ }
+ if (parser.getAttributeCount() > 0) {
+ contentID = parser.getAttributeValue(0);
+ contentID = contentID.trim();
+ contentIDName = parser.getAttributeLocalName(0);
+ if (contentIDName.equalsIgnoreCase("href")
+ & contentID.substring(0, 3).equalsIgnoreCase("cid")) {
+ contentID = contentID.substring(4);
+ } else {
+ throw new OMException("contentID not Found in XOP:Include element");
+ }
+ } else {
+ throw new OMException("Href attribute not found in XOP:Include element");
+ }
+
+ // This cannot happen. XOP:Include is always the only child of an parent element
+ // cause it is same as having some text
+ try {
+ OMElement e = (OMElement) lastNode;
+ node = new OMTextImpl(contentID, (OMElement) lastNode, this);
+ e.setFirstChild(node);
+ } catch (ClassCastException e) {
+ throw new OMException("Last Node & Parent of an OMText should be an Element" + e);
+ }
+
+ return node;
+
+ } else {
+ OMElement node;
+ if (lastNode == null) {
+ node = constructNode(null, elementName, true);
+ } else if (lastNode.isComplete()) {
+ node = constructNode((OMElement) lastNode.getParent(), elementName, false);
+ lastNode.setNextSibling(node);
+ node.setPreviousSibling(lastNode);
+ } else {
+ OMElement e = (OMElement) lastNode;
+ node = constructNode((OMElement) lastNode, elementName, false);
+ e.setFirstChild(node);
+ }
+
+ // fill in the attributes
+ processAttributes(node);
+ //TODO Exception when trying to log . check this
+ // log.info("Build the OMElelment {" + node.getLocalName() + '}'
+ // + node.getLocalName() + "By the StaxSOAPModelBuilder");
+ return node;
+ }
+ }
+
+ public DataHandler getDataHandler(String blobContentID) throws OMException {
+ return mimeHelper.getDataHandler(blobContentID);
+ }
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamWriterToContentHandlerConverter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamWriterToContentHandlerConverter.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamWriterToContentHandlerConverter.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamWriterToContentHandlerConverter.java Mon Jul 11 08:49:30 2005
@@ -201,12 +201,11 @@
* @param atts
* @throws SAXException
*/
- public void startElement(
- String namespaceURI, String localName, String qName, Attributes atts)
+ public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
throws SAXException {
try {
log.info("writing element {" + namespaceURI + '}' + localName
- + " directly to stream ");
+ + " directly to stream ");
String prefix = getPrefix(qName);
// it is only the prefix we want to learn from the QName! so we can get rid of the
@@ -220,7 +219,7 @@
int attCount = atts.getLength();
for (int i = 0; i < attCount; i++) {
writer.writeAttribute(atts.getURI(i), localName,
- atts.getValue(i));
+ atts.getValue(i));
}
}
} catch (XMLStreamException e) {
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/serialize/StreamingOMSerializer.java Mon Jul 11 08:49:30 2005
@@ -50,8 +50,7 @@
public void serialize(Object obj, OMOutput omOutput)
throws XMLStreamException {
if (!(obj instanceof XMLStreamReader)) {
- throw new UnsupportedOperationException(
- "Unsupported input object. Must be of the the type XMLStreamReader");
+ throw new UnsupportedOperationException("Unsupported input object. Must be of the the type XMLStreamReader");
}
XMLStreamReader node = (XMLStreamReader) obj;
serializeNode(node, omOutput);
@@ -66,9 +65,9 @@
*/
protected void serializeNode(XMLStreamReader reader, OMOutput omOutput)
throws XMLStreamException {
- //TODO We get the StAXWriter at this point and uses it hereafter assuming that this is the only entry point to this class.
- // If there can be other classes calling methodes of this we might need to change methode signatures to OMOutputer
- XMLStreamWriter writer = omOutput.getXmlStreamWriter();
+ //TODO We get the StAXWriter at this point and uses it hereafter assuming that this is the only entry point to this class.
+ // If there can be other classes calling methodes of this we might need to change methode signatures to OMOutputer
+ XMLStreamWriter writer = omOutput.getXmlStreamWriter();
while (reader.hasNext()) {
int event = reader.next();
if (event == START_ELEMENT) {
@@ -103,8 +102,7 @@
* @param writer
* @throws XMLStreamException
*/
- protected void serializeElement(
- XMLStreamReader reader, XMLStreamWriter writer)
+ protected void serializeElement(XMLStreamReader reader, XMLStreamWriter writer)
throws XMLStreamException {
String prefix = reader.getPrefix();
String nameSpaceName = reader.getNamespaceURI();
@@ -115,12 +113,12 @@
} else {
if (prefix != null) {
writer.writeStartElement(prefix, reader.getLocalName(),
- nameSpaceName);
+ nameSpaceName);
writer.writeNamespace(prefix, nameSpaceName);
writer.setPrefix(prefix, nameSpaceName);
} else {
writer.writeStartElement(nameSpaceName,
- reader.getLocalName());
+ reader.getLocalName());
writer.writeDefaultNamespace(nameSpaceName);
writer.setDefaultNamespace(nameSpaceName);
}
@@ -137,7 +135,7 @@
int count = reader.getNamespaceCount();
for (int i = 0; i < count; i++) {
serializeNamespace(reader.getNamespacePrefix(i),
- reader.getNamespaceURI(i), writer);
+ reader.getNamespaceURI(i), writer);
}
}
@@ -169,8 +167,7 @@
* @param writer
* @throws XMLStreamException
*/
- protected void serializeCData(
- XMLStreamReader reader, XMLStreamWriter writer)
+ protected void serializeCData(XMLStreamReader reader, XMLStreamWriter writer)
throws XMLStreamException {
writer.writeCData(reader.getText());
}
@@ -182,8 +179,7 @@
* @param writer
* @throws XMLStreamException
*/
- protected void serializeComment(
- XMLStreamReader reader, XMLStreamWriter writer)
+ protected void serializeComment(XMLStreamReader reader, XMLStreamWriter writer)
throws XMLStreamException {
writer.writeComment(reader.getText());
}
@@ -193,8 +189,7 @@
* @param writer
* @throws XMLStreamException
*/
- protected void serializeAttributes(
- XMLStreamReader reader, XMLStreamWriter writer)
+ protected void serializeAttributes(XMLStreamReader reader, XMLStreamWriter writer)
throws XMLStreamException {
int count = reader.getAttributeCount();
String prefix = null;
@@ -204,11 +199,11 @@
namespaceName = reader.getAttributeNamespace(i);
if ((prefix != null) && !namespaceName.equals("")) {
writer.writeAttribute(prefix, namespaceName,
- reader.getAttributeLocalName(i),
- reader.getAttributeValue(i));
+ reader.getAttributeLocalName(i),
+ reader.getAttributeValue(i));
} else {
writer.writeAttribute(reader.getAttributeLocalName(i),
- reader.getAttributeValue(i));
+ reader.getAttributeValue(i));
}
}
}
@@ -221,8 +216,7 @@
* @param writer
* @throws XMLStreamException
*/
- private void serializeNamespace(
- String prefix, String URI, XMLStreamWriter writer)
+ private void serializeNamespace(String prefix, String URI, XMLStreamWriter writer)
throws XMLStreamException {
String prefix1 = writer.getPrefix(URI);
if (prefix1 == null) {
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenIterator.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenIterator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenIterator.java Mon Jul 11 08:49:30 2005
@@ -69,8 +69,7 @@
*/
public void remove() {
if (!nextCalled) {
- throw new IllegalStateException(
- "next method has not yet being called");
+ throw new IllegalStateException("next method has not yet being called");
}
if (removeCalled) {
throw new IllegalStateException("remove has already being called");
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenQNameIterator.java Mon Jul 11 08:49:30 2005
@@ -63,9 +63,8 @@
// check the current node for the criteria
if ((currentChild instanceof OMElementImpl)
- && (isQNamesMatch(
- ((OMElementImpl) currentChild).getQName(),
- this.givenQName))) {
+ && (isQNamesMatch(((OMElementImpl) currentChild).getQName(),
+ this.givenQName))) {
isMatchingNodeFound = true;
needToMoveForward = false;
} else {
@@ -73,7 +72,7 @@
// get the next named node
currentChild = currentChild.getNextSibling();
isMatchingNodeFound = needToMoveForward = !(currentChild
- == null);
+ == null);
}
} else {
needToMoveForward = false;
@@ -119,17 +118,15 @@
// if the given localname is null, whatever value this.qname has, its a match
boolean localNameMatch =
- (qNameToBeMatched.getLocalPart() == null)
+ (qNameToBeMatched.getLocalPart() == null)
|| (qNameToBeMatched.getLocalPart() == "")
|| ((elementQName != null)
- && elementQName.getLocalPart().equalsIgnoreCase(
- qNameToBeMatched.getLocalPart()));
+ && elementQName.getLocalPart().equalsIgnoreCase(qNameToBeMatched.getLocalPart()));
boolean namespaceURIMatch =
- (qNameToBeMatched.getNamespaceURI() == null)
+ (qNameToBeMatched.getNamespaceURI() == null)
|| (qNameToBeMatched.getNamespaceURI() == "")
|| ((elementQName != null)
- && elementQName.getNamespaceURI().equalsIgnoreCase(
- qNameToBeMatched.getNamespaceURI()));
+ && elementQName.getNamespaceURI().equalsIgnoreCase(qNameToBeMatched.getNamespaceURI()));
return localNameMatch && namespaceURIMatch;
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java Mon Jul 11 08:49:30 2005
@@ -77,8 +77,7 @@
// check the current node for the criteria
if (currentChild instanceof OMElement) {
OMAttribute attr =
- ((OMElement) currentChild).getFirstAttribute(
- attributeName);
+ ((OMElement) currentChild).getFirstAttribute(attributeName);
if ((attr != null)
&& attr.getValue().equalsIgnoreCase(attributeValue)) {
isMatchingNodeFound = true;
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/EmptyIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/EmptyIterator.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/EmptyIterator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/EmptyIterator.java Mon Jul 11 08:49:30 2005
@@ -19,6 +19,7 @@
*
* An empty Iterator implementation
*/
+
public class EmptyIterator implements Iterator {
public void remove() {
throw new UnsupportedOperationException();
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/util/XMLComparator.java Mon Jul 11 08:49:30 2005
@@ -82,7 +82,7 @@
OMNode omNode = (OMNode) elementOneChildren.next();
if (omNode instanceof OMElement) {
OMElement elementOneChild = (OMElement) omNode;
- if("Reference4".equals(elementOneChild.getLocalName())){
+ if ("Reference4".equals(elementOneChild.getLocalName())) {
System.out.println("Reference4");
}
OMElement elementTwoChild = elementTwo.getFirstChildWithName(elementOneChild.getQName());
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/AXIOMXPath.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/AXIOMXPath.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/AXIOMXPath.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/AXIOMXPath.java Mon Jul 11 08:49:30 2005
@@ -4,15 +4,14 @@
import org.jaxen.JaxenException;
public class AXIOMXPath extends BaseXPath {
- /** Construct given an XPath expression string.
+ /**
+ * Construct given an XPath expression string.
*
- * @param xpathExpr the XPath expression.
- *
- * @throws org.jaxen.JaxenException if there is a syntax error while
- * parsing the expression
+ * @param xpathExpr the XPath expression.
+ * @throws org.jaxen.JaxenException if there is a syntax error while
+ * parsing the expression
*/
- public AXIOMXPath(String xpathExpr) throws JaxenException
- {
- super( xpathExpr, new DocumentNavigator());
+ public AXIOMXPath(String xpathExpr) throws JaxenException {
+ super(xpathExpr, new DocumentNavigator());
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/om/xpath/DocumentNavigator.java Mon Jul 11 08:49:30 2005
@@ -1,26 +1,16 @@
package org.apache.axis2.om.xpath;
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMContainer;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.om.OMNode;
-import org.apache.axis2.om.OMText;
+import org.apache.axis2.om.*;
import org.apache.axis2.om.impl.llom.OMDocument;
import org.apache.axis2.om.impl.llom.OMNamespaceImpl;
import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
-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.*;
import org.jaxen.saxpath.SAXPathException;
import org.jaxen.util.SingleObjectIterator;
+import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
-import javax.xml.namespace.QName;
import java.io.FileInputStream;
import java.net.URL;
import java.util.ArrayList;
@@ -74,7 +64,7 @@
public String getElementQName(Object object) {
OMElement attr = (OMElement) object;
String prefix = null;
- if(attr.getNamespace()!=null) {
+ if (attr.getNamespace() != null) {
prefix = attr.getNamespace().getPrefix();
}
if (prefix == null || "".equals(prefix)) {
@@ -320,8 +310,8 @@
if (isElement(contextNode)) {
ArrayList attributes = new ArrayList();
Iterator i = ((OMElement) contextNode).getAttributes();
- while(i != null && i.hasNext()){
- attributes.add(new OMAttributeEx((OMAttribute)i.next(), (OMContainer)contextNode));
+ while (i != null && i.hasNext()) {
+ attributes.add(new OMAttributeEx((OMAttribute) i.next(), (OMContainer) contextNode));
}
return attributes.iterator();
}
@@ -338,7 +328,7 @@
* not supported by this object model
*/
public Iterator getNamespaceAxisIterator(Object contextNode) throws UnsupportedAxisException {
- if (! (contextNode instanceof OMContainer && contextNode instanceof OMElement)) {
+ if (!(contextNode instanceof OMContainer && contextNode instanceof OMElement)) {
return JaxenConstants.EMPTY_ITERATOR;
}
List nsList = new ArrayList();
@@ -357,16 +347,16 @@
}
for (Iterator iter = declaredNS.iterator(); iter != null && iter.hasNext();) {
OMNamespace namespace = (OMNamespace) iter.next();
- if(namespace != null) {
+ if (namespace != null) {
String prefix = namespace.getPrefix();
- if (prefix != null && ! prefixes.contains(prefix)) {
+ if (prefix != null && !prefixes.contains(prefix)) {
prefixes.add(prefix);
nsList.add(new OMNamespaceEx(namespace, context));
}
}
}
}
- nsList.add(new OMNamespaceEx(new OMNamespaceImpl("http://www.w3.org/XML/1998/namespace", "xml"), (OMContainer)contextNode));
+ nsList.add(new OMNamespaceEx(new OMNamespaceImpl("http://www.w3.org/XML/1998/namespace", "xml"), (OMContainer) contextNode));
return nsList.iterator();
}
@@ -423,9 +413,9 @@
public Iterator getParentAxisIterator(Object contextNode) throws UnsupportedAxisException {
if (contextNode instanceof OMNode) {
return new SingleObjectIterator(((OMNode) contextNode).getParent());
- } else if (contextNode instanceof OMNamespaceEx) {
+ } else if (contextNode instanceof OMNamespaceEx) {
return new SingleObjectIterator(((OMNamespaceEx) contextNode).getParent());
- } else if (contextNode instanceof OMAttributeEx) {
+ } else if (contextNode instanceof OMAttributeEx) {
return new SingleObjectIterator(((OMAttributeEx) contextNode).getParent());
}
return JaxenConstants.EMPTY_ITERATOR;
@@ -456,10 +446,10 @@
*/
public Iterator getFollowingSiblingAxisIterator(Object contextNode) throws UnsupportedAxisException {
ArrayList list = new ArrayList();
- if(contextNode != null &&contextNode instanceof OMNode) {
- while(contextNode != null && contextNode instanceof OMNode){
- contextNode = ((OMNode)contextNode).getNextSibling();
- if(contextNode != null)
+ if (contextNode != null && contextNode instanceof OMNode) {
+ while (contextNode != null && contextNode instanceof OMNode) {
+ contextNode = ((OMNode) contextNode).getNextSibling();
+ if (contextNode != null)
list.add(contextNode);
}
}
@@ -477,10 +467,10 @@
*/
public Iterator getPrecedingSiblingAxisIterator(Object contextNode) throws UnsupportedAxisException {
ArrayList list = new ArrayList();
- if(contextNode != null &&contextNode instanceof OMNode) {
- while(contextNode != null && contextNode instanceof OMNode){
- contextNode = ((OMNode)contextNode).getPreviousSibling();
- if(contextNode != null)
+ if (contextNode != null && contextNode instanceof OMNode) {
+ while (contextNode != null && contextNode instanceof OMNode) {
+ contextNode = ((OMNode) contextNode).getPreviousSibling();
+ if (contextNode != null)
list.add(contextNode);
}
}
@@ -525,13 +515,11 @@
throws FunctionCallException {
try {
XMLStreamReader parser;
- if(uri.indexOf(':')==-1) {
- parser = XMLInputFactory.newInstance().createXMLStreamReader(
- new FileInputStream(uri));
- } else {
+ if (uri.indexOf(':') == -1) {
+ parser = XMLInputFactory.newInstance().createXMLStreamReader(new FileInputStream(uri));
+ } else {
URL url = new URL(uri);
- parser = XMLInputFactory.newInstance().createXMLStreamReader(
- url.openStream());
+ parser = XMLInputFactory.newInstance().createXMLStreamReader(url.openStream());
}
StAXOMBuilder builder =
new StAXOMBuilder(parser);
@@ -658,10 +646,12 @@
class OMNamespaceEx implements OMNamespace {
OMNamespace originalNsp = null;
OMContainer parent = null;
+
OMNamespaceEx(OMNamespace nsp, OMContainer parent) {
originalNsp = nsp;
this.parent = parent;
}
+
public boolean equals(String uri, String prefix) {
return originalNsp.equals(uri, prefix);
}
@@ -682,10 +672,12 @@
class OMAttributeEx implements OMAttribute {
OMAttribute attribute = null;
OMContainer parent = null;
+
OMAttributeEx(OMAttribute attribute, OMContainer parent) {
this.attribute = attribute;
this.parent = parent;
}
+
public String getLocalName() {
return attribute.getLocalName();
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPBody.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPBody.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPBody.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPBody.java Mon Jul 11 08:49:30 2005
@@ -35,8 +35,10 @@
*
* @param e
* @return the new <code>SOAPFault</code> object
- * @throws org.apache.axis2.om.OMException if there is a SOAP error
* @throws org.apache.axis2.om.OMException
+ * if there is a SOAP error
+ * @throws org.apache.axis2.om.OMException
+ *
*/
public abstract SOAPFault addFault(Exception e) throws OMException;
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPEnvelope.java Mon Jul 11 08:49:30 2005
@@ -31,8 +31,9 @@
*
* @return the <CODE>SOAPHeader</CODE> object or <CODE>
* null</CODE> if there is none
- * @throws org.apache.axis2.om.OMException if there is a problem
- * obtaining the <CODE>SOAPHeader</CODE> object
+ * @throws org.apache.axis2.om.OMException
+ * if there is a problem
+ * obtaining the <CODE>SOAPHeader</CODE> object
*/
public abstract SOAPHeader getHeader() throws OMException;
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFactory.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFactory.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFactory.java Mon Jul 11 08:49:30 2005
@@ -22,7 +22,7 @@
* the License.
* <p/>
*/
-public interface SOAPFactory extends OMFactory{
+public interface SOAPFactory extends OMFactory {
/**
* Eran Chinthaka (chinthaka@apache.org)
*/
@@ -51,7 +51,7 @@
*/
public SOAPHeader createSOAPHeader(SOAPEnvelope envelope, OMXMLParserWrapper builder);
- /**
+ /**
* @param localName
* @param ns
* @return
@@ -68,21 +68,22 @@
public SOAPHeaderBlock createSOAPHeaderBlock(String localName, OMNamespace ns, SOAPHeader parent, OMXMLParserWrapper builder) throws SOAPProcessingException;
/**
- * @param parent
- * @param e
- * @return
- */
- public SOAPFault createSOAPFault(SOAPBody parent, Exception e)throws SOAPProcessingException;
- public SOAPFault createSOAPFault(SOAPBody parent)throws SOAPProcessingException;
+ * @param parent
+ * @param e
+ * @return
+ */
+ public SOAPFault createSOAPFault(SOAPBody parent, Exception e) throws SOAPProcessingException;
+
+ public SOAPFault createSOAPFault(SOAPBody parent) throws SOAPProcessingException;
/**
- * @param ns
- * @param parent
- * @param builder
- * @return
- */
+ * @param ns
+ * @param parent
+ * @param builder
+ * @return
+ */
public SOAPFault createSOAPFault(SOAPBody parent, OMXMLParserWrapper builder);
-
+
/**
* @param envelope
* @return
@@ -96,18 +97,21 @@
*/
public SOAPBody createSOAPBody(SOAPEnvelope envelope, OMXMLParserWrapper builder);
- /* ========================
- = SOAPFaultCode =
- ======================== */
+ /* ========================
+ = SOAPFaultCode =
+ ======================== */
- /**
+ /**
* Code eii under SOAPFault (parent)
+ *
* @param parent
* @return
*/
public SOAPFaultCode createSOAPFaultCode(SOAPFault parent) throws SOAPProcessingException;
+
/**
* Code eii under SOAPFault (parent)
+ *
* @param parent
* @param builder
* @return
@@ -120,12 +124,15 @@
======================== */
/**
* Value eii under Code (parent)
+ *
* @param parent
* @return
*/
public SOAPFaultValue createSOAPFaultValue(SOAPFaultCode parent) throws SOAPProcessingException;
+
/**
* Value eii under Code (parent)
+ *
* @param parent
* @param builder
* @return
@@ -138,6 +145,7 @@
/**
* SubCode eii under Value (parent)
+ *
* @param parent
* @return
*/
@@ -150,8 +158,10 @@
//changed
public SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultCode parent) throws SOAPProcessingException;
+
/**
* SubCode eii under Value (parent)
+ *
* @param parent
* @param builder
* @return
@@ -161,12 +171,15 @@
/**
* SubCode eii under SubCode (parent)
+ *
* @param parent
* @return
*/
public SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultSubCode parent) throws SOAPProcessingException;
+
/**
* SubCode eii under SubCode (parent)
+ *
* @param parent
* @param builder
* @return
@@ -180,12 +193,15 @@
/**
* Reason eii under SOAPFault (parent)
+ *
* @param parent
* @return
*/
public SOAPFaultReason createSOAPFaultReason(SOAPFault parent) throws SOAPProcessingException;
+
/**
* Reason eii under SOAPFault (parent)
+ *
* @param parent
* @param builder
* @return
@@ -198,12 +214,15 @@
/**
* SubCode eii under SubCode (parent)
+ *
* @param parent
* @return
*/
public SOAPFaultText createSOAPFaultText(SOAPFaultReason parent) throws SOAPProcessingException;
+
/**
* SubCode eii under SubCode (parent)
+ *
* @param parent
* @param builder
* @return
@@ -217,12 +236,15 @@
/**
* Node eii under SOAPFault (parent)
+ *
* @param parent
* @return
*/
public SOAPFaultNode createSOAPFaultNode(SOAPFault parent) throws SOAPProcessingException;
+
/**
* Node eii under SOAPFault (parent)
+ *
* @param parent
* @param builder
* @return
@@ -235,12 +257,15 @@
/**
* Role eii under SOAPFault (parent)
+ *
* @param parent
* @return
*/
public SOAPFaultRole createSOAPFaultRole(SOAPFault parent) throws SOAPProcessingException;
+
/**
* Role eii under SOAPFault (parent)
+ *
* @param parent
* @param builder
* @return
@@ -253,12 +278,15 @@
/**
* Detail eii under SOAPFault (parent)
+ *
* @param parent
* @return
*/
public SOAPFaultDetail createSOAPFaultDetail(SOAPFault parent) throws SOAPProcessingException;
+
/**
* Role eii under SOAPFault (parent)
+ *
* @param parent
* @param builder
* @return
@@ -266,12 +294,12 @@
public SOAPFaultDetail createSOAPFaultDetail(SOAPFault parent, OMXMLParserWrapper builder);
-
/**
* Method getDefaultEnvelope
*
* @return
*/
public SOAPEnvelope getDefaultEnvelope() throws SOAPProcessingException;
+
public SOAPEnvelope getDefaultFaultEnvelope() throws SOAPProcessingException;
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFault.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFault.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFault.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFault.java Mon Jul 11 08:49:30 2005
@@ -44,52 +44,64 @@
/**
* SOAPFaultCode is a mandatory item in a Fault, in SOAP 1.2 specification
+ *
* @param soapFaultCode
*/
- public void setCode(SOAPFaultCode soapFaultCode) throws SOAPProcessingException ;
+ public void setCode(SOAPFaultCode soapFaultCode) throws SOAPProcessingException;
+
public SOAPFaultCode getCode();
/**
* SOAPFaultReason is a mandatory item in a Fault, in SOAP 1.2 specification
+ *
* @param reason
*/
public void setReason(SOAPFaultReason reason) throws SOAPProcessingException;
+
public SOAPFaultReason getReason();
/**
* SOAPFaultNode is an optional item in a Fault, in SOAP 1.2 specification
+ *
* @param node
*/
public void setNode(SOAPFaultNode node) throws SOAPProcessingException;
+
public SOAPFaultNode getNode();
/**
* SOAPFaultRoleImpl is an optional item in a Fault, in SOAP 1.2 specification
+ *
* @param role
*/
public void setRole(SOAPFaultRole role) throws SOAPProcessingException;
+
public SOAPFaultRole getRole();
/**
* SOAPFaultRoleImpl is an optional item in a Fault, in SOAP 1.2 specification
+ *
* @param detail
*/
public void setDetail(SOAPFaultDetail detail) throws SOAPProcessingException;
+
public SOAPFaultDetail getDetail();
/**
* This will return if there is an exception in the SOAP fault.
- *
+ * <p/>
* If the exception is like;
* <SOAPFault>
- * <Detail>
- * <Exception> stack trace goes here </Exception>
- * </Detail>
+ * <Detail>
+ * <Exception> stack trace goes here </Exception>
+ * </Detail>
* </SOAPFault>
*
* @return
* @throws org.apache.axis2.om.OMException
+ *
*/
public Exception getException() throws OMException;
+
public void setException(Exception e) throws OMException;
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultCode.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultCode.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultCode.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultCode.java Mon Jul 11 08:49:30 2005
@@ -19,7 +19,7 @@
* the License.
* <p/>
*/
-public interface SOAPFaultCode extends OMElement{
+public interface SOAPFaultCode extends OMElement {
/**
* Eran Chinthaka (chinthaka@apache.org)
*/
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultDetail.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultDetail.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultDetail.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultDetail.java Mon Jul 11 08:49:30 2005
@@ -26,16 +26,17 @@
* 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.
+ * 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)
*/
public void addDetailEntry(OMElement detailElement);
+
public Iterator getAllDetailEntries();
-
+
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultReason.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultReason.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultReason.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultReason.java Mon Jul 11 08:49:30 2005
@@ -19,11 +19,12 @@
* the License.
* <p/>
*/
-public interface SOAPFaultReason extends OMElement{
+public interface SOAPFaultReason extends OMElement {
/**
* Eran Chinthaka (chinthaka@apache.org)
*/
public void setSOAPText(SOAPFaultText soapFaultText) throws SOAPProcessingException;
+
public SOAPFaultText getSOAPText();
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultRole.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultRole.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultRole.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultRole.java Mon Jul 11 08:49:30 2005
@@ -24,8 +24,8 @@
* 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 .
+ * A [local name] of Role .
+ * A [namespace name] of http://www.w3.org/2003/05/soap-envelope .
*/
public interface SOAPFaultRole extends OMElement {
/**
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultSubCode.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultSubCode.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultSubCode.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultSubCode.java Mon Jul 11 08:49:30 2005
@@ -19,23 +19,27 @@
* the License.
* <p/>
*/
-public interface SOAPFaultSubCode extends OMElement{
+public interface SOAPFaultSubCode extends OMElement {
/**
* Eran Chinthaka (chinthaka@apache.org)
*/
/**
* Fault SubCode contain only one mandatory Value child. This value child contains a QName
+ *
* @param soapFaultSubCodeValue
*/
public void setValue(SOAPFaultValue soapFaultSubCodeValue) throws SOAPProcessingException;
+
public SOAPFaultValue getValue();
/**
* Fault SubCode can contain an optional SubCode
+ *
* @param subCode
*/
public void setSubCode(SOAPFaultSubCode subCode) throws SOAPProcessingException;
+
public SOAPFaultSubCode getSubCode();
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultText.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultText.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultText.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultText.java Mon Jul 11 08:49:30 2005
@@ -18,7 +18,7 @@
* the License.
* <p/>
*/
-public interface SOAPFaultText extends OMElement{
+public interface SOAPFaultText extends OMElement {
/**
* Eran Chinthaka (chinthaka@apache.org)
*/
@@ -27,10 +27,12 @@
* 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
+ *
* @param lang
*/
public void setLang(String lang);
+
public String getLang();
-
+
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultValue.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultValue.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultValue.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPFaultValue.java Mon Jul 11 08:49:30 2005
@@ -18,7 +18,7 @@
* the License.
* <p/>
*/
-public interface SOAPFaultValue extends OMElement{
+public interface SOAPFaultValue extends OMElement {
/**
* Eran Chinthaka (chinthaka@apache.org)
*/
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPHeader.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPHeader.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPHeader.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPHeader.java Mon Jul 11 08:49:30 2005
@@ -36,10 +36,10 @@
* @return the new <CODE>SOAPHeaderBlock</CODE> object that
* was inserted into this <CODE>SOAPHeader</CODE>
* object
- * @throws org.apache.axis2.om.OMException if a SOAP error occurs
+ * @throws org.apache.axis2.om.OMException
+ * if a SOAP error occurs
*/
- public abstract SOAPHeaderBlock addHeaderBlock(
- String localName, OMNamespace ns) throws OMException;
+ public abstract SOAPHeaderBlock addHeaderBlock(String localName, OMNamespace ns) throws OMException;
/**
* Returns a list of all the <CODE>SOAPHeaderBlock</CODE>
@@ -53,7 +53,7 @@
* sent to its ultimate destination.
*
* @param role a <CODE>String</CODE> giving the
- * URI of the role for which to search
+ * 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
@@ -72,7 +72,7 @@
* role.
*
* @param role a <CODE>String</CODE> giving the
- * URI of the role for which to search
+ * 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
@@ -87,7 +87,7 @@
* 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
+ * to search
* @return an <code>Iterator</code> object over all the
* <code>SOAPHeaderBlock</code> objects that contain the
* specified role and are marked as MustUnderstand
@@ -115,9 +115,10 @@
* <code>SOAPHeader</code>
*/
public abstract Iterator extractAllHeaderBlocks();
-
+
/**
- * Return all the Headers that has the Namespace URI to given NS URI
+ * Return all the Headers that has the Namespace URI to given NS URI
+ *
* @param nsURI
* @return
*/
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPHeaderBlock.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPHeaderBlock.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPHeaderBlock.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/SOAPHeaderBlock.java Mon Jul 11 08:49:30 2005
@@ -62,6 +62,7 @@
* @see #getMustUnderstand() getMustUnderstand()
*/
public abstract void setMustUnderstand(boolean mustUnderstand);
+
public abstract void setMustUnderstand(String mustUnderstand) throws SOAPProcessingException;
/**
@@ -77,13 +78,12 @@
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();
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPBodyImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPBodyImpl.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPBodyImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPBodyImpl.java Mon Jul 11 08:49:30 2005
@@ -59,7 +59,8 @@
*
* @param e
* @return the new <code>SOAPFault</code> object
- * @throws org.apache.axis2.om.OMException if there is a SOAP error
+ * @throws org.apache.axis2.om.OMException
+ * if there is a SOAP error
* @throws OMException
*/
public abstract SOAPFault addFault(Exception e) throws OMException;
@@ -80,7 +81,7 @@
if (element != null
&& SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(element.getLocalName())
&& (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(element.getNamespace().getName())
- || SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(element.getNamespace().getName()))) { //added this line
+ || SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(element.getNamespace().getName()))) { //added this line
hasSOAPFault = true;
return true;
} else {
@@ -103,7 +104,7 @@
} else if (element != null
&& SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(element.getLocalName())
&& (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(element.getNamespace().getName())
- || SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(element.getNamespace().getName()))) { //added this line
+ || SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(element.getNamespace().getName()))) { //added this line
hasSOAPFault = true;
return (SOAPFault) element;
} else {
@@ -115,6 +116,7 @@
/**
* @param soapFault
* @throws org.apache.axis2.om.OMException
+ *
* @throws OMException
*/
public void addFault(SOAPFault soapFault) throws OMException {
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPConstants.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPConstants.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPConstants.java Mon Jul 11 08:49:30 2005
@@ -64,7 +64,7 @@
* Field SOAPFAULT_DETAIL_LOCAL_NAME
*/
public static final String SOAPFAULT_DETAIL_LOCAL_NAME = "detail";
-
+
/**
* Field SOAPFAULT_NAMESPACE_PREFIX
*/
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPEnvelopeImpl.java Mon Jul 11 08:49:30 2005
@@ -49,9 +49,10 @@
*
* @return the <CODE>SOAPHeader</CODE> object or <CODE> null</CODE> if there
* is none
- * @throws org.apache.axis2.om.OMException if there is a problem obtaining
- * the <CODE>SOAPHeader</CODE>
- * object
+ * @throws org.apache.axis2.om.OMException
+ * if there is a problem obtaining
+ * the <CODE>SOAPHeader</CODE>
+ * object
* @throws OMException
*/
public SOAPHeader getHeader() throws OMException {
@@ -65,30 +66,31 @@
*
* @return the <CODE>SOAPBody</CODE> object for this <CODE>
* SOAPEnvelope</CODE> object or <CODE>null</CODE> if there is none
- * @throws org.apache.axis2.om.OMException if there is a problem obtaining
- * the <CODE>SOAPBody</CODE> object
+ * @throws org.apache.axis2.om.OMException
+ * if there is a problem obtaining
+ * the <CODE>SOAPBody</CODE> object
* @throws OMException
*/
public SOAPBody getBody() throws OMException {
- //check for the first element
- OMElement element = getFirstElement();
- if (element != null) {
- if (SOAPConstants.BODY_LOCAL_NAME.equals(element.getLocalName())) {
- return (SOAPBody) element;
- } else { // if not second element SHOULD be the body
- OMNode node = element.getNextSibling();
- while (node != null && node.getType() != OMNode.ELEMENT_NODE) {
- node = node.getNextSibling();
- }
- element = (OMElement) node;
+ //check for the first element
+ OMElement element = getFirstElement();
+ if (element != null) {
+ if (SOAPConstants.BODY_LOCAL_NAME.equals(element.getLocalName())) {
+ return (SOAPBody) element;
+ } else { // if not second element SHOULD be the body
+ OMNode node = element.getNextSibling();
+ while (node != null && node.getType() != OMNode.ELEMENT_NODE) {
+ node = node.getNextSibling();
+ }
+ element = (OMElement) node;
- if (node != null && 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.");
- }
+ if (node != null && 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.");
}
}
+ }
return null;
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultCodeImpl.java Mon Jul 11 08:49:30 2005
@@ -47,7 +47,7 @@
super(parent, SOAP12Constants.SOAP_FAULT_CODE_LOCAL_NAME, extractNamespaceFromParent);
}
- /**
+ /**
* Eran Chinthaka (chinthaka@apache.org)
*/
public void setValue(SOAPFaultValue value) throws SOAPProcessingException {
@@ -55,7 +55,7 @@
}
public SOAPFaultValue getValue() {
- return (SOAPFaultValue) UtilProvider.getChildWithName(this, SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME);
+ return (SOAPFaultValue) UtilProvider.getChildWithName(this, SOAP12Constants.SOAP_FAULT_VALUE_LOCAL_NAME);
}
public void setSubCode(SOAPFaultSubCode value) throws SOAPProcessingException {
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultDetailImpl.java Mon Jul 11 08:49:30 2005
@@ -26,7 +26,7 @@
* author : Eran Chinthaka (chinthaka@apache.org)
*/
-public abstract class SOAPFaultDetailImpl extends SOAPElement implements SOAPFaultDetail{
+public abstract class SOAPFaultDetailImpl extends SOAPElement implements SOAPFaultDetail {
protected SOAPFaultDetailImpl(SOAPFault parent, boolean extractNamespaceFromParent) throws SOAPProcessingException {
super(parent, SOAP12Constants.SOAP_FAULT_DETAIL_LOCAL_NAME, extractNamespaceFromParent);
@@ -41,6 +41,6 @@
}
public Iterator getAllDetailEntries() {
- return this.getChildren();
+ return this.getChildren();
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultImpl.java Mon Jul 11 08:49:30 2005
@@ -142,7 +142,7 @@
if (myElement != null) {
myElement.discard();
}
- if(newElement != null && newElement.getParent() != null){
+ if (newElement != null && newElement.getParent() != null) {
newElement.discard();
}
this.addChild(newElement);
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultNodeImpl.java Mon Jul 11 08:49:30 2005
@@ -23,7 +23,7 @@
* author : Eran Chinthaka (chinthaka@apache.org)
*/
-public abstract class SOAPFaultNodeImpl extends SOAPElement implements SOAPFaultNode{
+public abstract class SOAPFaultNodeImpl extends SOAPElement implements SOAPFaultNode {
public SOAPFaultNodeImpl(SOAPFault parent) throws SOAPProcessingException {
super(parent, SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME, true);
@@ -38,6 +38,6 @@
}
public String getNodeValue() {
- return this.getText();
+ return this.getText();
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultReasonImpl.java Mon Jul 11 08:49:30 2005
@@ -24,7 +24,7 @@
* the License.
* <p/>
*/
-public abstract class SOAPFaultReasonImpl extends SOAPElement implements SOAPFaultReason{
+public abstract class SOAPFaultReasonImpl extends SOAPElement implements SOAPFaultReason {
protected SOAPFaultText text;
/**
@@ -34,7 +34,7 @@
* @param builder
*/
public SOAPFaultReasonImpl(SOAPFault parent, OMXMLParserWrapper builder) {
- super(parent, SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME, builder);
+ super(parent, SOAP12Constants.SOAP_FAULT_REASON_LOCAL_NAME, builder);
}
/**
@@ -50,7 +50,7 @@
public void setSOAPText(SOAPFaultText soapFaultText) throws SOAPProcessingException {
UtilProvider.setNewElement(this, text, soapFaultText);
}
-
+
public SOAPFaultText getSOAPText() {
return (SOAPFaultText) UtilProvider.getChildWithName(this, SOAP12Constants.SOAP_FAULT_TEXT_LOCAL_NAME);
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java?rev=210150&r1=210149&r2=210150&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis2/soap/impl/llom/SOAPFaultRoleImpl.java Mon Jul 11 08:49:30 2005
@@ -22,7 +22,7 @@
* author : Eran Chinthaka (chinthaka@apache.org)
*/
-public abstract class SOAPFaultRoleImpl extends SOAPElement implements org.apache.axis2.soap.SOAPFaultRole{
+public abstract class SOAPFaultRoleImpl extends SOAPElement implements org.apache.axis2.soap.SOAPFaultRole {
public SOAPFaultRoleImpl(SOAPFault parent, boolean extractNamespaceFromParent) throws SOAPProcessingException {
super(parent, SOAP12Constants.SOAP_FAULT_ROLE_LOCAL_NAME, extractNamespaceFromParent);