Skip to content
This repository
Browse code

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...
commit 2ce8a11adc66d0195143ec253af4664e73f94101 1 parent 77db3c1
Rolf authored August 01, 2011

Showing 139 changed files with 336 additions and 335 deletions. Show diff stats Hide diff stats

  1. 1  .gitignore
  2. 0  bin/antRun b/core/lib/bin/antRun
  3. 0  build.bat b/contrib/build.bat
  4. 0  build.sh b/contrib/build.sh
  5. 6  contrib/samples/JTreeOutputterDemo.java
  6. 8  contrib/samples/LineNumberSAXBuilderDemo.java
  7. 6  contrib/samples/ResultSetBuilderDemo.java
  8. 6  contrib/samples/sxql.java
  9. 16  contrib/src/java/org/jdom2/contrib/beans/BeanMapper.java
  10. 2  contrib/src/java/org/jdom2/contrib/beans/BeanMapperException.java
  11. 2  contrib/src/java/org/jdom2/contrib/beans/DateUtils.java
  12. 12  contrib/src/java/org/jdom2/contrib/beans/JDOMBean.java
  13. 2  contrib/src/java/org/jdom2/contrib/beans/StringConverter.java
  14. 8  contrib/src/java/org/jdom2/contrib/beans/TestBean.java
  15. 8  contrib/src/java/org/jdom2/contrib/beans/TestIndexed.java
  16. 4  contrib/src/java/org/jdom2/contrib/helpers/JDOMHelper.java
  17. 4  contrib/src/java/org/jdom2/contrib/helpers/TextHelper.java
  18. 6  contrib/src/java/org/jdom2/contrib/helpers/XPathHelper.java
  19. 12  contrib/src/java/org/jdom2/contrib/ids/IdAttribute.java
  20. 8  contrib/src/java/org/jdom2/contrib/ids/IdDocument.java
  21. 14  contrib/src/java/org/jdom2/contrib/ids/IdElement.java
  22. 16  contrib/src/java/org/jdom2/contrib/ids/IdFactory.java
  23. 10  contrib/src/java/org/jdom2/contrib/ids/doc-files/TestIds.java
  24. 6  contrib/src/java/org/jdom2/contrib/input/LineNumberElement.java
  25. 16  contrib/src/java/org/jdom2/contrib/input/LineNumberSAXBuilder.java
  26. 4  contrib/src/java/org/jdom2/contrib/input/ResultSetBuilder.java
  27. 6  contrib/src/java/org/jdom2/contrib/input/scanner/ElementListener.java
  28. 12  contrib/src/java/org/jdom2/contrib/input/scanner/ElementScanner.java
  29. 8  contrib/src/java/org/jdom2/contrib/input/scanner/JakartaRegExpXPathMatcher.java
  30. 6  contrib/src/java/org/jdom2/contrib/input/scanner/XPathMatcher.java
  31. 10  contrib/src/java/org/jdom2/contrib/input/scanner/doc-files/ElementScannerTest.java
  32. 10  contrib/src/java/org/jdom2/contrib/output/JTreeOutputter.java
  33. 14  contrib/src/java/org/jdom2/contrib/schema/Schema.java
  34. 2  contrib/src/java/org/jdom2/contrib/schema/ValidationError.java
  35. 0  core/build.sh
  36. 4  core/package/JDOMAbout.java
  37. 8  core/samples/DescendantDemo.java
  38. 6  core/samples/SAXBuilderDemo.java
  39. 10  core/samples/WarReader.java
  40. 8  core/samples/XPathReader.java
  41. 8  core/samples/XSLTransform.java
  42. 6  core/samples/sax/DocumentReader.java
  43. 6  core/samples/sax/FilterTest.java
  44. 6  core/samples/sax/ReaderTest.java
  45. 2  core/src/java/org/jdom2/Attribute.java
  46. 2  core/src/java/org/jdom2/AttributeList.java
  47. 2  core/src/java/org/jdom2/CDATA.java
  48. 4  core/src/java/org/jdom2/Comment.java
  49. 2  core/src/java/org/jdom2/Content.java
  50. 4  core/src/java/org/jdom2/ContentList.java
  51. 2  core/src/java/org/jdom2/DataConversionException.java
  52. 2  core/src/java/org/jdom2/DefaultJDOMFactory.java
  53. 8  core/src/java/org/jdom2/DescendantIterator.java
  54. 4  core/src/java/org/jdom2/DocType.java
  55. 4  core/src/java/org/jdom2/Document.java
  56. 4  core/src/java/org/jdom2/Element.java
  57. 2  core/src/java/org/jdom2/EntityRef.java
  58. 4  core/src/java/org/jdom2/FilterIterator.java
  59. 2  core/src/java/org/jdom2/IllegalAddException.java
  60. 2  core/src/java/org/jdom2/IllegalDataException.java
  61. 2  core/src/java/org/jdom2/IllegalNameException.java
  62. 2  core/src/java/org/jdom2/IllegalTargetException.java
  63. 2  core/src/java/org/jdom2/JDOMException.java
  64. 2  core/src/java/org/jdom2/JDOMFactory.java
  65. 2  core/src/java/org/jdom2/Namespace.java
  66. 2  core/src/java/org/jdom2/NamespaceKey.java
  67. 4  core/src/java/org/jdom2/Parent.java
  68. 4  core/src/java/org/jdom2/ProcessingInstruction.java
  69. 2  core/src/java/org/jdom2/Text.java
  70. 4  core/src/java/org/jdom2/UncheckedJDOMFactory.java
  71. 2  core/src/java/org/jdom2/Verifier.java
  72. 4  core/src/java/org/jdom2/adapters/AbstractDOMAdapter.java
  73. 4  core/src/java/org/jdom2/adapters/CrimsonDOMAdapter.java
  74. 4  core/src/java/org/jdom2/adapters/DOMAdapter.java
  75. 6  core/src/java/org/jdom2/adapters/JAXPDOMAdapter.java
  76. 4  core/src/java/org/jdom2/adapters/OracleV1DOMAdapter.java
  77. 4  core/src/java/org/jdom2/adapters/OracleV2DOMAdapter.java
  78. 6  core/src/java/org/jdom2/adapters/XML4JDOMAdapter.java
  79. 6  core/src/java/org/jdom2/adapters/XercesDOMAdapter.java
  80. 2  core/src/java/org/jdom2/filter/AbstractFilter.java
  81. 2  core/src/java/org/jdom2/filter/AndFilter.java
  82. 4  core/src/java/org/jdom2/filter/ContentFilter.java
  83. 4  core/src/java/org/jdom2/filter/ElementFilter.java
  84. 2  core/src/java/org/jdom2/filter/Filter.java
  85. 2  core/src/java/org/jdom2/filter/NegateFilter.java
  86. 2  core/src/java/org/jdom2/filter/OrFilter.java
  87. 2  core/src/java/org/jdom2/input/BuilderErrorHandler.java
  88. 10  core/src/java/org/jdom2/input/DOMBuilder.java
  89. 4  core/src/java/org/jdom2/input/JAXPParserFactory.java
  90. 4  core/src/java/org/jdom2/input/JDOMParseException.java
  91. 4  core/src/java/org/jdom2/input/SAXBuilder.java
  92. 4  core/src/java/org/jdom2/input/SAXHandler.java
  93. 4  core/src/java/org/jdom2/input/TextBuffer.java
  94. 6  core/src/java/org/jdom2/output/DOMOutputter.java
  95. 2  core/src/java/org/jdom2/output/EscapeStrategy.java
  96. 4  core/src/java/org/jdom2/output/Format.java
  97. 2  core/src/java/org/jdom2/output/JDOMLocator.java
  98. 4  core/src/java/org/jdom2/output/NamespaceStack.java
  99. 4  core/src/java/org/jdom2/output/SAXOutputter.java
  100. 6  core/src/java/org/jdom2/output/XMLOutputter.java
  101. 6  core/src/java/org/jdom2/transform/JDOMResult.java
  102. 6  core/src/java/org/jdom2/transform/JDOMSource.java
  103. 4  core/src/java/org/jdom2/transform/XSLTransformException.java
  104. 4  core/src/java/org/jdom2/transform/XSLTransformer.java
  105. 4  core/src/java/org/jdom2/xpath/JaxenXPath.java
  106. 4  core/src/java/org/jdom2/xpath/XPath.java
  107. 0  junit.jar b/test/lib/junit.jar
  108. 0  test/COMMITTERS.txt
  109. 0  test/LICENSE.txt
  110. 0  test/README.txt
  111. 0  test/TODO.txt
  112. 0  test/build.bat
  113. 0  test/build.sh
  114. 0  test/build.xml
  115. 0  test/resources/xmlchars.xml
  116. 4  test/src/java/org/jdom2/test/Test.properties
  117. 4  test/src/java/org/jdom2/test/cases/Alltests.java
  118. 4  test/src/java/org/jdom2/test/cases/TestAttribute.java
  119. 8  test/src/java/org/jdom2/test/cases/TestCDATA.java
  120. 16  test/src/java/org/jdom2/test/cases/TestComment.java
  121. 4  test/src/java/org/jdom2/test/cases/TestDocType.java
  122. 10  test/src/java/org/jdom2/test/cases/TestDocument.java
  123. 8  test/src/java/org/jdom2/test/cases/TestElement.java
  124. 4  test/src/java/org/jdom2/test/cases/TestFilterList.java
  125. 4  test/src/java/org/jdom2/test/cases/TestNamespace.java
  126. 6  test/src/java/org/jdom2/test/cases/TestSerialization.java
  127. 20  test/src/java/org/jdom2/test/cases/TestVerifier.java
  128. 8  test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
  129. 10  test/src/java/org/jdom2/test/cases/output/TestDOMOutputter.java
  130. 10  test/src/java/org/jdom2/test/cases/output/TestXMLOutputter.java
  131. 4  test/src/java/org/jdom2/test/filterlist/FilterListIteratorRandomizer.java
  132. 4  test/src/java/org/jdom2/test/filterlist/FilterListRandomizer.java
  133. 2  test/src/java/org/jdom2/test/generate/ClassGenerator.java
  134. 2  test/src/java/org/jdom2/test/generate/GeneratorException.java
  135. 2  test/src/java/org/jdom2/test/generate/IndentWriter.java
  136. 2  test/src/java/org/jdom2/test/generate/Main.java
  137. 2  test/src/java/org/jdom2/test/generate/NameMangler.java
  138. 2  test/src/java/org/jdom2/test/generate/TestCaseClassWriter.java
  139. 2  test/src/java/org/jdom2/test/generate/TestCaseGenerator.java
1  .gitignore
... ...
@@ -1,3 +1,4 @@
1 1
 /.classpath
2 2
 /.project
3 3
 /ebuild
  4
+/.settings
0  bin/antRun b/core/lib/bin/antRun 100755 → 100644
File mode changed
0  build.bat b/contrib/build.bat 100755 → 100644
File mode changed
0  build.sh b/contrib/build.sh 100755 → 100644
File mode changed
6  contrib/samples/JTreeOutputterDemo.java
@@ -47,9 +47,9 @@ JDOM Project Management (pm@jdom.org).
47 47
 import javax.swing.tree.*;
48 48
 import javax.swing.filechooser.*;
49 49
 
50  
-import org.jdom.Document;
51  
-import org.jdom.input.SAXBuilder;
52  
-import org.jdom.contrib.output.JTreeOutputter;
  50
+import org.jdom2.Document;
  51
+import org.jdom2.input.SAXBuilder;
  52
+import org.jdom2.contrib.output.JTreeOutputter;
53 53
 
54 54
 /**
55 55
  * <p><code>JTreeOutputterDemo</code> demonstrates how to
8  contrib/samples/LineNumberSAXBuilderDemo.java
@@ -43,11 +43,11 @@ JDOM Project Management (pm@jdom.org).
43 43
 import java.io.StringReader;
44 44
 import java.util.Iterator;
45 45
 
46  
-import org.jdom.Document;
47  
-import org.jdom.input.SAXBuilder;
48  
-import org.jdom.filter.*;
  46
+import org.jdom2.Document;
  47
+import org.jdom2.input.SAXBuilder;
  48
+import org.jdom2.filter.*;
49 49
 
50  
-import org.jdom.contrib.input.*;
  50
+import org.jdom2.contrib.input.*;
51 51
 
52 52
 /**
53 53
  * @author Per Norrman
6  contrib/samples/ResultSetBuilderDemo.java
@@ -44,10 +44,10 @@ JDOM Project Management (pm@jdom.org).
44 44
 import java.sql.*;
45 45
 import java.util.*;
46 46
 
47  
-import org.jdom.*;
48  
-import org.jdom.output.*;
  47
+import org.jdom2.*;
  48
+import org.jdom2.output.*;
49 49
 
50  
-import org.jdom.contrib.input.ResultSetBuilder;
  50
+import org.jdom2.contrib.input.ResultSetBuilder;
51 51
 
52 52
 public class ResultSetBuilderDemo {
53 53
     
6  contrib/samples/sxql.java
@@ -56,9 +56,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
56 56
 import java.io.*;
57 57
 import java.util.*;
58 58
 
59  
-import org.jdom.*;
60  
-import org.jdom.output.*;
61  
-import org.jdom.contrib.input.ResultSetBuilder;
  59
+import org.jdom2.*;
  60
+import org.jdom2.output.*;
  61
+import org.jdom2.contrib.input.ResultSetBuilder;
62 62
 
63 63
 /**
64 64
  * A simple sample harness for JDOM ResultSetBuilder
16  contrib/src/java/org/jdom2/contrib/beans/BeanMapper.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.beans;
  57
+package org.jdom2.contrib.beans;
58 58
 
59 59
 import java.lang.reflect.*;
60 60
 import java.io.File;
@@ -63,13 +63,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
63 63
 import java.util.Iterator;
64 64
 import java.util.*;
65 65
 import java.beans.*;
66  
-import org.jdom.Document;
67  
-import org.jdom.Element;
68  
-import org.jdom.Attribute;
69  
-import org.jdom.Namespace;
70  
-import org.jdom.JDOMException;
71  
-import org.jdom.input.SAXBuilder;
72  
-import org.jdom.output.XMLOutputter;
  66
+import org.jdom2.Document;
  67
+import org.jdom2.Element;
  68
+import org.jdom2.Attribute;
  69
+import org.jdom2.Namespace;
  70
+import org.jdom2.JDOMException;
  71
+import org.jdom2.input.SAXBuilder;
  72
+import org.jdom2.output.XMLOutputter;
73 73
 
74 74
 /**
75 75
  * Maps a JavaBean to an XML tree and vice versa.  (Yes, it's yet
2  contrib/src/java/org/jdom2/contrib/beans/BeanMapperException.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.beans;
  57
+package org.jdom2.contrib.beans;
58 58
 
59 59
 
60 60
 /**
2  contrib/src/java/org/jdom2/contrib/beans/DateUtils.java
@@ -56,7 +56,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
56 56
 
57 57
 // Based on code Copyright (c) 1998-2000 Alex Chaffee and Purple Technology.
58 58
 
59  
-package org.jdom.contrib.beans;
  59
+package org.jdom2.contrib.beans;
60 60
 
61 61
 import java.util.*;
62 62
 import org.apache.regexp.*;
12  contrib/src/java/org/jdom2/contrib/beans/JDOMBean.java
@@ -54,18 +54,18 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.beans;
  57
+package org.jdom2.contrib.beans;
58 58
 
59 59
 import java.io.File;
60 60
 import java.io.IOException;
61 61
 import java.io.PrintStream;
62 62
 import java.util.Iterator;
63 63
 import java.util.*;
64  
-import org.jdom.Document;
65  
-import org.jdom.Element;
66  
-import org.jdom.JDOMException;
67  
-import org.jdom.input.SAXBuilder;
68  
-import org.jdom.output.XMLOutputter;
  64
+import org.jdom2.Document;
  65
+import org.jdom2.Element;
  66
+import org.jdom2.JDOMException;
  67
+import org.jdom2.input.SAXBuilder;
  68
+import org.jdom2.output.XMLOutputter;
69 69
 
70 70
 // todo:
71 71
 // weak references and/or timeout cache
2  contrib/src/java/org/jdom2/contrib/beans/StringConverter.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.beans;
  57
+package org.jdom2.contrib.beans;
58 58
 
59 59
 import java.lang.reflect.*;
60 60
 import java.util.*;
8  contrib/src/java/org/jdom2/contrib/beans/TestBean.java
@@ -54,11 +54,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
- package org.jdom.contrib.beans;
  57
+ package org.jdom2.contrib.beans;
58 58
 
59  
-import org.jdom.*;
60  
-import org.jdom.output.*;
61  
-import org.jdom.input.*;
  59
+import org.jdom2.*;
  60
+import org.jdom2.output.*;
  61
+import org.jdom2.input.*;
62 62
 import java.util.*;
63 63
 
64 64
 public class TestBean implements java.io.Serializable {
8  contrib/src/java/org/jdom2/contrib/beans/TestIndexed.java
@@ -54,11 +54,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.beans;
  57
+package org.jdom2.contrib.beans;
58 58
 
59  
-import org.jdom.*;
60  
-import org.jdom.output.*;
61  
-import org.jdom.input.*;
  59
+import org.jdom2.*;
  60
+import org.jdom2.output.*;
  61
+import org.jdom2.input.*;
62 62
 import java.util.*;
63 63
 import java.util.List;
64 64
 import java.beans.*;
4  contrib/src/java/org/jdom2/contrib/helpers/JDOMHelper.java
@@ -54,9 +54,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.helpers;
  57
+package org.jdom2.contrib.helpers;
58 58
 
59  
-import org.jdom.*;
  59
+import org.jdom2.*;
60 60
 import java.util.*;
61 61
 
62 62
 /**   <p>
4  contrib/src/java/org/jdom2/contrib/helpers/TextHelper.java
@@ -54,9 +54,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.helpers;
  57
+package org.jdom2.contrib.helpers;
58 58
 
59  
-import org.jdom.*;
  59
+import org.jdom2.*;
60 60
 
61 61
 /** <p>
62 62
  *    This class contains static helper methods. 
6  contrib/src/java/org/jdom2/contrib/helpers/XPathHelper.java
@@ -54,14 +54,14 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.helpers;
  57
+package org.jdom2.contrib.helpers;
58 58
 
59 59
 
60 60
 import java.util.List;
61 61
 import java.util.Iterator;
62 62
 
63  
-import org.jdom.*;
64  
-import org.jdom.filter.ContentFilter;
  63
+import org.jdom2.*;
  64
+import org.jdom2.filter.ContentFilter;
65 65
 
66 66
 
67 67
 /**
12  contrib/src/java/org/jdom2/contrib/ids/IdAttribute.java
@@ -54,13 +54,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.ids;
  57
+package org.jdom2.contrib.ids;
58 58
 
59  
-import org.jdom.Attribute;
60  
-import org.jdom.Document;
61  
-import org.jdom.Element;
62  
-import org.jdom.Namespace;
63  
-import org.jdom.Parent;
  59
+import org.jdom2.Attribute;
  60
+import org.jdom2.Document;
  61
+import org.jdom2.Element;
  62
+import org.jdom2.Namespace;
  63
+import org.jdom2.Parent;
64 64
 
65 65
 
66 66
 /**
8  contrib/src/java/org/jdom2/contrib/ids/IdDocument.java
@@ -54,13 +54,13 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.ids;
  57
+package org.jdom2.contrib.ids;
58 58
 
59 59
 import java.util.*;
60 60
 
61  
-import org.jdom.Document;
62  
-import org.jdom.DocType;
63  
-import org.jdom.Element;
  61
+import org.jdom2.Document;
  62
+import org.jdom2.DocType;
  63
+import org.jdom2.Element;
64 64
 
65 65
 
66 66
 /**
14  contrib/src/java/org/jdom2/contrib/ids/IdElement.java
@@ -54,16 +54,16 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.ids;
  57
+package org.jdom2.contrib.ids;
58 58
 
59 59
 import java.util.*;
60 60
 
61  
-import org.jdom.Attribute;
62  
-import org.jdom.Content;
63  
-import org.jdom.Document;
64  
-import org.jdom.Element;
65  
-import org.jdom.Parent;
66  
-import org.jdom.Namespace;
  61
+import org.jdom2.Attribute;
  62
+import org.jdom2.Content;
  63
+import org.jdom2.Document;
  64
+import org.jdom2.Element;
  65
+import org.jdom2.Parent;
  66
+import org.jdom2.Namespace;
67 67
 
68 68
 /**
69 69
  * A sub-class of the default JDOM <code>Element</code> to help
16  contrib/src/java/org/jdom2/contrib/ids/IdFactory.java
@@ -54,14 +54,14 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.ids;
58  
-
59  
-import org.jdom.Attribute;
60  
-import org.jdom.Document;
61  
-import org.jdom.DocType;
62  
-import org.jdom.Element;
63  
-import org.jdom.Namespace;
64  
-import org.jdom.DefaultJDOMFactory;
  57
+package org.jdom2.contrib.ids;
  58
+
  59
+import org.jdom2.Attribute;
  60
+import org.jdom2.Document;
  61
+import org.jdom2.DocType;
  62
+import org.jdom2.Element;
  63
+import org.jdom2.Namespace;
  64
+import org.jdom2.DefaultJDOMFactory;
65 65
 
66 66
 /**
67 67
  * The <code>IdFactory</code> extends the default JDOM factory to
10  contrib/src/java/org/jdom2/contrib/ids/doc-files/TestIds.java
... ...
@@ -1,11 +1,11 @@
1 1
 
2 2
 
3  
-import org.jdom.*;
4  
-import org.jdom.input.SAXBuilder;
5  
-import org.jdom.output.*;
  3
+import org.jdom2.*;
  4
+import org.jdom2.input.SAXBuilder;
  5
+import org.jdom2.output.*;
6 6
 
7  
-import org.jdom.contrib.ids.IdDocument;
8  
-import org.jdom.contrib.ids.IdFactory;
  7
+import org.jdom2.contrib.ids.IdDocument;
  8
+import org.jdom2.contrib.ids.IdFactory;
9 9
 
10 10
 
11 11
 public class TestIds {
6  contrib/src/java/org/jdom2/contrib/input/LineNumberElement.java
@@ -54,10 +54,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
- package org.jdom.contrib.input;
  57
+ package org.jdom2.contrib.input;
58 58
 
59  
-import org.jdom.Element;
60  
-import org.jdom.Namespace;
  59
+import org.jdom2.Element;
  60
+import org.jdom2.Namespace;
61 61
 
62 62
 /**
63 63
  * This class extends a normal Element with a traceback to its
16  contrib/src/java/org/jdom2/contrib/input/LineNumberSAXBuilder.java
@@ -54,14 +54,14 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
- package org.jdom.contrib.input;
58  
-
59  
-import org.jdom.Element;
60  
-import org.jdom.Namespace;
61  
-import org.jdom.DefaultJDOMFactory;
62  
-import org.jdom.JDOMFactory;
63  
-import org.jdom.input.SAXBuilder;
64  
-import org.jdom.input.SAXHandler;
  57
+ package org.jdom2.contrib.input;
  58
+
  59
+import org.jdom2.Element;
  60
+import org.jdom2.Namespace;
  61
+import org.jdom2.DefaultJDOMFactory;
  62
+import org.jdom2.JDOMFactory;
  63
+import org.jdom2.input.SAXBuilder;
  64
+import org.jdom2.input.SAXHandler;
65 65
 import org.xml.sax.Attributes;
66 66
 import org.xml.sax.Locator;
67 67
 import org.xml.sax.SAXException;
4  contrib/src/java/org/jdom2/contrib/input/ResultSetBuilder.java
@@ -54,14 +54,14 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.input;
  57
+package org.jdom2.contrib.input;
58 58
 
59 59
 import java.io.*;
60 60
 import java.sql.*;
61 61
 import java.text.*;
62 62
 import java.util.*;
63 63
 
64  
-import org.jdom.*;
  64
+import org.jdom2.*;
65 65
 
66 66
 /**
67 67
  * <p><code>ResultSetBuilder</code> builds a JDOM tree from a 
6  contrib/src/java/org/jdom2/contrib/input/scanner/ElementListener.java
@@ -54,10 +54,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.input.scanner;
  57
+package org.jdom2.contrib.input.scanner;
58 58
 
59  
-import org.jdom.Element;
60  
-import org.jdom.JDOMException;
  59
+import org.jdom2.Element;
  60
+import org.jdom2.JDOMException;
61 61
 
62 62
 /**
63 63
  * The interface objects listening for element creation notification
12  contrib/src/java/org/jdom2/contrib/input/scanner/ElementScanner.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.input.scanner;
  57
+package org.jdom2.contrib.input.scanner;
58 58
 
59 59
 import java.io.IOException;
60 60
 import java.util.*;
@@ -68,11 +68,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
68 68
 import org.xml.sax.SAXNotSupportedException;
69 69
 import org.xml.sax.helpers.XMLFilterImpl;
70 70
 
71  
-import org.jdom.*;
72  
-import org.jdom.DefaultJDOMFactory;
73  
-import org.jdom.JDOMFactory;
74  
-import org.jdom.input.SAXBuilder;
75  
-import org.jdom.input.SAXHandler;
  71
+import org.jdom2.*;
  72
+import org.jdom2.DefaultJDOMFactory;
  73
+import org.jdom2.JDOMFactory;
  74
+import org.jdom2.input.SAXBuilder;
  75
+import org.jdom2.input.SAXHandler;
76 76
 
77 77
 /**
78 78
  * An XML filter that uses XPath-like expressions to select the
8  contrib/src/java/org/jdom2/contrib/input/scanner/JakartaRegExpXPathMatcher.java
@@ -54,12 +54,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.input.scanner;
  57
+package org.jdom2.contrib.input.scanner;
58 58
 
59 59
 
60  
-import org.jdom.Element;
61  
-import org.jdom.JDOMException;
62  
-import org.jdom.xpath.XPath;
  60
+import org.jdom2.Element;
  61
+import org.jdom2.JDOMException;
  62
+import org.jdom2.xpath.XPath;
63 63
 
64 64
 import org.xml.sax.Attributes;
65 65
 
6  contrib/src/java/org/jdom2/contrib/input/scanner/XPathMatcher.java
@@ -54,15 +54,15 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.input.scanner;
  57
+package org.jdom2.contrib.input.scanner;
58 58
 
59 59
 
60 60
 import java.lang.reflect.InvocationTargetException;
61 61
 import java.lang.reflect.Constructor;
62 62
 import java.lang.reflect.Modifier;
63 63
 
64  
-import org.jdom.Element;
65  
-import org.jdom.JDOMException;
  64
+import org.jdom2.Element;
  65
+import org.jdom2.JDOMException;
66 66
 
67 67
 import org.xml.sax.Attributes;
68 68
 
10  contrib/src/java/org/jdom2/contrib/input/scanner/doc-files/ElementScannerTest.java
@@ -2,11 +2,11 @@
2 2
 
3 3
 import org.xml.sax.InputSource;
4 4
 
5  
-import org.jdom.Element;
6  
-import org.jdom.output.XMLOutputter;
  5
+import org.jdom2.Element;
  6
+import org.jdom2.output.XMLOutputter;
7 7
 
8  
-import org.jdom.contrib.input.scanner.ElementScanner;
9  
-import org.jdom.contrib.input.scanner.ElementListener;
  8
+import org.jdom2.contrib.input.scanner.ElementScanner;
  9
+import org.jdom2.contrib.input.scanner.ElementListener;
10 10
 
11 11
 
12 12
 public class ElementScannerTest
@@ -15,7 +15,7 @@
15 15
 
16 16
    public static void main(String[] args) throws Exception
17 17
    {
18  
-      org.jdom.contrib.input.scanner.XPathMatcher.setDebug(true);
  18
+      org.jdom2.contrib.input.scanner.XPathMatcher.setDebug(true);
19 19
 
20 20
       ElementScanner scanner = new ElementScanner();
21 21
 
10  contrib/src/java/org/jdom2/contrib/output/JTreeOutputter.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.output;
  57
+package org.jdom2.contrib.output;
58 58
 
59 59
 /**
60 60
  * A JTree outputter.
@@ -71,10 +71,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
71 71
 import javax.swing.*;
72 72
 import javax.swing.tree.DefaultMutableTreeNode;
73 73
 import javax.swing.tree.TreeNode;
74  
-import org.jdom.input.SAXBuilder;
75  
-import org.jdom.Document;
76  
-import org.jdom.Attribute;
77  
-import org.jdom.Element;
  74
+import org.jdom2.input.SAXBuilder;
  75
+import org.jdom2.Document;
  76
+import org.jdom2.Attribute;
  77
+import org.jdom2.Element;
78 78
 
79 79
 public class JTreeOutputter {
80 80
 
14  contrib/src/java/org/jdom2/contrib/schema/Schema.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.schema;
  57
+package org.jdom2.contrib.schema;
58 58
 
59 59
 import java.io.File;
60 60
 import java.io.InputStream;
@@ -76,11 +76,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
76 76
 import org.iso_relax.verifier.VerifierFactory;
77 77
 import org.iso_relax.verifier.VerifierConfigurationException;
78 78
 
79  
-import org.jdom.Document;
80  
-import org.jdom.Element;
81  
-import org.jdom.JDOMException;
82  
-import org.jdom.output.SAXOutputter;
83  
-import org.jdom.output.JDOMLocator;
  79
+import org.jdom2.Document;
  80
+import org.jdom2.Element;
  81
+import org.jdom2.JDOMException;
  82
+import org.jdom2.output.SAXOutputter;
  83
+import org.jdom2.output.JDOMLocator;
84 84
 
85 85
 /**
86 86
  * The compiled representation of a schema definition capable of
@@ -95,7 +95,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
95 95
  * <p>
96 96
  * To validate a document against a W3C XML Schema definition:</p>
97 97
  * <pre>
98  
- * import org.jdom.contrib.schema.Schema;
  98
+ * import org.jdom2.contrib.schema.Schema;
99 99
  *
100 100
  *    String uri = &lt;The URL of the schema document&gt;;
101 101
  *    Document doc = &lt;a JDOM document&gt;;
2  contrib/src/java/org/jdom2/contrib/schema/ValidationError.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom.contrib.schema;
  57
+package org.jdom2.contrib.schema;
58 58
 
59 59
 /**
60 60
  * A ValidationError object encapsulates a schema validation error or
0  core/build.sh 100755 → 100644
File mode changed
4  core/package/JDOMAbout.java
@@ -59,8 +59,8 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
59 59
 import java.util.jar.*;
60 60
 import java.util.zip.*;
61 61
 
62  
-import org.jdom.*;
63  
-import org.jdom.input.*;
  62
+import org.jdom2.*;
  63
+import org.jdom2.input.*;
64 64
 
65 65
 /**
66 66
  * This class is not part of the core JDOM API, but implements a way to show 
8  core/samples/DescendantDemo.java
@@ -57,10 +57,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 57
 import java.io.*;
58 58
 import java.util.*;
59 59
 
60  
-import org.jdom.*;
61  
-import org.jdom.filter.ElementFilter;
62  
-import org.jdom.input.*;
63  
-import org.jdom.output.*;
  60
+import org.jdom2.*;
  61
+import org.jdom2.filter.ElementFilter;
  62
+import org.jdom2.input.*;
  63
+import org.jdom2.output.*;
64 64
 
65 65
 /**
66 66
  * Demonstrates the use of {@link Parent#getDescendants}.
6  core/samples/SAXBuilderDemo.java
@@ -56,9 +56,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
56 56
 
57 57
 import java.io.*;
58 58
 
59  
-import org.jdom.*;
60  
-import org.jdom.input.*;
61  
-import org.jdom.output.*;
  59
+import org.jdom2.*;
  60
+import org.jdom2.input.*;
  61
+import org.jdom2.output.*;
62 62
 
63 63
 /**
64 64
  * <p><code>SAXBuilderDemo</code> demonstrates how to
10  core/samples/WarReader.java
@@ -59,11 +59,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
59 59
 import java.io.PrintStream;
60 60
 import java.util.Iterator;
61 61
 import java.util.List;
62  
-import org.jdom.Document;
63  
-import org.jdom.Element;
64  
-import org.jdom.JDOMException;
65  
-import org.jdom.input.SAXBuilder;
66  
-import org.jdom.output.XMLOutputter;
  62
+import org.jdom2.Document;
  63
+import org.jdom2.Element;
  64
+import org.jdom2.JDOMException;
  65
+import org.jdom2.input.SAXBuilder;
  66
+import org.jdom2.output.XMLOutputter;
67 67
 
68 68
 /**
69 69
  * <p><code>WarReader</code> demonstrates how to
8  core/samples/XPathReader.java
@@ -56,10 +56,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
56 56
 
57 57
 import java.io.*;
58 58
 import java.util.*;
59  
-import org.jdom.*;
60  
-import org.jdom.input.*;
61  
-import org.jdom.output.*;
62  
-import org.jdom.xpath.*;
  59
+import org.jdom2.*;
  60
+import org.jdom2.input.*;
  61
+import org.jdom2.output.*;
  62
+import org.jdom2.xpath.*;
63 63
 
64 64
 /**
65 65
  * <p><code>XPathReader</code> demonstrates how to
8  core/samples/XSLTransform.java
@@ -54,10 +54,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-import org.jdom.*;
58  
-import org.jdom.input.*;
59  
-import org.jdom.output.*;
60  
-import org.jdom.transform.*;
  57
+import org.jdom2.*;
  58
+import org.jdom2.input.*;
  59
+import org.jdom2.output.*;
  60
+import org.jdom2.transform.*;
61 61
 import javax.xml.transform.*;
62 62
 import javax.xml.transform.stream.*;
63 63
 
6  core/samples/sax/DocumentReader.java
@@ -58,9 +58,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
58 58
 import org.xml.sax.InputSource;
59 59
 import org.xml.sax.SAXException;
60 60
 
61  
-import org.jdom.Document;
62  
-import org.jdom.JDOMException;
63  
-import org.jdom.output.SAXOutputter;
  61
+import org.jdom2.Document;
  62
+import org.jdom2.JDOMException;
  63
+import org.jdom2.output.SAXOutputter;
64 64
 
65 65
 /**
66 66
  * An XMLReader wrapper for JDOM documents.
6  core/samples/sax/FilterTest.java
@@ -55,9 +55,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 55
 
56 56
 import java.io.InputStream;
57 57
 
58  
-import org.jdom.Document;
59  
-import org.jdom.input.SAXBuilder;
60  
-import org.jdom.output.XMLOutputter;
  58
+import org.jdom2.Document;
  59
+import org.jdom2.input.SAXBuilder;
  60
+import org.jdom2.output.XMLOutputter;
61 61
 
62 62
 /**
63 63
  * Tests SAXBuilder's XMLFilter feature
6  core/samples/sax/ReaderTest.java
@@ -60,9 +60,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
60 60
 import org.xml.sax.InputSource;
61 61
 import org.xml.sax.XMLReader;
62 62
 
63  
-import org.jdom.Document;
64  
-import org.jdom.input.SAXBuilder;
65  
-import org.jdom.output.XMLOutputter;
  63
+import org.jdom2.Document;
  64
+import org.jdom2.input.SAXBuilder;
  65
+import org.jdom2.output.XMLOutputter;
66 66
 
67 67
 /**
68 68
  * Tests DocumentReader
2  core/src/java/org/jdom2/Attribute.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 import java.io.*;
60 60
 
2  core/src/java/org/jdom2/AttributeList.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 import java.util.*;
60 60
 
2  core/src/java/org/jdom2/CDATA.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 /**
60 60
  * An XML CDATA section. Represents character-based content within an XML
4  core/src/java/org/jdom2/Comment.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 /**
60 60
  * An XML comment. Methods allow the user to get and set the text of the
@@ -137,7 +137,7 @@ public Comment setText(String text) {
137 137
     public String toString() {
138 138
         return new StringBuffer()
139 139
             .append("[Comment: ")
140  
-            .append(new org.jdom.output.XMLOutputter().outputString(this))
  140
+            .append(new org.jdom2.output.XMLOutputter().outputString(this))
141 141
             .append("]")
142 142
             .toString();
143 143
     }
2  core/src/java/org/jdom2/Content.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 import java.io.*;
60 60
 
4  core/src/java/org/jdom2/ContentList.java
@@ -54,11 +54,11 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 import java.util.*;
60 60
 
61  
-import org.jdom.filter.*;
  61
+import org.jdom2.filter.*;
62 62
 
63 63
 /**
64 64
  * A non-public list implementation holding only legal JDOM content, including
2  core/src/java/org/jdom2/DataConversionException.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
  
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 /**
60 60
  * Thrown when a data conversion from a string to value type fails, such as
2  core/src/java/org/jdom2/DefaultJDOMFactory.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 import java.util.*;
60 60
 
8  core/src/java/org/jdom2/DescendantIterator.java
@@ -54,12 +54,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 import java.util.*;
60  
-import org.jdom.Content;
61  
-import org.jdom.Element;
62  
-import org.jdom.Parent;
  60
+import org.jdom2.Content;
  61
+import org.jdom2.Element;
  62
+import org.jdom2.Parent;
63 63
 
64 64
 /**
65 65
  * Traverse all a parent's descendants (all children at any level below
4  core/src/java/org/jdom2/DocType.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 /**
60 60
  * An XML DOCTYPE declaration.  Method allow the user to get and set the
@@ -273,7 +273,7 @@ public String getInternalSubset() {
273 273
     public String toString() {
274 274
         return new StringBuffer()
275 275
             .append("[DocType: ")
276  
-            .append(new org.jdom.output.XMLOutputter().outputString(this))
  276
+            .append(new org.jdom2.output.XMLOutputter().outputString(this))
277 277
             .append("]")
278 278
             .toString();
279 279
     }
4  core/src/java/org/jdom2/Document.java
@@ -54,10 +54,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 import java.util.*;
60  
-import org.jdom.filter.*;
  60
+import org.jdom2.filter.*;
61 61
 
62 62
 /**
63 63
  * An XML document. Methods allow access to the root element as well as the
4  core/src/java/org/jdom2/Element.java
@@ -54,12 +54,12 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 import java.io.*;
60 60
 import java.util.*;
61 61
 
62  
-import org.jdom.filter.*;
  62
+import org.jdom2.filter.*;
63 63
 
64 64
 /**
65 65
  * An XML element. Methods allow the user to get and manipulate its child
2  core/src/java/org/jdom2/EntityRef.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 /**
60 60
  * An XML entity reference. Methods allow the user to manage its name, public
4  core/src/java/org/jdom2/FilterIterator.java
@@ -54,10 +54,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
 
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 import java.util.*;
60  
-import org.jdom.filter.*;
  60
+import org.jdom2.filter.*;
61 61
 
62 62
 /**
63 63
  * Traverse a parent's children that match the supplied filter.
2  core/src/java/org/jdom2/IllegalAddException.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
  
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 /**
60 60
  * Thrown when trying to add a illegal object to a JDOM construct.
2  core/src/java/org/jdom2/IllegalDataException.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
  
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 /**
60 60
  * Thrown when illegal text is supplied to a JDOM construct.
2  core/src/java/org/jdom2/IllegalNameException.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
  
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 /**
60 60
  * Thrown when a name is supplied in construction of a JDOM construct whose
2  core/src/java/org/jdom2/IllegalTargetException.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
  
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59
 /**
60 60
  * Thrown when a target is supplied in construction of a JDOM {@link
2  core/src/java/org/jdom2/JDOMException.java
@@ -54,7 +54,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
54 54
  
55 55
  */
56 56
 
57  
-package org.jdom;
  57
+package org.jdom2;
58 58
 
59 59