Updating to jdom2

Author: coheigea

pom.xml

@@ -160,9 +160,9 @@ under the License.
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>jdom</groupId>
-      <artifactId>jdom</artifactId>
-      <version>1.0</version>
+      <groupId>org.jdom</groupId>
+      <artifactId>jdom2</artifactId>
+      <version>2.0.6.1</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -205,6 +205,10 @@ under the License.
           <groupId>commons-digester</groupId>
           <artifactId>commons-digester</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>jdom</groupId>
+          <artifactId>jdom</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>

src/main/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java

@@ -95,7 +95,7 @@ public class JXPathContextReferenceImpl extends JXPathContext {
         // JDOM  factory is only registered if JDOM is on the classpath
         Object jdomFactory = allocateConditionally(
                 "org.apache.commons.jxpath.ri.model.jdom.JDOMPointerFactory",
-                "org.jdom.Document");
+                "org.jdom2.Document");
         if (jdomFactory != null) {
             nodeFactories.add(jdomFactory);
         }

src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributeIterator.java

@@ -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.

src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMAttributePointer.java

@@ -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.

src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNamespaceIterator.java

@@ -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.

src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodeIterator.java

@@ -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.

src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java

@@ -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.

src/main/java/org/apache/commons/jxpath/ri/model/jdom/JDOMPointerFactory.java

@@ -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.

src/main/java/org/apache/commons/jxpath/xml/JDOMParser.java

@@ -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.

src/test/java/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java

@@ -23,11 +23,11 @@
 import org.apache.commons.jxpath.ri.model.XMLModelTestCase;
 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;
 
 /**
  * Tests JXPath with JDOM
@@ -136,4 +136,4 @@ private void appendXMLSignature(
                 pi);
         }
     }
-}
+}