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 aj...@apache.org on 2005/04/26 09:43:11 UTC
svn commit: r164761 [2/2] - in /webservices/axis/trunk/java/modules:
core/html/ core/samples/deployment/OutService/org/apache/axis/services/
core/src/org/apache/axis/engine/
core/src/org/apache/axis/handlers/addressing/
core/src/org/apache/axis/transport/
core/src/org/apache/axis/transport/http/ samples/src/encoding/sample1/
samples/src/encoding/sample2/benchMark/ samples/src/interop/doclit/
samples/src/org/apache/axis/testUtils/ samples/src/userguide/sample1/
samples/test/org/apache/axis/clientapi/
samples/test/org/apache/axis/encoding/ samples/test/org/apache/axis/engine/
samples/test/org/apache/axis/integration/
samples/test/org/apache/axis/om/builder/ xml/src/org/apache/axis/om/
xml/src/org/apache/axis/om/impl/llom/
xml/src/org/apache/axis/om/impl/llom/builder/
xml/src/org/apache/axis/om/impl/llom/serialize/
xml/src/org/apache/axis/om/impl/llom/traverse/
xml/src/org/apache/axis/om/impl/llom/util/ xml/test/org/apache/axis/om/
xml/test/org/apache/axis/om/factory/
xml/test/org/apache/axis/om/impl/serializer/
xml/test/org/apache/axis/om/impl/streamwrapper/
xml/test/org/apache/axis/om/util/
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPBodyImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPBodyImpl.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPBodyImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPBodyImpl.java Tue Apr 26 00:43:08 2005
@@ -84,7 +84,7 @@
OMElement element = getFirstElement();
if(element != null
&& SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(element.getLocalName())
- && SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(element.getNamespaceName())){
+ && SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(element.getNamespace().getName())){
hasSOAPFault = true;
return true;
}else{
@@ -105,7 +105,7 @@
OMElement element = getFirstElement();
if(element != null
&& SOAPConstants.SOAPFAULT_LOCAL_NAME.equals(element.getLocalName())
- && SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(element.getNamespaceName())){
+ && SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(element.getNamespace().getName())){
hasSOAPFault = true;
return (SOAPFault)element;
}else{
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPEnvelopeImpl.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPEnvelopeImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPEnvelopeImpl.java Tue Apr 26 00:43:08 2005
@@ -23,6 +23,7 @@
import org.apache.axis.om.SOAPBody;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.om.SOAPHeader;
+import org.apache.axis.om.OMNode;
/**
* Class SOAPEnvelopeImpl
@@ -93,7 +94,12 @@
if (SOAPConstants.BODY_LOCAL_NAME.equals(element.getLocalName())) {
return (SOAPBody) element;
}else{
- element = element.getNextSiblingElement();
+ OMNode node = element.getNextSibling();
+ while(node.getType()!=OMNode.ELEMENT_NODE){
+ node = node.getNextSibling();
+ }
+ element =(OMElement)node;
+
if (SOAPConstants.BODY_LOCAL_NAME.equals(element.getLocalName())) {
return (SOAPBody) element;
}
@@ -106,7 +112,7 @@
*
* @throws OMException
*/
- public void detach() throws OMException {
+ public OMNode detach() throws OMException {
throw new OMException("Root Element can not be detached");
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPFaultImpl.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPFaultImpl.java Tue Apr 26 00:43:08 2005
@@ -122,13 +122,13 @@
while (childrenIter.hasNext()) {
Object o = childrenIter.next();
if ((o instanceof OMText)
- && !((OMText) o).getValue().trim().equals("")) {
- String[] strings = ((OMText) o).getValue().split(":");
+ && !((OMText) o).getText().trim().equals("")) {
+ String[] strings = ((OMText) o).getText().split(":");
return new QName("", strings[1], strings[0]);
}
}
} else {
- faultCodeElement = (OMElementImpl) this.getChildWithName(
+ faultCodeElement = (OMElementImpl) this.getFirstChildWithName(
new QName(
this.ns.getName(), SOAPConstants.SOAPFAULT_CODE_LOCAL_NAME,
this.ns.getPrefix()));
@@ -167,12 +167,12 @@
while (childrenIter.hasNext()) {
Object o = childrenIter.next();
if ((o instanceof OMText)
- && !"".equals(((OMText) o).getValue())) {
- return ((OMText) o).getValue();
+ && !"".equals(((OMText) o).getText())) {
+ return ((OMText) o).getText();
}
}
} else {
- faultActorElement = (OMElementImpl) this.getChildWithName(
+ faultActorElement = (OMElementImpl) this.getFirstChildWithName(
new QName(
this.ns.getName(), SOAPConstants.SOAPFAULT_ACTOR_LOCAL_NAME,
this.ns.getPrefix()));
@@ -211,12 +211,12 @@
while (childrenIter.hasNext()) {
Object o = childrenIter.next();
if ((o instanceof OMText)
- && !"".equals(((OMText) o).getValue())) {
- return ((OMText) o).getValue();
+ && !"".equals(((OMText) o).getText())) {
+ return ((OMText) o).getText();
}
}
} else {
- faultStringElement = (OMElementImpl) this.getChildWithName(
+ faultStringElement = (OMElementImpl) this.getFirstChildWithName(
new QName(
this.ns.getName(), SOAPConstants.SOAPFAULT_STRING_LOCAL_NAME,
this.ns.getPrefix()));
@@ -253,12 +253,12 @@
while (childrenIter.hasNext()) {
Object o = childrenIter.next();
if (!((o instanceof OMText)
- && "".equals(((OMText) o).getValue()))) {
+ && "".equals(((OMText) o).getText()))) {
return (OMNode) o;
}
}
} else {
- detailElement = (OMElementImpl) this.getChildWithName(
+ detailElement = (OMElementImpl) this.getFirstChildWithName(
new QName(
this.ns.getName(), SOAPConstants.SOAPFAULT_DETAIL_LOCAL_NAME,
this.ns.getPrefix()));
@@ -284,8 +284,7 @@
XMLStreamWriter writer =
XMLOutputFactory.newInstance().createXMLStreamWriter(
sw);
- ((OMElement) detailsInformationNode).serialize(writer,
- true);
+ ((OMElement) detailsInformationNode).serializeWithCache(writer);
writer.flush();
return new Exception(sw.toString());
} catch (XMLStreamException e1) {
@@ -293,7 +292,7 @@
}
} else if (detailsInformationNode instanceof OMText) {
return new Exception(
- ((OMText) detailsInformationNode).getValue());
+ ((OMText) detailsInformationNode).getText());
}
} else {
return e;
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPHeaderBlockImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPHeaderBlockImpl.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPHeaderBlockImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPHeaderBlockImpl.java Tue Apr 26 00:43:08 2005
@@ -72,7 +72,7 @@
* @param attrValue
*/
private void setAttribute(String attributeName, String attrValue) {
- OMAttribute omAttribute = this.getAttributeWithQName(
+ OMAttribute omAttribute = this.getFirstAttribute(
new QName(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI, attributeName));
if (omAttribute != null) {
omAttribute.setValue(attrValue);
@@ -82,7 +82,7 @@
new OMNamespaceImpl(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX), attrValue);
- this.insertAttribute(attribute);
+ this.addAttribute(attribute);
}
}
@@ -105,7 +105,7 @@
* @return
*/
private String getAttribute(String attrName) {
- OMAttribute omAttribute = this.getAttributeWithQName(
+ OMAttribute omAttribute = this.getFirstAttribute(
new QName(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI, attrName));
return (omAttribute != null)
? omAttribute.getValue()
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPHeaderImpl.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPHeaderImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPHeaderImpl.java Tue Apr 26 00:43:08 2005
@@ -1,18 +1,18 @@
/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
package org.apache.axis.om.impl.llom;
import java.util.ArrayList;
@@ -27,6 +27,7 @@
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.om.SOAPHeader;
import org.apache.axis.om.SOAPHeaderBlock;
+import org.apache.axis.om.OMNode;
import org.apache.axis.om.impl.llom.soap11.SOAP11Constants;
import org.apache.axis.om.impl.llom.traverse.OMChildrenWithSpecificAttributeIterator;
@@ -53,10 +54,10 @@
*/
public SOAPHeaderImpl(SOAPEnvelope envelope, OMXMLParserWrapper builder) {
super(
- SOAPConstants.HEADER_LOCAL_NAME,
- (envelope == null) ? null : envelope.getNamespace(),
- envelope,
- builder);
+ SOAPConstants.HEADER_LOCAL_NAME,
+ (envelope == null) ? null : envelope.getNamespace(),
+ envelope,
+ builder);
}
/**
@@ -73,9 +74,9 @@
* @throws OMException
*/
public SOAPHeaderBlock addHeaderBlock(String localName, OMNamespace ns)
- throws OMException {
+ throws OMException {
SOAPHeaderBlock soapHeaderBlock =
- new SOAPHeaderBlockImpl(localName, ns);
+ new SOAPHeaderBlockImpl(localName, ns);
this.addChild(soapHeaderBlock);
soapHeaderBlock.setComplete(true);
return soapHeaderBlock;
@@ -134,12 +135,12 @@
*/
public Iterator extractHeaderBlocks(String actor) {
return new OMChildrenWithSpecificAttributeIterator(
- getFirstChild(),
- new QName(
- SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
- SOAPConstants.ATTR_ACTOR),
- actor,
- true);
+ getFirstChild(),
+ new QName(
+ SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
+ SOAPConstants.ATTR_ACTOR),
+ actor,
+ true);
}
/**
@@ -156,12 +157,12 @@
*/
public Iterator examineMustUnderstandHeaderBlocks(String actor) {
return new OMChildrenWithSpecificAttributeIterator(
- getFirstChild(),
- new QName(
- SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
- SOAPConstants.ATTR_ACTOR),
- actor,
- false);
+ getFirstChild(),
+ new QName(
+ SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
+ SOAPConstants.ATTR_ACTOR),
+ actor,
+ false);
}
/**
@@ -193,15 +194,20 @@
public ArrayList getHeaderBolcksWithNSURI(String nsURI) {
ArrayList headers = null;
+ OMNode node = null;
OMElement header = this.getFirstElement();
+
if (header != null) {
headers = new ArrayList();
}
- while (header != null) {
- if (nsURI.equals(header.getNamespaceName())) {
- headers.add(header);
+ while (node != null) {
+ if (node.getType()==OMNode.ELEMENT_NODE){
+ header = (OMElement)node;
+ if (nsURI.equals(header.getNamespace().getName())) {
+ headers.add(header);
+ }
}
- header = header.getNextSiblingElement();
+ node = node.getNextSibling();
}
return headers;
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/SAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/SAXOMBuilder.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/SAXOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/SAXOMBuilder.java Tue Apr 26 00:43:08 2005
@@ -98,11 +98,11 @@
else
nextElem.setLocalName(localName);
nextElem
- .setNamespace(nextElem.findInScopeNamespace(namespaceURI, null));
+ .setNamespace(nextElem.findNamespace(namespaceURI, null));
int j = atts.getLength();
for (int i = 0; i < j; i++)
- nextElem.insertAttribute(atts.getLocalName(i), atts.getValue(i),
- nextElem.findInScopeNamespace(atts.getURI(i), null));
+ nextElem.addAttribute(atts.getLocalName(i), atts.getValue(i),
+ nextElem.findNamespace(atts.getURI(i), null));
lastNode = nextElem;
nextElem = null;
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXBuilder.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXBuilder.java Tue Apr 26 00:43:08 2005
@@ -129,13 +129,13 @@
OMNamespace ns = null;
String uri = parser.getAttributeNamespace(i);
if (uri.hashCode() != 0) {
- ns = node.findInScopeNamespace(uri,
+ ns = node.findNamespace(uri,
parser.getAttributePrefix(i));
}
// todo if the attributes are supposed to namespace qualified all the time
// todo then this should throw an exception here
- node.insertAttribute(parser.getAttributeLocalName(i),
+ node.addAttribute(parser.getAttributeLocalName(i),
parser.getAttributeValue(i), ns);
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java Tue Apr 26 00:43:08 2005
@@ -183,7 +183,7 @@
// set the own namespace
OMNamespace namespace =
- node.findInScopeNamespace(parser.getNamespaceURI(),
+ node.findNamespace(parser.getNamespaceURI(),
parser.getPrefix());
node.setNamespace(namespace);
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java Tue Apr 26 00:43:08 2005
@@ -78,9 +78,9 @@
throw new OMException("No SOAPHeader present !!");
}
- envelopeNamespace = soapEnvelope.findDeclaredNamespace(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI, "");
+ envelopeNamespace = soapEnvelope.findNamespace(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI, "");
if (envelopeNamespace == null) {
- envelopeNamespace = getSOAPEnvelope().findDeclaredNamespace(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI, "");
+ envelopeNamespace = getSOAPEnvelope().findNamespace(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI, "");
} else {
log.info("SOAP 1.2 message received ..");
}
@@ -151,7 +151,7 @@
// fill in the attributes
processAttributes(node);
- log.info("Build the OMElelment {" + node.getNamespaceName() + '}'
+ log.info("Build the OMElelment {" + node.getNamespace().getName() + '}'
+ node.getLocalName() + "By the StaxSOAPModelBuilder");
return node;
}
@@ -315,12 +315,12 @@
if (!"".equals(namespaceURI)) {
if (prefix == null) {
// this means, this elements has a default namespace or it has inherited a default namespace from its parent
- namespace = node.findDeclaredNamespace(namespaceURI, "");
+ namespace = node.findNamespace(namespaceURI, "");
if (namespace == null) {
namespace = node.declareNamespace(namespaceURI, "");
}
} else {
- namespace = node.findInScopeNamespace(namespaceURI, prefix);
+ namespace = node.findNamespace(namespaceURI, prefix);
}
node.setNamespace(namespace);
} else {
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/serialize/StreamingOMSerializer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/serialize/StreamingOMSerializer.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/serialize/StreamingOMSerializer.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/serialize/StreamingOMSerializer.java Tue Apr 26 00:43:08 2005
@@ -41,7 +41,7 @@
private int depth = 0;
/**
- * Method serialize
+ * Method serializeWithCache
*
* @param obj
* @param writer
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/traverse/OMChildrenWithSpecificAttributeIterator.java Tue Apr 26 00:43:08 2005
@@ -77,7 +77,7 @@
// check the current node for the criteria
if (currentChild instanceof OMElement) {
OMAttribute attr =
- ((OMElement) currentChild).getAttributeWithQName(
+ ((OMElement) currentChild).getFirstAttribute(
attributeName);
if ((attr != null)
&& attr.getValue().equalsIgnoreCase(attributeValue)) {
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/util/XMLComparator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/util/XMLComparator.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/util/XMLComparator.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/util/XMLComparator.java Tue Apr 26 00:43:08 2005
@@ -83,7 +83,7 @@
OMNode omNode = (OMNode) elementOneChildren.next();
if(omNode instanceof OMElement){
OMElement elementOneChild = (OMElement) omNode;
- OMNode elementTwoChild = elementTwo.getChildWithName(elementOneChild.getQName());
+ OMNode elementTwoChild = elementTwo.getFirstChildWithName(elementOneChild.getQName());
if(elementTwoChild == null){
throw new XMLComparisonException(" There is no " + elementOneChild.getLocalName() + " element under " + elementTwo.getLocalName());
}
@@ -99,7 +99,7 @@
Iterator attributes = elementOne.getAttributes();
while (attributes.hasNext()) {
OMAttribute omAttribute = (OMAttribute) attributes.next();
- OMAttribute attr = elementTwo.getAttributeWithQName(omAttribute.getQName());
+ OMAttribute attr = elementTwo.getFirstAttribute(omAttribute.getQName());
if(attr == null){
throw new XMLComparisonException("Attributes are not the same in two elements. Attribute "+ omAttribute.getLocalName() + " != ");
}
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMBodyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMBodyTest.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMBodyTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMBodyTest.java Tue Apr 26 00:43:08 2005
@@ -42,7 +42,7 @@
assertTrue("SOAP body has no SOAP fault", soapBody.getFault() != null);
//SimpleOMSerializer simpleOMSerializer = new SimpleOMSerializer();
- //simpleOMSerializer.serialize(soapBody, System.out);
+ //simpleOMSerializer.serializeWithCache(soapBody, System.out);
}
}
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMElementTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMElementTest.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMElementTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMElementTest.java Tue Apr 26 00:43:08 2005
@@ -40,7 +40,7 @@
try {
StAXSOAPModelBuilder soapBuilder = getOMBuilder("soap/OMElementTest.xml");
SOAPEnvelope soapEnvelope = (SOAPEnvelope) soapBuilder.getDocumentElement();
- OMElement wsaTo = (OMElement) soapEnvelope.getHeader().getChildWithName(new QName(WSA_URI, WSA_TO));
+ OMElement wsaTo = (OMElement) soapEnvelope.getHeader().getFirstChildWithName(new QName(WSA_URI, WSA_TO));
String expectedString = "http://localhost:8081/axis/services/BankPort";
assertEquals("getText is not returning the correct value", wsaTo.getText().trim(), expectedString);
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java Tue Apr 26 00:43:08 2005
@@ -52,7 +52,7 @@
public void testnavigatorFullyBuilt() throws Exception {
assertNotNull(envelope);
//dump the out put to a temporary file
- envelope.serialize(writer, true);
+ envelope.serializeWithCache(writer);
//now the OM is fully created test the navigation
OMNavigator navigator = new OMNavigator(envelope);
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java Tue Apr 26 00:43:08 2005
@@ -108,15 +108,15 @@
// OMElement root= envelope;
//
- // OMNamespace soapenv= root.findInScopeNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- // OMNamespace wsa= root.findInScopeNamespace("http://schemas.xmlsoap.org/ws/2004/03/addressing", "wsa");
+ // OMNamespace soapenv= root.findNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
+ // OMNamespace wsa= root.findNamespace("http://schemas.xmlsoap.org/ws/2004/03/addressing", "wsa");
// if (wsa==null)
// wsa= root.declareNamespace("http://schemas.xmlsoap.org/ws/2004/03/addressing", "wsa");
//
// //Assumption - A RelatesTo Element does not exist in the input document
// OMElement relatesTo= fac.createOMElement ("RelatesTo", wsa);
- // relatesTo.insertAttribute(fac.createOMAttribute("RelationshipType", null, "wsa:Reply", relatesTo));
- // relatesTo.insertAttribute(fac.createOMAttribute("mustUnderstand", soapenv, "0", relatesTo));
+ // relatesTo.addAttribute(fac.createOMAttribute("RelationshipType", null, "wsa:Reply", relatesTo));
+ // relatesTo.addAttribute(fac.createOMAttribute("mustUnderstand", soapenv, "0", relatesTo));
// relatesTo.addChild(fac.createText(relatesTo, "uuid:3821F4F0-D020-11D8-A10A-E4EE6425FCB0"));
// relatesTo.setComplete(true);
//
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/SOAPFaultTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/SOAPFaultTest.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/SOAPFaultTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/SOAPFaultTest.java Tue Apr 26 00:43:08 2005
@@ -52,7 +52,7 @@
}
private void print() throws XMLStreamException {
- soapEnvelope.serialize(writer, true);
+ soapEnvelope.serializeWithCache(writer);
writer.flush();
}
}
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/StaxParserTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/StaxParserTest.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/StaxParserTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/StaxParserTest.java Tue Apr 26 00:43:08 2005
@@ -46,11 +46,11 @@
OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(OMFactory.newInstance(),
XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(xmlDocument.getBytes())));
- parser2 = builder.getDocumentElement().getPullParser(false);
+ parser2 = builder.getDocumentElement().getXMLStreamReaderWithoutCaching();
OMXMLParserWrapper builder2 = OMXMLBuilderFactory.createStAXOMBuilder(OMFactory.newInstance(),
XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(xmlDocument.getBytes())));
- parser3 = builder2.getDocumentElement().getPullParser(true);
+ parser3 = builder2.getDocumentElement().getXMLStreamReader();
}
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java Tue Apr 26 00:43:08 2005
@@ -16,7 +16,6 @@
package org.apache.axis.om.factory;
import org.apache.axis.om.AbstractTestCase;
-import org.apache.axis.om.OMConstants;
import org.apache.axis.om.OMElement;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.OMNamespace;
@@ -82,7 +81,7 @@
String text = "sampleText";
OMText omText = omFactory.createText(omElement, text);
assertTrue("Programatically created OMText should have done = true ", omText.isComplete());
- assertTrue("Programatically created OMText should have correct text value ", text.equals(omText.getValue()));
+ assertTrue("Programatically created OMText should have correct text value ", text.equals(omText.getText()));
}
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/ElementSerializerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/ElementSerializerTest.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/ElementSerializerTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/ElementSerializerTest.java Tue Apr 26 00:43:08 2005
@@ -55,38 +55,38 @@
public void testElementSerilization() throws Exception {
OMElement elt = builder.getDocumentElement();
- elt.serialize(writer, true);
+ elt.serializeWithCache(writer);
}
public void testElementSerilizationCacheOff() throws Exception {
OMElement elt = builder.getDocumentElement();
- elt.serialize(writer, false);
+ elt.serializeWithCache(writer);
}
public void testElementSerilizationChild() throws Exception {
OMElement elt = builder.getDocumentElement();
OMNode node = elt.getFirstChild().getNextSibling();
- node.serialize(writer, true);
+ node.serializeWithCache(writer);
}
public void testElementSerilizationSOAPBodyCacheOff() throws Exception {
SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
OMNode node = env.getBody();
- node.serialize(writer, false);
+ node.serializeWithCache(writer);
}
public void testElement() throws Exception {
SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
SOAPBody body = env.getBody();
- body.serialize(writer, true);
+ body.serializeWithCache(writer);
}
public void testCompleteElement() throws Exception {
SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
- env.serialize(writer, true);
+ env.serializeWithCache(writer);
}
public void testDualNamespaces1() throws Exception {
@@ -102,7 +102,7 @@
elt12.addChild(elt22);
root.addChild(elt11);
root.addChild(elt12);
- root.serialize(writer, true);
+ root.serializeWithCache(writer);
}
public void testDualNamespaces2() throws Exception {
@@ -116,7 +116,7 @@
elt2.addChild(txt1);
elt1.addChild(elt2);
root.addChild(elt1);
- root.serialize(writer, true);
+ root.serializeWithCache(writer);
}
protected void tearDown() throws Exception {
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/NoNamespaceSerializerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/NoNamespaceSerializerTest.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/NoNamespaceSerializerTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/NoNamespaceSerializerTest.java Tue Apr 26 00:43:08 2005
@@ -83,7 +83,7 @@
// public void testSerilizationWithCacheOff() throws Exception {
// SOAPEnvelope env = (SOAPEnvelope) builderOne.getDocumentElement();
-// env.serialize(writer, false);
+// env.serializeWithCache(writer, false);
// writer.flush();
//
//
@@ -91,19 +91,19 @@
//
// public void testSerilizationWithCacheOn() throws Exception {
// SOAPEnvelope env = (SOAPEnvelope) builderOne.getDocumentElement();
-// env.serialize(writer, true);
+// env.serializeWithCache(writer, true);
// writer.flush();
// }
public void testSerilizationWithDefaultNamespaces() throws Exception {
SOAPEnvelope env = (SOAPEnvelope) builderTwo.getDocumentElement();
- env.serialize(writer, true);
+ env.serializeWithCache(writer);
OMElement balanceElement = env.getBody().getFirstElement();
- assertEquals("Deafualt namespace has not been set properly", balanceElement.getNamespaceName(), "http://localhost:8081/axis/services/BankPort/");
+ assertEquals("Deafualt namespace has not been set properly", balanceElement.getNamespace().getName(), "http://localhost:8081/axis/services/BankPort/");
OMElement accountNo = balanceElement.getFirstElement();
- assertEquals("Deafualt namespace of children has not been set properly", accountNo.getNamespaceName(), "http://localhost:8081/axis/services/BankPort/");
+ assertEquals("Deafualt namespace of children has not been set properly", accountNo.getNamespace().getName(), "http://localhost:8081/axis/services/BankPort/");
}
@@ -117,21 +117,21 @@
XMLStreamWriter xmlStreamWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(System.out);
//env.getBody().addChild(builder.getDocumentElement());
- env.serialize(xmlStreamWriter, false);
- // env.serialize(xmlStreamWriter, true);
+ env.serializeWithCache(xmlStreamWriter);
+ // env.serializeWithCache(xmlStreamWriter, true);
xmlStreamWriter.flush();
}
public void testSerilizationWithCacheOn() throws Exception{
SOAPEnvelope env = (SOAPEnvelope) builderOne.getDocumentElement();
- env.serialize(writer,true);
+ env.serializeWithCache(writer);
writer.flush();
}
public void testSerilizationWithCacheOff() throws Exception{
SOAPEnvelope env = (SOAPEnvelope) builderOne.getDocumentElement();
- env.serialize(writer,false);
+ env.serializeWithCache(writer);
writer.flush();
}
}
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/OMSerailizerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/OMSerailizerTest.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/OMSerailizerTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/OMSerailizerTest.java Tue Apr 26 00:43:08 2005
@@ -62,7 +62,7 @@
reader);
SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
StreamingOMSerializer serializer = new StreamingOMSerializer();
- serializer.serialize(env.getPullParser(false), writer);
+ serializer.serialize(env.getXMLStreamReaderWithoutCaching(), writer);
}
public void testElementPullStream1WithCacheOff() throws Exception {
@@ -70,7 +70,7 @@
reader);
SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
StreamingOMSerializer serializer = new StreamingOMSerializer();
- serializer.serialize(env.getPullParser(true), writer);
+ serializer.serialize(env.getXMLStreamReader(), writer);
}
public void testElementPullStream2() throws Exception {
@@ -79,7 +79,7 @@
SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
SOAPBody body = env.getBody();
StreamingOMSerializer serializer = new StreamingOMSerializer();
- serializer.serialize(body.getPullParser(false), writer);
+ serializer.serialize(body.getXMLStreamReaderWithoutCaching(), writer);
}
protected void tearDown() throws Exception {
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java Tue Apr 26 00:43:08 2005
@@ -49,8 +49,8 @@
// assertNotNull(envelope);
// //this serializing will cause the OM to fully build!
// XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(new FileOutputStream(tempFile));
- // envelope.serialize(writer,true);
- // parser = envelope.getPullParser(false);
+ // envelope.serializeWithCache(writer,true);
+ // parser = envelope.getXMLStreamReader(false);
// while (parser.hasNext()) {
// int event = parser.next();
// assertTrue(event > 0);
@@ -60,7 +60,7 @@
public void testWrapperHalfOM() throws Exception {
assertNotNull(envelope);
- parser = envelope.getPullParser(false);
+ parser = envelope.getXMLStreamReaderWithoutCaching();
while (parser.hasNext()) {
int event = parser.next();
assertTrue(event > 0);
@@ -69,7 +69,7 @@
// public void testWrapperHalfOMWithCacheOff() throws Exception {
// assertNotNull(envelope);
- // parser = envelope.getPullParser(true);
+ // parser = envelope.getXMLStreamReader(true);
// while (parser.hasNext()) {
// int event = parser.next();
// assertTrue(event > 0);
@@ -78,7 +78,7 @@
//
// public void testWrapperElementEventGenerationWithHalfOMWithCacheOff() throws XMLStreamException {
// assertNotNull(envelope);
- // parser = envelope.getPullParser(true);
+ // parser = envelope.getXMLStreamReader(true);
// while (parser.hasNext()) {
// int event = parser.next();
// assertTrue(event > 0);
@@ -94,7 +94,7 @@
//
// public void testWrapperElementEventGenerationWithHalfOM() throws Exception {
// assertNotNull(envelope);
- // parser = envelope.getPullParser(false);
+ // parser = envelope.getXMLStreamReader(false);
// while (parser.hasNext()) {
// int event = parser.next();
// assertTrue(event > 0);
@@ -149,7 +149,7 @@
//
// public void testWrapperElementEventGenerationWithHalfOMWithCacheOff() throws XMLStreamException {
// assertNotNull(envelope);
- // parser = envelope.getPullParser(true);
+ // parser = envelope.getXMLStreamReader(true);
// while (parser.hasNext()) {
// int event = parser.next();
// assertTrue(event > 0);
@@ -165,7 +165,7 @@
//
// public void testWrapperElementEventGenerationWithHalfOM() throws Exception {
// assertNotNull(envelope);
- // parser = envelope.getPullParser(false);
+ // parser = envelope.getXMLStreamReader(false);
// while (parser.hasNext()) {
// int event = parser.next();
// assertTrue(event > 0);
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java Tue Apr 26 00:43:08 2005
@@ -51,7 +51,7 @@
assertNotNull(envelope);
XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(new FileOutputStream(tempFile));
// XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(System.out);
- envelope.serialize(writer, true);
+ envelope.serializeWithCache(writer);
}
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/util/XMLComparator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/util/XMLComparator.java?rev=164761&r1=164760&r2=164761&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/util/XMLComparator.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/util/XMLComparator.java Tue Apr 26 00:43:08 2005
@@ -81,7 +81,7 @@
OMNode omNode = (OMNode) elementOneChildren.next();
if(omNode instanceof OMElement){
OMElement elementOneChild = (OMElement) omNode;
- OMNode elementTwoChild = elementTwo.getChildWithName(elementOneChild.getQName());
+ OMNode elementTwoChild = elementTwo.getFirstChildWithName(elementOneChild.getQName());
if(elementTwoChild == null){
throw new XMLComparisonException(" There is no " + elementOneChild.getLocalName() + " element under " + elementTwo.getLocalName());
}
@@ -95,7 +95,7 @@
Iterator attributes = elementOne.getAttributes();
while (attributes.hasNext()) {
OMAttribute omAttribute = (OMAttribute) attributes.next();
- OMAttribute attr = elementTwo.getAttributeWithQName(omAttribute.getQName());
+ OMAttribute attr = elementTwo.getFirstAttribute(omAttribute.getQName());
if(attr == null){
throw new XMLComparisonException("Attributes are not the same in two elements. Attribute "+ omAttribute.getLocalName() + " != ");
}