Author: veithen
Date: Sun Mar 8 14:20:50 2009
New Revision: 751430
URL: http://svn.apache.org/viewvc?rev=751430&view=rev
Log:
Merged OMNavigator (LLOM) and DOMNavigator (DOOM) into a single class in
axiom-api. These classes were almost identical. Only the code accessing the
first child of a container and the next sibling of a node without advancing the
parser was implementation specific, but this can be better achieved by adding
methods for this to OMContainerEx and OMNodeEx.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNavigator.java
(contents, props changed)
- copied, changed from r750344,
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNavigator.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/OMNavigatorTestBase.java
(contents, props changed)
- copied, changed from r751424,
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMNavigatorTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/OMNavigatorTest.java
(with props)
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/om/impl/OMNavigatorTest.java
(with props)
Removed:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMNavigator.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNavigator.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMNavigatorTest.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMContainerEx.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMContainerEx.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMContainerEx.java?rev=751430&r1=751429&r2=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMContainerEx.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMContainerEx.java
Sun Mar 8 14:20:50 2009
@@ -42,4 +42,16 @@
* @param omNode
*/
public void setLastChild(OMNode omNode);
+
+ /**
+ * Get the first child if it is available. The child is available if it is
complete or
+ * if the builder has started building the node. In the latter case,
+ * {...@link OMNode#isComplete()} may return <code>false</code> when
called on the child.
+ * In contrast to {...@link OMContainer#getFirstOMChild()}, this method
will never modify
+ * the state of the underlying parser.
+ *
+ * @return the first child or <code>null</code> if the container has no
children or
+ * the builder has not yet started to build the first child
+ */
+ public OMNode getFirstOMChildIfAvailable();
}
Copied:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNavigator.java
(from r750344,
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNavigator.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNavigator.java?p2=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNavigator.java&p1=webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNavigator.java&r1=750344&r2=751430&rev=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNavigator.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNavigator.java
Sun Mar 8 14:20:50 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axiom.om.impl.llom;
+package org.apache.axiom.om.impl;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDocument;
@@ -83,7 +83,7 @@
/**
* Gets the next node.
*
- * @return Returns OMnode in the sequence of preorder traversal. Note
however that an element
+ * @return Returns OMNode in the sequence of preorder traversal. Note
however that an element
* node is treated slightly differently. Once the element is
passed it returns the same
* element in the next encounter as well.
*/
@@ -109,7 +109,6 @@
/** Private method to encapsulate the searching logic. */
private void updateNextNode() {
-
if ((next instanceof OMElement) && !visited) {
OMNode firstChild = _getFirstChild((OMElement) next);
if (firstChild != null) {
@@ -125,7 +124,7 @@
if (nextSibling != null) {
next = nextSibling;
} else if ((parent != null) && parent.isComplete() && !(parent
instanceof OMDocument)) {
- next = (OMNodeImpl) parent;
+ next = (OMNode) parent;
backtracked = true;
} else {
next = null;
@@ -146,10 +145,7 @@
}
return first;
} else {
- // Field access is used to prevent advancing the parser.
- // Some tests fail if the following is used
- // return node.getFirstOMChild()
- return ((OMElementImpl) node).firstChild;
+ return ((OMContainerEx) node).getFirstOMChildIfAvailable();
}
}
@@ -161,10 +157,7 @@
if (node instanceof OMSourcedElement) {
return node.getNextOMSibling();
} else {
- // Field access is used to prevent advancing the parser.
- // Some tests fail if the following is used
- // return node.getNextOMSibling()
- return ((OMNodeImpl) node).nextSibling;
+ return ((OMNodeEx) node).getNextOMSiblingIfAvailable();
}
}
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNavigator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNavigator.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java?rev=751430&r1=751429&r2=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNodeEx.java
Sun Mar 8 14:20:50 2009
@@ -60,4 +60,16 @@
* @throws XMLStreamException
*/
public void internalSerializeAndConsume(XMLStreamWriter writer) throws
XMLStreamException;
+
+ /**
+ * Get the next sibling if it is available. The sibling is available if it
is complete or
+ * if the builder has started building the node. In the latter case,
+ * {...@link OMNode#isComplete()} may return <code>false</code> when
called on the sibling.
+ * In contrast to {...@link OMNode#getNextOMSibling()}, this method will
never modify
+ * the state of the underlying parser.
+ *
+ * @return the next sibling or <code>null</code> if the node has no next
sibling or
+ * the builder has not yet started to build the next sibling
+ */
+ public OMNode getNextOMSiblingIfAvailable();
}
Copied:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/OMNavigatorTestBase.java
(from r751424,
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMNavigatorTest.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/OMNavigatorTestBase.java?p2=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/OMNavigatorTestBase.java&p1=webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMNavigatorTest.java&r1=751424&r2=751430&rev=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMNavigatorTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/OMNavigatorTestBase.java
Sun Mar 8 14:20:50 2009
@@ -17,9 +17,15 @@
* under the License.
*/
-package org.apache.axiom.om;
+package org.apache.axiom.om.impl;
-import org.apache.axiom.om.impl.llom.OMNavigator;
+import org.apache.axiom.om.AbstractTestCase;
+import org.apache.axiom.om.OMConstants;
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.TestConstants;
+import org.apache.axiom.om.impl.OMNavigator;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
@@ -30,18 +36,19 @@
import java.io.ByteArrayOutputStream;
-public class OMNavigatorTest extends AbstractTestCase {
+public class OMNavigatorTestBase extends AbstractTestCase {
+ private final OMMetaFactory omMetaFactory;
private SOAPEnvelope envelope = null;
private OMXMLParserWrapper builder;
- public OMNavigatorTest(String testName) {
- super(testName);
+ public OMNavigatorTestBase(OMMetaFactory omMetaFactory) {
+ this.omMetaFactory = omMetaFactory;
}
protected void setUp() throws Exception {
XMLStreamReader xmlStreamReader = XMLInputFactory.newInstance().
createXMLStreamReader(getTestResource(TestConstants.SOAP_SOAPMESSAGE1));
- builder = new StAXSOAPModelBuilder(xmlStreamReader, null);
+ builder = new StAXSOAPModelBuilder(omMetaFactory, xmlStreamReader,
null);
envelope = (SOAPEnvelope) builder.getDocumentElement();
}
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/OMNavigatorTestBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/OMNavigatorTestBase.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java?rev=751430&r1=751429&r2=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java
Sun Mar 8 14:20:50 2009
@@ -50,6 +50,10 @@
return nextSibling;
}
+ public OMNode getNextOMSiblingIfAvailable() {
+ return nextSibling;
+ }
+
public Node getNextSibling() {
return (Node) this.getNextOMSibling();
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java?rev=751430&r1=751429&r2=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMStAXWrapper.java
Sun Mar 8 14:20:50 2009
@@ -32,6 +32,7 @@
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.OMXMLStreamReader;
import org.apache.axiom.om.impl.EmptyOMLocation;
+import org.apache.axiom.om.impl.OMNavigator;
import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axiom.om.impl.exception.OMStreamingException;
import org.w3c.dom.Attr;
@@ -55,7 +56,7 @@
*/
public class DOMStAXWrapper implements OMXMLStreamReader, XMLStreamConstants {
/** Field navigator */
- private DOMNavigator navigator;
+ private OMNavigator navigator;
/** Field builder */
private OMXMLParserWrapper builder;
@@ -171,7 +172,7 @@
boolean cache) {
// create a navigator
- this.navigator = new DOMNavigator(startNode);
+ this.navigator = new OMNavigator(startNode);
this.builder = builder;
this.rootNode = startNode;
if (rootNode != null && rootNode.getParent() != null
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java?rev=751430&r1=751429&r2=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NodeImpl.java
Sun Mar 8 14:20:50 2009
@@ -429,6 +429,10 @@
return null;
}
+ public OMNode getNextOMSiblingIfAvailable() {
+ return null;
+ }
+
public void setPreviousOMSibling(OMNode previousSibling) {
throw new DOMException(DOMException.HIERARCHY_REQUEST_ERR,
DOMMessageFormatter.formatMessage(
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java?rev=751430&r1=751429&r2=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ParentNode.java
Sun Mar 8 14:20:50 2009
@@ -133,6 +133,10 @@
return firstChild;
}
+ public OMNode getFirstOMChildIfAvailable() {
+ return firstChild;
+ }
+
public void setFirstChild(OMNode omNode) {
if (firstChild != null) {
((OMNodeEx) omNode).setParent(this);
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/OMNavigatorTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/OMNavigatorTest.java?rev=751430&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/OMNavigatorTest.java
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/OMNavigatorTest.java
Sun Mar 8 14:20:50 2009
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.axiom.om.impl;
+
+import org.apache.axiom.om.impl.dom.factory.OMDOMMetaFactory;
+
+public class OMNavigatorTest extends OMNavigatorTestBase {
+ public OMNavigatorTest() {
+ super(new OMDOMMetaFactory());
+ }
+}
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/OMNavigatorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java?rev=751430&r1=751429&r2=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMDocumentImpl.java
Sun Mar 8 14:20:50 2009
@@ -254,6 +254,10 @@
return firstChild;
}
+ public OMNode getFirstOMChildIfAvailable() {
+ return firstChild;
+ }
+
/**
* Method getFirstChildWithName.
*
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=751430&r1=751429&r2=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
Sun Mar 8 14:20:50 2009
@@ -692,6 +692,11 @@
return firstChild;
}
+ public OMNode getFirstOMChildIfAvailable() {
+ return firstChild;
+ }
+
+
/** Method setFirstChild. */
public void setFirstChild(OMNode firstChild) {
if (firstChild != null) {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java?rev=751430&r1=751429&r2=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNodeImpl.java
Sun Mar 8 14:20:50 2009
@@ -143,6 +143,10 @@
return nextSibling;
}
+ public OMNode getNextOMSiblingIfAvailable() {
+ return nextSibling;
+ }
+
/**
* Method setNextOMSibling.
*
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=751430&r1=751429&r2=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
Sun Mar 8 14:20:50 2009
@@ -917,6 +917,10 @@
return super.getFirstOMChild();
}
+ public OMNode getFirstOMChildIfAvailable() {
+ return super.getFirstOMChildIfAvailable();
+ }
+
/* (non-Javadoc)
* @see org.apache.axiom.om.OMContainer#buildNext()
*/
@@ -945,6 +949,10 @@
return super.getNextOMSibling();
}
+ public OMNode getNextOMSiblingIfAvailable() {
+ return super.getNextOMSiblingIfAvailable();
+ }
+
/* (non-Javadoc)
* @see org.apache.axiom.om.impl.llom.OMElementImpl#getTrimmedText()
*/
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java?rev=751430&r1=751429&r2=751430&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMStAXWrapper.java
Sun Mar 8 14:20:50 2009
@@ -47,6 +47,7 @@
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.OMXMLStreamReader;
import org.apache.axiom.om.impl.EmptyOMLocation;
+import org.apache.axiom.om.impl.OMNavigator;
import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axiom.om.impl.exception.OMStreamingException;
import org.apache.axiom.om.impl.llom.util.NamespaceContextImpl;
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/om/impl/OMNavigatorTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/om/impl/OMNavigatorTest.java?rev=751430&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/om/impl/OMNavigatorTest.java
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/om/impl/OMNavigatorTest.java
Sun Mar 8 14:20:50 2009
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.axiom.om.impl;
+
+import org.apache.axiom.om.impl.llom.factory.OMLinkedListMetaFactory;
+
+public class OMNavigatorTest extends OMNavigatorTestBase {
+ public OMNavigatorTest() {
+ super(new OMLinkedListMetaFactory());
+ }
+}
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/test/java/org/apache/axiom/om/impl/OMNavigatorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
