Permalink
Browse files

Complete jdom to jdom2 package rename.

All file references changed, in package, imports, and whatever needed
fixing to get junit tests to complete successfully
  • Loading branch information...
1 parent 77db3c1 commit 2ce8a11adc66d0195143ec253af4664e73f94101 @rolfl rolfl committed Aug 2, 2011
Showing with 336 additions and 335 deletions.
  1. +1 −0 .gitignore
  2. 0 contrib/build.bat
  3. 0 contrib/build.sh
  4. +3 −3 contrib/samples/JTreeOutputterDemo.java
  5. +4 −4 contrib/samples/LineNumberSAXBuilderDemo.java
  6. +3 −3 contrib/samples/ResultSetBuilderDemo.java
  7. +3 −3 contrib/samples/sxql.java
  8. +8 −8 contrib/src/java/org/jdom2/contrib/beans/BeanMapper.java
  9. +1 −1 contrib/src/java/org/jdom2/contrib/beans/BeanMapperException.java
  10. +1 −1 contrib/src/java/org/jdom2/contrib/beans/DateUtils.java
  11. +6 −6 contrib/src/java/org/jdom2/contrib/beans/JDOMBean.java
  12. +1 −1 contrib/src/java/org/jdom2/contrib/beans/StringConverter.java
  13. +4 −4 contrib/src/java/org/jdom2/contrib/beans/TestBean.java
  14. +4 −4 contrib/src/java/org/jdom2/contrib/beans/TestIndexed.java
  15. +2 −2 contrib/src/java/org/jdom2/contrib/helpers/JDOMHelper.java
  16. +2 −2 contrib/src/java/org/jdom2/contrib/helpers/TextHelper.java
  17. +3 −3 contrib/src/java/org/jdom2/contrib/helpers/XPathHelper.java
  18. +6 −6 contrib/src/java/org/jdom2/contrib/ids/IdAttribute.java
  19. +4 −4 contrib/src/java/org/jdom2/contrib/ids/IdDocument.java
  20. +7 −7 contrib/src/java/org/jdom2/contrib/ids/IdElement.java
  21. +8 −8 contrib/src/java/org/jdom2/contrib/ids/IdFactory.java
  22. +5 −5 contrib/src/java/org/jdom2/contrib/ids/doc-files/TestIds.java
  23. +3 −3 contrib/src/java/org/jdom2/contrib/input/LineNumberElement.java
  24. +8 −8 contrib/src/java/org/jdom2/contrib/input/LineNumberSAXBuilder.java
  25. +2 −2 contrib/src/java/org/jdom2/contrib/input/ResultSetBuilder.java
  26. +3 −3 contrib/src/java/org/jdom2/contrib/input/scanner/ElementListener.java
  27. +6 −6 contrib/src/java/org/jdom2/contrib/input/scanner/ElementScanner.java
  28. +4 −4 contrib/src/java/org/jdom2/contrib/input/scanner/JakartaRegExpXPathMatcher.java
  29. +3 −3 contrib/src/java/org/jdom2/contrib/input/scanner/XPathMatcher.java
  30. +5 −5 contrib/src/java/org/jdom2/contrib/input/scanner/doc-files/ElementScannerTest.java
  31. +5 −5 contrib/src/java/org/jdom2/contrib/output/JTreeOutputter.java
  32. +7 −7 contrib/src/java/org/jdom2/contrib/schema/Schema.java
  33. +1 −1 contrib/src/java/org/jdom2/contrib/schema/ValidationError.java
  34. 0 core/build.sh
  35. 0 core/lib/bin/antRun
  36. +2 −2 core/package/JDOMAbout.java
  37. +4 −4 core/samples/DescendantDemo.java
  38. +3 −3 core/samples/SAXBuilderDemo.java
  39. +5 −5 core/samples/WarReader.java
  40. +4 −4 core/samples/XPathReader.java
  41. +4 −4 core/samples/XSLTransform.java
  42. +3 −3 core/samples/sax/DocumentReader.java
  43. +3 −3 core/samples/sax/FilterTest.java
  44. +3 −3 core/samples/sax/ReaderTest.java
  45. +1 −1 core/src/java/org/jdom2/Attribute.java
  46. +1 −1 core/src/java/org/jdom2/AttributeList.java
  47. +1 −1 core/src/java/org/jdom2/CDATA.java
  48. +2 −2 core/src/java/org/jdom2/Comment.java
  49. +1 −1 core/src/java/org/jdom2/Content.java
  50. +2 −2 core/src/java/org/jdom2/ContentList.java
  51. +1 −1 core/src/java/org/jdom2/DataConversionException.java
  52. +1 −1 core/src/java/org/jdom2/DefaultJDOMFactory.java
  53. +4 −4 core/src/java/org/jdom2/DescendantIterator.java
  54. +2 −2 core/src/java/org/jdom2/DocType.java
  55. +2 −2 core/src/java/org/jdom2/Document.java
  56. +2 −2 core/src/java/org/jdom2/Element.java
  57. +1 −1 core/src/java/org/jdom2/EntityRef.java
  58. +2 −2 core/src/java/org/jdom2/FilterIterator.java
  59. +1 −1 core/src/java/org/jdom2/IllegalAddException.java
  60. +1 −1 core/src/java/org/jdom2/IllegalDataException.java
  61. +1 −1 core/src/java/org/jdom2/IllegalNameException.java
  62. +1 −1 core/src/java/org/jdom2/IllegalTargetException.java
  63. +1 −1 core/src/java/org/jdom2/JDOMException.java
  64. +1 −1 core/src/java/org/jdom2/JDOMFactory.java
  65. +1 −1 core/src/java/org/jdom2/Namespace.java
  66. +1 −1 core/src/java/org/jdom2/NamespaceKey.java
  67. +2 −2 core/src/java/org/jdom2/Parent.java
  68. +2 −2 core/src/java/org/jdom2/ProcessingInstruction.java
  69. +1 −1 core/src/java/org/jdom2/Text.java
  70. +2 −2 core/src/java/org/jdom2/UncheckedJDOMFactory.java
  71. +1 −1 core/src/java/org/jdom2/Verifier.java
  72. +2 −2 core/src/java/org/jdom2/adapters/AbstractDOMAdapter.java
  73. +2 −2 core/src/java/org/jdom2/adapters/CrimsonDOMAdapter.java
  74. +2 −2 core/src/java/org/jdom2/adapters/DOMAdapter.java
  75. +3 −3 core/src/java/org/jdom2/adapters/JAXPDOMAdapter.java
  76. +2 −2 core/src/java/org/jdom2/adapters/OracleV1DOMAdapter.java
  77. +2 −2 core/src/java/org/jdom2/adapters/OracleV2DOMAdapter.java
  78. +3 −3 core/src/java/org/jdom2/adapters/XML4JDOMAdapter.java
  79. +3 −3 core/src/java/org/jdom2/adapters/XercesDOMAdapter.java
  80. +1 −1 core/src/java/org/jdom2/filter/AbstractFilter.java
  81. +1 −1 core/src/java/org/jdom2/filter/AndFilter.java
  82. +2 −2 core/src/java/org/jdom2/filter/ContentFilter.java
  83. +2 −2 core/src/java/org/jdom2/filter/ElementFilter.java
  84. +1 −1 core/src/java/org/jdom2/filter/Filter.java
  85. +1 −1 core/src/java/org/jdom2/filter/NegateFilter.java
  86. +1 −1 core/src/java/org/jdom2/filter/OrFilter.java
  87. +1 −1 core/src/java/org/jdom2/input/BuilderErrorHandler.java
  88. +5 −5 core/src/java/org/jdom2/input/DOMBuilder.java
  89. +2 −2 core/src/java/org/jdom2/input/JAXPParserFactory.java
  90. +2 −2 core/src/java/org/jdom2/input/JDOMParseException.java
  91. +2 −2 core/src/java/org/jdom2/input/SAXBuilder.java
  92. +2 −2 core/src/java/org/jdom2/input/SAXHandler.java
  93. +2 −2 core/src/java/org/jdom2/input/TextBuffer.java
  94. +3 −3 core/src/java/org/jdom2/output/DOMOutputter.java
  95. +1 −1 core/src/java/org/jdom2/output/EscapeStrategy.java
  96. +2 −2 core/src/java/org/jdom2/output/Format.java
  97. +1 −1 core/src/java/org/jdom2/output/JDOMLocator.java
  98. +2 −2 core/src/java/org/jdom2/output/NamespaceStack.java
  99. +2 −2 core/src/java/org/jdom2/output/SAXOutputter.java
  100. +3 −3 core/src/java/org/jdom2/output/XMLOutputter.java
  101. +3 −3 core/src/java/org/jdom2/transform/JDOMResult.java
  102. +3 −3 core/src/java/org/jdom2/transform/JDOMSource.java
  103. +2 −2 core/src/java/org/jdom2/transform/XSLTransformException.java
  104. +2 −2 core/src/java/org/jdom2/transform/XSLTransformer.java
  105. +2 −2 core/src/java/org/jdom2/xpath/JaxenXPath.java
  106. +2 −2 core/src/java/org/jdom2/xpath/XPath.java
  107. 0 test/COMMITTERS.txt
  108. 0 test/LICENSE.txt
  109. 0 test/README.txt
  110. 0 test/TODO.txt
  111. 0 test/build.bat
  112. 0 test/build.sh
  113. 0 test/build.xml
  114. BIN test/lib/junit.jar
  115. 0 test/resources/xmlchars.xml
  116. +2 −2 test/src/java/org/jdom2/test/Test.properties
  117. +2 −2 test/src/java/org/jdom2/test/cases/Alltests.java
  118. +2 −2 test/src/java/org/jdom2/test/cases/TestAttribute.java
  119. +4 −4 test/src/java/org/jdom2/test/cases/TestCDATA.java
  120. +8 −8 test/src/java/org/jdom2/test/cases/TestComment.java
  121. +2 −2 test/src/java/org/jdom2/test/cases/TestDocType.java
  122. +5 −5 test/src/java/org/jdom2/test/cases/TestDocument.java
  123. +4 −4 test/src/java/org/jdom2/test/cases/TestElement.java
  124. +2 −2 test/src/java/org/jdom2/test/cases/TestFilterList.java
  125. +2 −2 test/src/java/org/jdom2/test/cases/TestNamespace.java
  126. +3 −3 test/src/java/org/jdom2/test/cases/TestSerialization.java
  127. +10 −10 test/src/java/org/jdom2/test/cases/TestVerifier.java
  128. +4 −4 test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
  129. +5 −5 test/src/java/org/jdom2/test/cases/output/TestDOMOutputter.java
  130. +5 −5 test/src/java/org/jdom2/test/cases/output/TestXMLOutputter.java
  131. +2 −2 test/src/java/org/jdom2/test/filterlist/FilterListIteratorRandomizer.java
  132. +2 −2 test/src/java/org/jdom2/test/filterlist/FilterListRandomizer.java
  133. +1 −1 test/src/java/org/jdom2/test/generate/ClassGenerator.java
  134. +1 −1 test/src/java/org/jdom2/test/generate/GeneratorException.java
  135. +1 −1 test/src/java/org/jdom2/test/generate/IndentWriter.java
  136. +1 −1 test/src/java/org/jdom2/test/generate/Main.java
  137. +1 −1 test/src/java/org/jdom2/test/generate/NameMangler.java
  138. +1 −1 test/src/java/org/jdom2/test/generate/TestCaseClassWriter.java
  139. +1 −1 test/src/java/org/jdom2/test/generate/TestCaseGenerator.java
View
@@ -1,3 +1,4 @@
/.classpath
/.project
/ebuild
+/.settings
View
0 contrib/build.bat 100755 → 100644
No changes.
View
0 contrib/build.sh 100755 → 100644
No changes.
@@ -47,9 +47,9 @@ JDOM Project Management (pm@jdom.org).
import javax.swing.tree.*;
import javax.swing.filechooser.*;
-import org.jdom.Document;
-import org.jdom.input.SAXBuilder;
-import org.jdom.contrib.output.JTreeOutputter;
+import org.jdom2.Document;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.contrib.output.JTreeOutputter;
/**
* <p><code>JTreeOutputterDemo</code> demonstrates how to
@@ -43,11 +43,11 @@ JDOM Project Management (pm@jdom.org).
import java.io.StringReader;
import java.util.Iterator;
-import org.jdom.Document;
-import org.jdom.input.SAXBuilder;
-import org.jdom.filter.*;
+import org.jdom2.Document;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.filter.*;
-import org.jdom.contrib.input.*;
+import org.jdom2.contrib.input.*;
/**
* @author Per Norrman
@@ -44,10 +44,10 @@ JDOM Project Management (pm@jdom.org).
import java.sql.*;
import java.util.*;
-import org.jdom.*;
-import org.jdom.output.*;
+import org.jdom2.*;
+import org.jdom2.output.*;
-import org.jdom.contrib.input.ResultSetBuilder;
+import org.jdom2.contrib.input.ResultSetBuilder;
public class ResultSetBuilderDemo {
@@ -56,9 +56,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
import java.io.*;
import java.util.*;
-import org.jdom.*;
-import org.jdom.output.*;
-import org.jdom.contrib.input.ResultSetBuilder;
+import org.jdom2.*;
+import org.jdom2.output.*;
+import org.jdom2.contrib.input.ResultSetBuilder;
/**
* A simple sample harness for JDOM ResultSetBuilder
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.beans;
+package org.jdom2.contrib.beans;
import java.lang.reflect.*;
import java.io.File;
@@ -63,13 +63,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
import java.util.Iterator;
import java.util.*;
import java.beans.*;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Attribute;
-import org.jdom.Namespace;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Attribute;
+import org.jdom2.Namespace;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.XMLOutputter;
/**
* Maps a JavaBean to an XML tree and vice versa. (Yes, it's yet
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.beans;
+package org.jdom2.contrib.beans;
/**
@@ -56,7 +56,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
// Based on code Copyright (c) 1998-2000 Alex Chaffee and Purple Technology.
-package org.jdom.contrib.beans;
+package org.jdom2.contrib.beans;
import java.util.*;
import org.apache.regexp.*;
@@ -54,18 +54,18 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.beans;
+package org.jdom2.contrib.beans;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Iterator;
import java.util.*;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.XMLOutputter;
// todo:
// weak references and/or timeout cache
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.beans;
+package org.jdom2.contrib.beans;
import java.lang.reflect.*;
import java.util.*;
@@ -54,11 +54,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
- package org.jdom.contrib.beans;
+ package org.jdom2.contrib.beans;
-import org.jdom.*;
-import org.jdom.output.*;
-import org.jdom.input.*;
+import org.jdom2.*;
+import org.jdom2.output.*;
+import org.jdom2.input.*;
import java.util.*;
public class TestBean implements java.io.Serializable {
@@ -54,11 +54,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.beans;
+package org.jdom2.contrib.beans;
-import org.jdom.*;
-import org.jdom.output.*;
-import org.jdom.input.*;
+import org.jdom2.*;
+import org.jdom2.output.*;
+import org.jdom2.input.*;
import java.util.*;
import java.util.List;
import java.beans.*;
@@ -54,9 +54,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.helpers;
+package org.jdom2.contrib.helpers;
-import org.jdom.*;
+import org.jdom2.*;
import java.util.*;
/** <p>
@@ -54,9 +54,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.helpers;
+package org.jdom2.contrib.helpers;
-import org.jdom.*;
+import org.jdom2.*;
/** <p>
* This class contains static helper methods.
@@ -54,14 +54,14 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.helpers;
+package org.jdom2.contrib.helpers;
import java.util.List;
import java.util.Iterator;
-import org.jdom.*;
-import org.jdom.filter.ContentFilter;
+import org.jdom2.*;
+import org.jdom2.filter.ContentFilter;
/**
@@ -54,13 +54,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.ids;
+package org.jdom2.contrib.ids;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.Parent;
+import org.jdom2.Attribute;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.Parent;
/**
@@ -54,13 +54,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.ids;
+package org.jdom2.contrib.ids;
import java.util.*;
-import org.jdom.Document;
-import org.jdom.DocType;
-import org.jdom.Element;
+import org.jdom2.Document;
+import org.jdom2.DocType;
+import org.jdom2.Element;
/**
@@ -54,16 +54,16 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.ids;
+package org.jdom2.contrib.ids;
import java.util.*;
-import org.jdom.Attribute;
-import org.jdom.Content;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Parent;
-import org.jdom.Namespace;
+import org.jdom2.Attribute;
+import org.jdom2.Content;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Parent;
+import org.jdom2.Namespace;
/**
* A sub-class of the default JDOM <code>Element</code> to help
@@ -54,14 +54,14 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.ids;
-
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.DocType;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.DefaultJDOMFactory;
+package org.jdom2.contrib.ids;
+
+import org.jdom2.Attribute;
+import org.jdom2.Document;
+import org.jdom2.DocType;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.DefaultJDOMFactory;
/**
* The <code>IdFactory</code> extends the default JDOM factory to
@@ -1,11 +1,11 @@
-import org.jdom.*;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.*;
+import org.jdom2.*;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.*;
-import org.jdom.contrib.ids.IdDocument;
-import org.jdom.contrib.ids.IdFactory;
+import org.jdom2.contrib.ids.IdDocument;
+import org.jdom2.contrib.ids.IdFactory;
public class TestIds {
@@ -54,10 +54,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
- package org.jdom.contrib.input;
+ package org.jdom2.contrib.input;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
/**
* This class extends a normal Element with a traceback to its
@@ -54,14 +54,14 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
- package org.jdom.contrib.input;
-
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.DefaultJDOMFactory;
-import org.jdom.JDOMFactory;
-import org.jdom.input.SAXBuilder;
-import org.jdom.input.SAXHandler;
+ package org.jdom2.contrib.input;
+
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.DefaultJDOMFactory;
+import org.jdom2.JDOMFactory;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.input.SAXHandler;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -54,14 +54,14 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.input;
+package org.jdom2.contrib.input;
import java.io.*;
import java.sql.*;
import java.text.*;
import java.util.*;
-import org.jdom.*;
+import org.jdom2.*;
/**
* <p><code>ResultSetBuilder</code> builds a JDOM tree from a
@@ -54,10 +54,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
*/
-package org.jdom.contrib.input.scanner;
+package org.jdom2.contrib.input.scanner;
-import org.jdom.Element;
-import org.jdom.JDOMException;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
/**
* The interface objects listening for element creation notification
Oops, something went wrong.

0 comments on commit 2ce8a11

Please sign in to comment.