Skip to content

Updating to jdom2 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coheigea wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updating to jdom2 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
346ce1a
Updating to jdom2
coheigea Oct 18, 2022
b7a15a4
Merge branch 'master' into coheigea/jdom2
garydgregory Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1.3</version>
<artifactId>jdom2</artifactId>
<version>2.0.6.1</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -266,6 +266,10 @@
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</exclusion>
<exclusion>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public class JXPathContextReferenceImpl extends JXPathContext {
// JDOM factory is only registered if JDOM is on the classpath
final Object jdomFactory = allocateConditionally(
"org.apache.commons.jxpath.ri.model.jdom.JDOMPointerFactory",
"org.jdom.Document");
"org.jdom2.Document");
if (jdomFactory != null) {
nodeFactories.add(jdomFactory);
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import org.apache.commons.jxpath.ri.QName;
import org.apache.commons.jxpath.ri.model.NodeIterator;
import org.apache.commons.jxpath.ri.model.NodePointer;
import org.jdom.Attribute;
import org.jdom.Element;
import org.jdom.Namespace;
import org.jdom2.Attribute;
import org.jdom2.Element;
import org.jdom2.Namespace;

/**
* An iterator of attributes of a DOM Node.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.apache.commons.jxpath.ri.QName;
import org.apache.commons.jxpath.ri.model.NodePointer;
import org.apache.commons.jxpath.util.TypeUtils;
import org.jdom.Attribute;
import org.jdom2.Attribute;

/**
* A Pointer that points to a DOM node.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespaceIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

import org.apache.commons.jxpath.ri.model.NodeIterator;
import org.apache.commons.jxpath.ri.model.NodePointer;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.Namespace;
import org.jdom2.Document;
import org.jdom2.Element;
import org.jdom2.Namespace;

/**
* An iterator of namespaces of a DOM Node.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import org.apache.commons.jxpath.ri.compiler.NodeTest;
import org.apache.commons.jxpath.ri.model.NodeIterator;
import org.apache.commons.jxpath.ri.model.NodePointer;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom2.Document;
import org.jdom2.Element;

/**
* An iterator of children of a JDOM Node.
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
import org.apache.commons.jxpath.ri.model.NodeIterator;
import org.apache.commons.jxpath.ri.model.NodePointer;
import org.apache.commons.jxpath.util.TypeUtils;
import org.jdom.Attribute;
import org.jdom.CDATA;
import org.jdom.Comment;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.Namespace;
import org.jdom.ProcessingInstruction;
import org.jdom.Text;
import org.jdom2.Attribute;
import org.jdom2.CDATA;
import org.jdom2.Comment;
import org.jdom2.Document;
import org.jdom2.Element;
import org.jdom2.Namespace;
import org.jdom2.ProcessingInstruction;
import org.jdom2.Text;

/**
* A Pointer that points to a DOM node.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import org.apache.commons.jxpath.ri.QName;
import org.apache.commons.jxpath.ri.model.NodePointer;
import org.apache.commons.jxpath.ri.model.NodePointerFactory;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom2.Document;
import org.jdom2.Element;

/**
* Implements NodePointerFactory for DOM elements.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/jxpath/xml/JDOMParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.io.InputStream;

import org.apache.commons.jxpath.JXPathException;
import org.jdom.input.SAXBuilder;
import org.jdom2.input.SAXBuilder;

/**
* An implementation of the XMLParser interface that produces a JDOM Document.
Expand Down
13 changes: 7 additions & 6 deletions src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.ri.model.AbstractXMLModelTest;
import org.apache.commons.jxpath.xml.DocumentContainer;
import org.jdom.Attribute;
import org.jdom.CDATA;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.Text;

import org.jdom2.Attribute;
import org.jdom2.CDATA;
import org.jdom2.Document;
import org.jdom2.Element;
import org.jdom2.Text;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -141,4 +142,4 @@ private void appendXMLSignature(
pi);
}
}
}
}
2 changes: 1 addition & 1 deletion src/test/java/org/apache/commons/jxpath/ri/model/jdom/TestJDOMFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.apache.commons.jxpath.AbstractFactory;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
import org.jdom.Element;
import org.jdom2.Element;

/**
* Test AbstractFactory.
Expand Down
Loading