You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2010/05/27 00:08:18 UTC
svn commit: r948612 - in /webservices/commons/trunk/modules/axiom: ./
modules/axiom-api/ modules/axiom-api/src/test/java/org/apache/axiom/om/xpath/
modules/axiom-api/src/test/java/org/jaxen/
modules/axiom-api/src/test/resources/jaxen/ modules/axiom-dom...
Author: veithen
Date: Wed May 26 22:08:17 2010
New Revision: 948612
URL: http://svn.apache.org/viewvc?rev=948612&view=rev
Log:
WSCOMMONS-545: Moved the unit Jaxen unit test code (copied from Jaxen and included as sources in Axiom) into a separate module. That will make it easier to manage the legal files that are necessary for this. It also effectively makes sure that people don't modify these files accidentally.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/pom.xml (with props)
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/JaxenXPathTestBase.java (with props)
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/NavigatorWrapper.java (with props)
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/jaxen/
- copied from r948592, webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/jaxen/
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/
webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/resources/xml/
- copied from r948188, webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/resources/jaxen/xml/
Removed:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/jaxen/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/resources/jaxen/
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/xpath/AXIOMXPathTestBase.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/ElementImplTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-parser-tests/pom.xml
webservices/commons/trunk/modules/axiom/pom.xml
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml?rev=948612&r1=948611&r2=948612&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml Wed May 26 22:08:17 2010
@@ -75,6 +75,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-jaxen-testsuite</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/xpath/AXIOMXPathTestBase.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/xpath/AXIOMXPathTestBase.java?rev=948612&r1=948611&r2=948612&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/xpath/AXIOMXPathTestBase.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/xpath/AXIOMXPathTestBase.java Wed May 26 22:08:17 2010
@@ -19,11 +19,7 @@
package org.apache.axiom.om.xpath;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.io.InputStream;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -33,12 +29,11 @@ import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.test.jaxen.JaxenXPathTestBase;
import org.apache.axiom.util.stax.wrapper.XMLStreamReaderWrapper;
-import org.jaxen.FunctionCallException;
import org.jaxen.Navigator;
-import org.jaxen.test.XPathTestBase;
-public class AXIOMXPathTestBase extends XPathTestBase {
+public class AXIOMXPathTestBase extends JaxenXPathTestBase {
static class RootWhitespaceFilter extends XMLStreamReaderWrapper {
private int depth;
@@ -72,56 +67,26 @@ public class AXIOMXPathTestBase extends
}
}
- static String TESTS_ROOT;
-
- static {
- URL testsXmlUrl = XPathTestBase.class.getClassLoader().getResource("jaxen/xml/test/tests.xml");
- try {
- TESTS_ROOT = new URL(testsXmlUrl, "../..").toExternalForm();
- } catch (MalformedURLException ex) {
- throw new RuntimeException(ex);
- }
- }
-
final OMMetaFactory omMetaFactory;
- final List documents = new ArrayList();
public AXIOMXPathTestBase(String name, OMMetaFactory omMetaFactory) {
super(name);
this.omMetaFactory = omMetaFactory;
}
- protected void tearDown() throws Exception {
- super.tearDown();
- for (Iterator it = documents.iterator(); it.hasNext(); ) {
- ((OMDocument)it.next()).close(false);
- }
- documents.clear();
+ protected Navigator createNavigator() {
+ return new DocumentNavigator();
}
- protected Object getDocument(String url) throws Exception {
- // This method is actually never used in XPathTestBase; it only uses Navigator#getDocument
- return null;
+ protected Object loadDocument(InputStream in) throws Exception {
+ // Jaxen's unit tests assume that whitespace in the prolog/epilog is not
+ // represented in the tree (as in DOM), so we need to filter these events.
+ XMLStreamReader reader = new RootWhitespaceFilter(
+ StAXUtils.createXMLStreamReader(in));
+ return new StAXOMBuilder(omMetaFactory.getOMFactory(), reader).getDocument();
}
- protected Navigator getNavigator() {
- return new DocumentNavigator() {
- // We need to tweak the getDocument method a bit to load the document from the right
- // place. Also, Jaxen's unit tests assume that whitespace in the prolog/epilog is not
- // represented in the tree (as in DOM), so we need to filter these events.
- public Object getDocument(String uri) throws FunctionCallException {
- try {
- URL url = new URL(TESTS_ROOT + uri);
- XMLStreamReader reader = new RootWhitespaceFilter(
- StAXUtils.createXMLStreamReader(url.openStream()));
- OMDocument document = new StAXOMBuilder(omMetaFactory.getOMFactory(),
- reader).getDocument();
- documents.add(document);
- return document;
- } catch (Exception ex) {
- throw new FunctionCallException(ex);
- }
- }
- };
+ protected void releaseDocument(Object document) {
+ ((OMDocument)document).close(false);
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml?rev=948612&r1=948611&r2=948612&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml Wed May 26 22:08:17 2010
@@ -83,6 +83,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-jaxen-testsuite</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/ElementImplTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/ElementImplTest.java?rev=948612&r1=948611&r2=948612&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/ElementImplTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/ElementImplTest.java Wed May 26 22:08:17 2010
@@ -217,7 +217,7 @@ public class ElementImplTest extends OME
DOMTestUtil.execute(new DOMTestUtil.Test() {
public void execute(DocumentBuilderFactory dbf) throws Exception {
Document doc =
- dbf.newDocumentBuilder().parse(getTestResource("jaxen/xml/numbers.xml"));
+ dbf.newDocumentBuilder().parse(getTestResource("xml/numbers.xml"));
Element element = doc.getDocumentElement();
NodeList list = element.getElementsByTagName("nr");
assertEquals(10, list.getLength());
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml?rev=948612&r1=948611&r2=948612&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml Wed May 26 22:08:17 2010
@@ -83,6 +83,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-jaxen-testsuite</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
Added: webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/pom.xml?rev=948612&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/pom.xml (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/pom.xml Wed May 26 22:08:17 2010
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom</artifactId>
+ <version>1.2.9-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <artifactId>axiom-jaxen-testsuite</artifactId>
+ <name>Axiom Jaxen Test Suite</name>
+ <description>
+ Contains unit test code from Jaxen.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/JaxenXPathTestBase.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/JaxenXPathTestBase.java?rev=948612&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/JaxenXPathTestBase.java (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/JaxenXPathTestBase.java Wed May 26 22:08:17 2010
@@ -0,0 +1,86 @@
+/*
+ * 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.test.jaxen;
+
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jaxen.FunctionCallException;
+import org.jaxen.Navigator;
+import org.jaxen.test.XPathTestBase;
+
+public abstract class JaxenXPathTestBase extends XPathTestBase {
+ static String TESTS_ROOT;
+
+ static {
+ URL testsXmlUrl = XPathTestBase.class.getClassLoader().getResource("xml/test/tests.xml");
+ try {
+ TESTS_ROOT = new URL(testsXmlUrl, "../..").toExternalForm();
+ } catch (MalformedURLException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ final List documents = new ArrayList();
+
+ public JaxenXPathTestBase(String name) {
+ super(name);
+ }
+
+ protected abstract Object loadDocument(InputStream in) throws Exception;
+
+ protected abstract void releaseDocument(Object document);
+
+ protected abstract Navigator createNavigator();
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ for (Iterator it = documents.iterator(); it.hasNext(); ) {
+ releaseDocument(it.next());
+ }
+ documents.clear();
+ }
+
+ protected final Object getDocument(String url) throws Exception {
+ // This method is actually never used in XPathTestBase; it only uses Navigator#getDocument
+ return null;
+ }
+
+ protected final Navigator getNavigator() {
+ return new NavigatorWrapper(createNavigator()) {
+ // We need to tweak the getDocument method a bit to load the document from the right
+ // place.
+ public Object getDocument(String uri) throws FunctionCallException {
+ try {
+ URL url = new URL(TESTS_ROOT + uri);
+ Object document = loadDocument(url.openStream());
+ documents.add(document);
+ return document;
+ } catch (Exception ex) {
+ throw new FunctionCallException(ex);
+ }
+ }
+ };
+ }
+}
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/JaxenXPathTestBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/NavigatorWrapper.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/NavigatorWrapper.java?rev=948612&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/NavigatorWrapper.java (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/NavigatorWrapper.java Wed May 26 22:08:17 2010
@@ -0,0 +1,200 @@
+/*
+ * 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.test.jaxen;
+
+import java.util.Iterator;
+
+import org.jaxen.FunctionCallException;
+import org.jaxen.Navigator;
+import org.jaxen.UnsupportedAxisException;
+import org.jaxen.XPath;
+import org.jaxen.saxpath.SAXPathException;
+
+public class NavigatorWrapper implements Navigator {
+ private final Navigator parent;
+
+ public Iterator getAncestorAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getAncestorAxisIterator(arg0);
+ }
+
+ public Iterator getAncestorOrSelfAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getAncestorOrSelfAxisIterator(arg0);
+ }
+
+ public Iterator getAttributeAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getAttributeAxisIterator(arg0);
+ }
+
+ public String getAttributeName(Object arg0) {
+ return parent.getAttributeName(arg0);
+ }
+
+ public String getAttributeNamespaceUri(Object arg0) {
+ return parent.getAttributeNamespaceUri(arg0);
+ }
+
+ public String getAttributeQName(Object arg0) {
+ return parent.getAttributeQName(arg0);
+ }
+
+ public String getAttributeStringValue(Object arg0) {
+ return parent.getAttributeStringValue(arg0);
+ }
+
+ public Iterator getChildAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getChildAxisIterator(arg0);
+ }
+
+ public String getCommentStringValue(Object arg0) {
+ return parent.getCommentStringValue(arg0);
+ }
+
+ public Iterator getDescendantAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getDescendantAxisIterator(arg0);
+ }
+
+ public Iterator getDescendantOrSelfAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getDescendantOrSelfAxisIterator(arg0);
+ }
+
+ public Object getDocument(String arg0) throws FunctionCallException {
+ return parent.getDocument(arg0);
+ }
+
+ public Object getDocumentNode(Object arg0) {
+ return parent.getDocumentNode(arg0);
+ }
+
+ public Object getElementById(Object arg0, String arg1) {
+ return parent.getElementById(arg0, arg1);
+ }
+
+ public String getElementName(Object arg0) {
+ return parent.getElementName(arg0);
+ }
+
+ public String getElementNamespaceUri(Object arg0) {
+ return parent.getElementNamespaceUri(arg0);
+ }
+
+ public String getElementQName(Object arg0) {
+ return parent.getElementQName(arg0);
+ }
+
+ public String getElementStringValue(Object arg0) {
+ return parent.getElementStringValue(arg0);
+ }
+
+ public Iterator getFollowingAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getFollowingAxisIterator(arg0);
+ }
+
+ public Iterator getFollowingSiblingAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getFollowingSiblingAxisIterator(arg0);
+ }
+
+ public Iterator getNamespaceAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getNamespaceAxisIterator(arg0);
+ }
+
+ public String getNamespacePrefix(Object arg0) {
+ return parent.getNamespacePrefix(arg0);
+ }
+
+ public String getNamespaceStringValue(Object arg0) {
+ return parent.getNamespaceStringValue(arg0);
+ }
+
+ public short getNodeType(Object arg0) {
+ return parent.getNodeType(arg0);
+ }
+
+ public Iterator getParentAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getParentAxisIterator(arg0);
+ }
+
+ public Object getParentNode(Object arg0) throws UnsupportedAxisException {
+ return parent.getParentNode(arg0);
+ }
+
+ public Iterator getPrecedingAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getPrecedingAxisIterator(arg0);
+ }
+
+ public Iterator getPrecedingSiblingAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getPrecedingSiblingAxisIterator(arg0);
+ }
+
+ public String getProcessingInstructionData(Object arg0) {
+ return parent.getProcessingInstructionData(arg0);
+ }
+
+ public String getProcessingInstructionTarget(Object arg0) {
+ return parent.getProcessingInstructionTarget(arg0);
+ }
+
+ public Iterator getSelfAxisIterator(Object arg0) throws UnsupportedAxisException {
+ return parent.getSelfAxisIterator(arg0);
+ }
+
+ public String getTextStringValue(Object arg0) {
+ return parent.getTextStringValue(arg0);
+ }
+
+ public boolean isAttribute(Object arg0) {
+ return parent.isAttribute(arg0);
+ }
+
+ public boolean isComment(Object arg0) {
+ return parent.isComment(arg0);
+ }
+
+ public boolean isDocument(Object arg0) {
+ return parent.isDocument(arg0);
+ }
+
+ public boolean isElement(Object arg0) {
+ return parent.isElement(arg0);
+ }
+
+ public boolean isNamespace(Object arg0) {
+ return parent.isNamespace(arg0);
+ }
+
+ public boolean isProcessingInstruction(Object arg0) {
+ return parent.isProcessingInstruction(arg0);
+ }
+
+ public boolean isText(Object arg0) {
+ return parent.isText(arg0);
+ }
+
+ public XPath parseXPath(String arg0) throws SAXPathException {
+ return parent.parseXPath(arg0);
+ }
+
+ public String translateNamespacePrefixToUri(String arg0, Object arg1) {
+ return parent.translateNamespacePrefixToUri(arg0, arg1);
+ }
+
+ public NavigatorWrapper(Navigator parent) {
+ this.parent = parent;
+ }
+}
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite/src/main/java/org/apache/axiom/test/jaxen/NavigatorWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-parser-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-parser-tests/pom.xml?rev=948612&r1=948611&r2=948612&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-parser-tests/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-parser-tests/pom.xml Wed May 26 22:08:17 2010
@@ -86,6 +86,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-jaxen-testsuite</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=948612&r1=948611&r2=948612&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Wed May 26 22:08:17 2010
@@ -552,6 +552,7 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.6</version>
+ <inherited>false</inherited>
<executions>
<execution>
<phase>verify</phase>
@@ -561,7 +562,6 @@
</execution>
</executions>
<configuration>
- <!-- excludeSubProjects>false</excludeSubProjects -->
<excludes>
<!-- RAT doesn't recognize this one as notes file -->
<exclude>RELEASE-NOTE.txt</exclude>
@@ -570,7 +570,8 @@
<!-- We can't add license headers to test resources -->
<exclude>src/test/resources/**</exclude>
<!-- TODO: These are indeed copies of classes from Jaxen -->
- <exlucde>src/test/java/org/jaxen/test/**</exlucde>
+ <exlucde>src/main/resources/xml/**</exlucde>
+ <exlucde>src/main/java/org/jaxen/test/**</exlucde>
<!-- TODO: This is related to the previous one an needs to be investigated -->
<exclude>legal/jaxen-LICENSE.txt</exclude>
<!-- Files used by various developer tools -->
@@ -755,6 +756,7 @@
</distributionManagement>
<modules>
<module>modules/axiom-testutils</module>
+ <module>modules/axiom-jaxen-testsuite</module>
<module>modules/axiom-api</module>
<module>modules/axiom-impl</module>
<module>modules/axiom-dom</module>