Initial import

.gitignore

@@ -0,0 +1,3 @@
+db
+build
+derby.log

build.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="evetool" default="default" basedir=".">
+    <description>Builds, tests, and runs the project evetool.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="evetool-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>

manifest.mf

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+

nbproject/build-impl.xml

@@ -0,0 +1,642 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - junit compilation
+  - junit execution
+  - junit debugging
+  - applet
+  - cleanup
+
+        -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="evetool-impl">
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <available file="${manifest.file}" property="manifest.available"/>
+        <condition property="manifest.available+main.class">
+            <and>
+                <isset property="manifest.available"/>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="libs.CopyLibs.classpath"/>
+            </and>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="do.depend" value="false"/>
+        <condition property="do.depend.true">
+            <istrue value="${do.depend}"/>
+        </condition>
+        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
+            <and>
+                <isset property="jaxws.endorsed.dir"/>
+                <available file="nbproject/jaxws-build.xml"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.dir">Must set src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-javac">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="" name="sourcepath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="," property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <delete>
+                    <files includes="${javac.includes.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-junit">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <sequential>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="${run.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" jarfile="${dist.jar}">
+                <j2seproject1:fileset dir="${build.classes.dir}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target depends="init" name="deps-jar" unless="no.deps"/>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-depend">
+        <j2seproject3:depend/>
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
+        <j2seproject3:javac/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
+        <j2seproject1:jar/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
+        <j2seproject1:jar manifest="${manifest.file}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}">
+            <j2seproject1:manifest>
+                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+            </j2seproject1:manifest>
+        </j2seproject1:jar>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <pathconvert property="run.classpath.without.build.classes.dir">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to=""/>
+        </pathconvert>
+        <pathconvert pathsep=" " property="jar.classpath">
+            <path path="${run.classpath.without.build.classes.dir}"/>
+            <chainedmapper>
+                <flattenmapper/>
+                <globmapper from="*" to="lib/*"/>
+            </chainedmapper>
+        </pathconvert>
+        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+            <fileset dir="${build.classes.dir}"/>
+            <manifest>
+                <attribute name="Main-Class" value="${main.class}"/>
+                <attribute name="Class-Path" value="${jar.classpath}"/>
+            </manifest>
+        </copylibs>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo>java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="-do-not-recompile">
+        <property name="javac.includes.binary" value=""/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-single" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+        </javadoc>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                JUNIT COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-test-depend">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                JUNIT EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:junit testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:junit excludes="" includes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <!--
+                =======================
+                JUNIT DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <mkdir dir="${build.test.results.dir}"/>
+        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <syspropertyset>
+                    <propertyref prefix="test-sys-prop."/>
+                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                </syspropertyset>
+                <arg value="${test.class}"/>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target depends="init" name="deps-clean" unless="no.deps"/>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+</project>

nbproject/genfiles.properties

@@ -0,0 +1,8 @@
+build.xml.data.CRC32=72f9b92a
+build.xml.script.CRC32=129c125f
+build.xml.stylesheet.CRC32=958a1d3e
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=72f9b92a
+nbproject/build-impl.xml.script.CRC32=47fa33a7
+nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5

nbproject/private/private.properties

@@ -0,0 +1,7 @@
+compile.on.save=true
+do.depend=false
+do.jar=true
+javac.debug=true
+javadoc.preview=true
+jaxws.endorsed.dir=/usr/local/netbeans-6.5/java2/modules/ext/jaxws21/api:/usr/local/netbeans-6.5/ide10/modules/ext/jaxb/api
+user.properties.file=/home/chris/.netbeans/6.5/build.properties

nbproject/private/private.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+</project-private>

nbproject/project.properties

@@ -0,0 +1,76 @@
+application.title=evetool
+application.vendor=chris
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/evetool.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+excludes=
+file.reference.derby.jar=lib/derby.jar
+file.reference.jaxen-core.jar=lib/jaxen-core.jar
+file.reference.jaxen-jdom.jar=lib/jaxen-jdom.jar
+file.reference.saxpath.jar=lib/saxpath.jar
+file.reference.xalan.jar=lib/xalan.jar
+file.reference.xerces.jar=lib/xerces.jar
+file.reference.xml-apis.jar=lib/xml-apis.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${file.reference.jaxen-core.jar}:\
+    ${file.reference.jaxen-jdom.jar}:\
+    ${file.reference.saxpath.jar}:\
+    ${file.reference.xalan.jar}:\
+    ${file.reference.xerces.jar}:\
+    ${file.reference.xml-apis.jar}:\
+    ${file.reference.derby.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit_4.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=uk.co.md87.evetool.Main
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test

nbproject/project.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>evetool</name>
+            <minimum-ant-version>1.6.5</minimum-ant-version>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>

src/org/jdom/Attribute.java

@@ -0,0 +1,717 @@
+/*--
+
+ $Id: Attribute.java,v 1.56 2007/11/10 05:28:58 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+import java.io.*;
+
+/**
+ * An XML attribute. Methods allow the user to obtain the value of the attribute
+ * as well as namespace and type information.
+ *
+ * @version $Revision: 1.56 $, $Date: 2007/11/10 05:28:58 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ * @author  Elliotte Rusty Harold
+ * @author  Wesley Biggs
+ * @author  Victor Toni
+ */
+public class Attribute implements Serializable, Cloneable {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: Attribute.java,v $ $Revision: 1.56 $ $Date: 2007/11/10 05:28:58 $ $Name: jdom_1_1 $";
+
+    /**
+     * Attribute type: the attribute has not been declared or type
+     * is unknown.
+     *
+     * @see #getAttributeType
+     */
+    public final static int UNDECLARED_TYPE = 0;
+
+    /**
+     * Attribute type: the attribute value is a string.
+     *
+     * @see #getAttributeType
+     */
+    public final static int CDATA_TYPE = 1;
+
+    /**
+     * Attribute type: the attribute value is a unique identifier.
+     *
+     * @see #getAttributeType
+     */
+    public final static int ID_TYPE = 2;
+
+    /**
+     * Attribute type: the attribute value is a reference to a
+     * unique identifier.
+     *
+     * @see #getAttributeType
+     */
+    public final static int IDREF_TYPE = 3;
+
+    /**
+     * Attribute type: the attribute value is a list of references to
+     * unique identifiers.
+     *
+     * @see #getAttributeType
+     */
+    public final static int IDREFS_TYPE = 4;
+
+    /**
+     * Attribute type: the attribute value is the name of an entity.
+     *
+     * @see #getAttributeType
+     */
+    public final static int ENTITY_TYPE = 5;
+
+    /**
+     * <p>
+     * Attribute type: the attribute value is a list of entity names.
+     * </p>
+     *
+     * @see #getAttributeType
+     */
+    public final static int ENTITIES_TYPE = 6;
+
+    /**
+     * Attribute type: the attribute value is a name token.
+     * <p>
+     * According to SAX 2.0 specification, attributes of enumerated
+     * types should be reported as "NMTOKEN" by SAX parsers.  But the
+     * major parsers (Xerces and Crimson) provide specific values
+     * that permit to recognize them as {@link #ENUMERATED_TYPE}.
+     *
+     * @see #getAttributeType
+     */
+    public final static int NMTOKEN_TYPE = 7;
+
+    /**
+     * Attribute type: the attribute value is a list of name tokens.
+     *
+     * @see #getAttributeType
+     */
+    public final static int NMTOKENS_TYPE = 8;
+
+    /**
+     * Attribute type: the attribute value is the name of a notation.
+     *
+     * @see #getAttributeType
+     */
+    public final static int NOTATION_TYPE = 9;
+
+    /**
+     * Attribute type: the attribute value is a name token from an
+     * enumeration.
+     *
+     * @see #getAttributeType
+     */
+    public final static int ENUMERATED_TYPE = 10;
+
+    // Keep the old constant names for one beta cycle to help migration
+
+
+
+    /** The local name of the <code>Attribute</code> */
+    protected String name;
+
+    /** The <code>{@link Namespace}</code> of the <code>Attribute</code> */
+    protected transient Namespace namespace;
+
+    /** The value of the <code>Attribute</code> */
+    protected String value;
+
+    /** The type of the <code>Attribute</code> */
+    protected int type = UNDECLARED_TYPE;
+
+    /** Parent element, or null if none */
+    protected Element parent;
+
+    /**
+     * Default, no-args constructor for implementations to use if needed.
+     */
+    protected Attribute() {}
+
+    /**
+     * This will create a new <code>Attribute</code> with the
+     * specified (local) name and value, and in the provided
+     * <code>{@link Namespace}</code>.
+     *
+     * @param name <code>String</code> name of <code>Attribute</code>.
+     * @param value <code>String</code> value for new attribute.
+     * @param namespace <code>Namespace</code> namespace for new attribute.
+     * @throws IllegalNameException if the given name is illegal as an
+     *         attribute name or if if the new namespace is the default
+     *         namespace. Attributes cannot be in a default namespace.
+     * @throws IllegalDataException if the given attribute value is
+     *         illegal character data (as determined by
+     *         {@link org.jdom.Verifier#checkCharacterData}).
+     */
+    public Attribute(final String name, final String value, final Namespace namespace) {
+        this(name, value, UNDECLARED_TYPE, namespace);
+    }
+
+    /**
+     * This will create a new <code>Attribute</code> with the
+     * specified (local) name, value, and type, and in the provided
+     * <code>{@link Namespace}</code>.
+     *
+     * @param name <code>String</code> name of <code>Attribute</code>.
+     * @param value <code>String</code> value for new attribute.
+     * @param type <code>int</code> type for new attribute.
+     * @param namespace <code>Namespace</code> namespace for new attribute.
+     * @throws IllegalNameException if the given name is illegal as an
+     *         attribute name or if if the new namespace is the default
+     *         namespace. Attributes cannot be in a default namespace.
+     * @throws IllegalDataException if the given attribute value is
+     *         illegal character data (as determined by
+     *         {@link org.jdom.Verifier#checkCharacterData}) or
+     *         if the given attribute type is not one of the
+     *         supported types.
+     */
+    public Attribute(final String name, final String value, final int type, final Namespace namespace) {
+        setName(name);
+        setValue(value);
+        setAttributeType(type);
+        setNamespace(namespace);
+    }
+
+    /**
+     * This will create a new <code>Attribute</code> with the
+     * specified (local) name and value, and does not place
+     * the attribute in a <code>{@link Namespace}</code>.
+     * <p>
+     * <b>Note</b>: This actually explicitly puts the
+     * <code>Attribute</code> in the "empty" <code>Namespace</code>
+     * (<code>{@link Namespace#NO_NAMESPACE}</code>).
+     *
+     * @param name <code>String</code> name of <code>Attribute</code>.
+     * @param value <code>String</code> value for new attribute.
+     * @throws IllegalNameException if the given name is illegal as an
+     *         attribute name.
+     * @throws IllegalDataException if the given attribute value is
+     *         illegal character data (as determined by
+     *         {@link org.jdom.Verifier#checkCharacterData}).
+     */
+    public Attribute(final String name, final String value) {
+        this(name, value, UNDECLARED_TYPE, Namespace.NO_NAMESPACE);
+    }
+
+    /**
+     * This will create a new <code>Attribute</code> with the
+     * specified (local) name, value and type, and does not place
+     * the attribute in a <code>{@link Namespace}</code>.
+     * <p>
+     * <b>Note</b>: This actually explicitly puts the
+     * <code>Attribute</code> in the "empty" <code>Namespace</code>
+     * (<code>{@link Namespace#NO_NAMESPACE}</code>).
+     *
+     * @param name <code>String</code> name of <code>Attribute</code>.
+     * @param value <code>String</code> value for new attribute.
+     * @param type <code>int</code> type for new attribute.
+     * @throws IllegalNameException if the given name is illegal as an
+     *         attribute name.
+     * @throws IllegalDataException if the given attribute value is
+     *         illegal character data (as determined by
+     *         {@link org.jdom.Verifier#checkCharacterData}) or
+     *         if the given attribute type is not one of the
+     *         supported types.
+     */
+    public Attribute(final String name, final String value, final int type) {
+        this(name, value, type, Namespace.NO_NAMESPACE);
+    }
+
+    /**
+     * This will return the parent of this <code>Attribute</code>.
+     * If there is no parent, then this returns <code>null</code>.
+     *
+     * @return parent of this <code>Attribute</code>
+     */
+    public Element getParent() {
+        return parent;
+    }
+
+    /**
+     * This retrieves the owning <code>{@link Document}</code> for
+     * this Attribute, or null if not a currently a member of a
+     * <code>{@link Document}</code>.
+     *
+     * @return <code>Document</code> owning this Attribute, or null.
+     */
+    public Document getDocument() {
+        final Element parentElement = getParent();
+        if (parentElement != null) {
+	        return parentElement.getDocument();
+        }
+
+        return null;
+    }
+
+    /**
+     * This will set the parent of this <code>Attribute</code>.
+     *
+     * @param parent <code>Element</code> to be new parent.
+     * @return this <code>Attribute</code> modified.
+     */
+    protected Attribute setParent(final Element parent) {
+        this.parent = parent;
+        return this;
+    }
+
+    /**
+     * This detaches the <code>Attribute</code> from its parent, or does
+     * nothing if the <code>Attribute</code> has no parent.
+     *
+     * @return <code>Attribute</code> - this <code>Attribute</code> modified.
+     */
+    public Attribute detach() {
+        final Element parentElement = getParent();
+        if (parentElement != null) {
+            parentElement.removeAttribute(getName(),getNamespace());
+        }
+
+        return this;
+    }
+
+    /**
+     * This will retrieve the local name of the
+     * <code>Attribute</code>. For any XML attribute
+     * which appears as
+     * <code>[namespacePrefix]:[attributeName]</code>,
+     * the local name of the attribute would be
+     * <code>[attributeName]</code>. When the attribute
+     * has no namespace, the local name is simply the attribute
+     * name.
+     * <p>
+     * To obtain the namespace prefix for this
+     * attribute, the
+     * <code>{@link #getNamespacePrefix()}</code>
+     * method should be used.
+     *
+     * @return <code>String</code> - name of this attribute,
+     *                               without any namespace prefix.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This sets the local name of the <code>Attribute</code>.
+     *
+     * @param name the new local name to set
+     * @return <code>Attribute</code> - the attribute modified.
+     * @throws IllegalNameException if the given name is illegal as an
+     *         attribute name.
+     */
+    public Attribute setName(final String name) {
+        final String reason  = Verifier.checkAttributeName(name);
+        if (reason != null) {
+            throw new IllegalNameException(name, "attribute", reason);
+        }
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * This will retrieve the qualified name of the <code>Attribute</code>.
+     * For any XML attribute whose name is
+     * <code>[namespacePrefix]:[elementName]</code>,
+     * the qualified name of the attribute would be
+     * everything (both namespace prefix and
+     * element name). When the attribute has no
+     * namespace, the qualified name is simply the attribute's
+     * local name.
+     * <p>
+     * To obtain the local name of the attribute, the
+     * <code>{@link #getName()}</code> method should be used.
+     * <p>
+     * To obtain the namespace prefix for this attribute,
+     * the <code>{@link #getNamespacePrefix()}</code>
+     * method should be used.
+     *
+     * @return <code>String</code> - full name for this element.
+     */
+    public String getQualifiedName() {
+        // Note: Any changes here should be reflected in
+        // XMLOutputter.printQualifiedName()
+        final String prefix = namespace.getPrefix();
+        
+        // no prefix found
+        if ((prefix == null) || ("".equals(prefix))) {
+            return getName();
+        } else {
+            return new StringBuffer(prefix)
+                .append(':')
+                .append(getName())
+                .toString();
+        }
+    }
+
+    /**
+     * This will retrieve the namespace prefix of the
+     * <code>Attribute</code>. For any XML attribute
+     * which appears as
+     * <code>[namespacePrefix]:[attributeName]</code>,
+     * the namespace prefix of the attribute would be
+     * <code>[namespacePrefix]</code>. When the attribute
+     * has no namespace, an empty <code>String</code> is returned.
+     *
+     * @return <code>String</code> - namespace prefix of this
+     *                               attribute.
+     */
+    public String getNamespacePrefix() {
+        return namespace.getPrefix();
+    }
+
+    /**
+     * This returns the URI mapped to this <code>Attribute</code>'s
+     * prefix. If no mapping is found, an empty <code>String</code> is
+     * returned.
+     *
+     * @return <code>String</code> - namespace URI for this <code>Attribute</code>.
+     */
+    public String getNamespaceURI() {
+        return namespace.getURI();
+    }
+
+    /**
+     * This will return this <code>Attribute</code>'s
+     * <code>{@link Namespace}</code>.
+     *
+     * @return <code>Namespace</code> - Namespace object for this <code>Attribute</code>
+     */
+    public Namespace getNamespace() {
+        return namespace;
+    }
+
+    /**
+     * This sets this <code>Attribute</code>'s <code>{@link Namespace}</code>.
+     * If the provided namespace is null, the attribute will have no namespace.
+     * The namespace must have a prefix.
+     *
+     * @param namespace the new namespace
+     * @return <code>Element</code> - the element modified.
+     * @throws IllegalNameException if the new namespace is the default
+     *         namespace. Attributes cannot be in a default namespace.
+     */
+    public Attribute setNamespace(Namespace namespace) {
+        if (namespace == null) {
+            namespace = Namespace.NO_NAMESPACE;
+        }
+
+        // Verify the attribute isn't trying to be in a default namespace
+        // Attributes can't be in a default namespace
+        if (namespace != Namespace.NO_NAMESPACE &&
+            "".equals(namespace.getPrefix())) {
+            throw new IllegalNameException("", "attribute namespace",
+                "An attribute namespace without a prefix can only be the " +
+                "NO_NAMESPACE namespace");
+        }
+        this.namespace = namespace;
+        return this;
+    }
+
+    /**
+     * This will return the actual textual value of this
+     * <code>Attribute</code>.  This will include all text
+     * within the quotation marks.
+     *
+     * @return <code>String</code> - value for this attribute.
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * This will set the value of the <code>Attribute</code>.
+     *
+     * @param value <code>String</code> value for the attribute.
+     * @return <code>Attribute</code> - this Attribute modified.
+     * @throws IllegalDataException if the given attribute value is
+     *         illegal character data (as determined by
+     *         {@link org.jdom.Verifier#checkCharacterData}).
+     */
+    public Attribute setValue(final String value) {
+        final String reason = Verifier.checkCharacterData(value);
+        if (reason != null) {
+            throw new IllegalDataException(value, "attribute", reason);
+        }
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * This will return the actual declared type of this
+     * <code>Attribute</code>.
+     *
+     * @return <code>int</code> - type for this attribute.
+     */
+    public int getAttributeType() {
+        return type;
+    }
+
+    /**
+     * This will set the type of the <code>Attribute</code>.
+     *
+     * @param type <code>int</code> type for the attribute.
+     * @return <code>Attribute</code> - this Attribute modified.
+     * @throws IllegalDataException if the given attribute type is
+     *         not one of the supported types.
+     */
+    public Attribute setAttributeType(final int type) {
+        if ((type < UNDECLARED_TYPE) || (type > ENUMERATED_TYPE)) {
+            throw new IllegalDataException(String.valueOf(type),
+                                        "attribute", "Illegal attribute type");
+        }
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * This returns a <code>String</code> representation of the
+     * <code>Attribute</code>, suitable for debugging.
+     *
+     * @return <code>String</code> - information about the
+     *         <code>Attribute</code>
+     */
+    public String toString() {
+        return new StringBuffer()
+            .append("[Attribute: ")
+            .append(getQualifiedName())
+            .append("=\"")
+            .append(value)
+            .append("\"")
+            .append("]")
+            .toString();
+    }
+
+    /**
+     * This tests for equality of this <code>Attribute</code> to the supplied
+     * <code>Object</code>.
+     *
+     * @param ob <code>Object</code> to compare to.
+     * @return <code>boolean</code> - whether the <code>Attribute</code> is
+     *         equal to the supplied <code>Object</code>.
+     */
+    public final boolean equals(final Object ob) {
+        return (ob == this);
+    }
+
+    /**
+     * This returns the hash code for this <code>Attribute</code>.
+     *
+     * @return <code>int</code> - hash code.
+     */
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
+    /**
+     * This will return a clone of this <code>Attribute</code>.
+     *
+     * @return <code>Object</code> - clone of this <code>Attribute</code>.
+     */
+    public Object clone() {
+        Attribute attribute = null;
+        try {
+            attribute = (Attribute) super.clone();
+        }
+        catch (final CloneNotSupportedException ignore) {
+            // Won't happen
+        }
+
+        // Name, namespace, and value are references to imutable objects
+        // and are copied by super.clone() (aka Object.clone())
+
+        // super.clone() copies reference to set parent to null
+        attribute.parent = null;
+        return attribute;
+    }
+
+    /////////////////////////////////////////////////////////////////
+    // Convenience Methods below here
+    /////////////////////////////////////////////////////////////////
+
+    /**
+     * This gets the value of the attribute, in
+     * <code>int</code> form, and if no conversion
+     * can occur, throws a
+     * <code>{@link DataConversionException}</code>
+     *
+     * @return <code>int</code> value of attribute.
+     * @throws DataConversionException when conversion fails.
+     */
+    public int getIntValue() throws DataConversionException {
+        try {
+            return Integer.parseInt(value.trim());
+        } catch (final NumberFormatException e) {
+            throw new DataConversionException(name, "int");
+        }
+    }
+
+    /**
+     * This gets the value of the attribute, in
+     * <code>long</code> form, and if no conversion
+     * can occur, throws a
+     * <code>{@link DataConversionException}</code>
+     *
+     * @return <code>long</code> value of attribute.
+     * @throws DataConversionException when conversion fails.
+     */
+    public long getLongValue() throws DataConversionException {
+        try {
+            return Long.parseLong(value.trim());
+        } catch (final NumberFormatException e) {
+            throw new DataConversionException(name, "long");
+        }
+    }
+
+    /**
+     * This gets the value of the attribute, in
+     * <code>float</code> form, and if no conversion
+     * can occur, throws a
+     * <code>{@link DataConversionException}</code>
+     *
+     * @return <code>float</code> value of attribute.
+     * @throws DataConversionException when conversion fails.
+     */
+    public float getFloatValue() throws DataConversionException {
+        try {
+            // Avoid Float.parseFloat() to support JDK 1.1
+            return Float.valueOf(value.trim()).floatValue();
+        } catch (final NumberFormatException e) {
+            throw new DataConversionException(name, "float");
+        }
+    }
+
+    /**
+     * This gets the value of the attribute, in
+     * <code>double</code> form, and if no conversion
+     * can occur, throws a
+     * <code>{@link DataConversionException}</code>
+     *
+     * @return <code>double</code> value of attribute.
+     * @throws DataConversionException when conversion fails.
+     */
+    public double getDoubleValue() throws DataConversionException {
+        try {
+            // Avoid Double.parseDouble() to support JDK 1.1
+            return Double.valueOf(value.trim()).doubleValue();
+        } catch (final NumberFormatException e) {
+            // Specially handle INF and -INF that Double.valueOf doesn't do
+            String v = value.trim();
+            if ("INF".equals(v)) {
+                return Double.POSITIVE_INFINITY;
+            }
+            if ("-INF".equals(v)) {
+                return Double.NEGATIVE_INFINITY;
+            }
+            throw new DataConversionException(name, "double");
+        }
+    }
+
+    /**
+     * This gets the effective boolean value of the attribute, or throws a
+     * <code>{@link DataConversionException}</code> if a conversion can't be
+     * performed.  True values are: "true", "on", "1", and "yes".  False
+     * values are: "false", "off", "0", and "no".  Values are trimmed before
+     * comparison.  Values other than those listed here throw the exception.
+     *
+     * @return <code>boolean</code> value of attribute.
+     * @throws DataConversionException when conversion fails.
+     */
+    public boolean getBooleanValue() throws DataConversionException {
+        final String valueTrim = value.trim();
+        if (
+            (valueTrim.equalsIgnoreCase("true")) ||
+            (valueTrim.equalsIgnoreCase("on")) ||
+            (valueTrim.equalsIgnoreCase("1")) ||
+            (valueTrim.equalsIgnoreCase("yes"))) {
+            return true;
+        } else if (
+            (valueTrim.equalsIgnoreCase("false")) ||
+            (valueTrim.equalsIgnoreCase("off")) ||
+            (valueTrim.equalsIgnoreCase("0")) ||
+            (valueTrim.equalsIgnoreCase("no"))
+        ) {
+            return false;
+        } else {
+            throw new DataConversionException(name, "boolean");
+        }
+    }
+
+    // Support a custom Namespace serialization so no two namespace
+    // object instances may exist for the same prefix/uri pair
+    private void writeObject(final ObjectOutputStream out) throws IOException {
+
+        out.defaultWriteObject();
+
+        // We use writeObject() and not writeUTF() to minimize space
+        // This allows for writing pointers to already written strings
+        out.writeObject(namespace.getPrefix());
+        out.writeObject(namespace.getURI());
+    }
+
+    private void readObject(final ObjectInputStream in)
+        throws IOException, ClassNotFoundException {
+
+        in.defaultReadObject();
+
+        namespace = Namespace.getNamespace(
+            (String) in.readObject(), (String) in.readObject());
+    }
+}

src/org/jdom/AttributeList.java

@@ -0,0 +1,518 @@
+/*--
+
+ $Id: AttributeList.java,v 1.24 2007/11/10 05:28:58 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+import java.util.*;
+
+/**
+ * <code>AttributeList</code> represents legal JDOM <code>Attribute</code>
+ * content.  This class is NOT PUBLIC; users should see it as a simple List
+ * implementation.
+ *
+ * @author Alex Rosen
+ * @author Philippe Riand
+ * @author Bradley S. Huffman
+ * @version $Revision: 1.24 $, $Date: 2007/11/10 05:28:58 $
+ * @see CDATA
+ * @see Comment
+ * @see Element
+ * @see EntityRef
+ * @see ProcessingInstruction
+ * @see Text
+ */
+class AttributeList extends AbstractList
+                    implements List, java.io.Serializable {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: AttributeList.java,v $ $Revision: 1.24 $ $Date: 2007/11/10 05:28:58 $ $Name: jdom_1_1 $";
+
+    private static final int INITIAL_ARRAY_SIZE = 5;
+
+    /** The backing list */
+    private Attribute elementData[];
+    private int size;
+
+    /** The parent Element */
+    private Element parent;
+
+    /** Force an Element parent */
+    private AttributeList() {}
+
+    /**
+     * Create a new instance of the AttributeList representing
+     * Element content
+     *
+     * @param parent element whose attributes are to be held
+     */
+    AttributeList(Element parent) {
+        this.parent = parent;
+    }
+
+    /**
+     * Package internal method to support building from sources that are
+     * 100% trusted.
+     *
+     * @param a attribute to add without any checks
+     */ 
+    final void uncheckedAddAttribute(Attribute a) {
+        a.parent = parent;
+        ensureCapacity(size + 1);
+        elementData[size++] = a;
+        modCount++;
+    }
+
+    /**
+     * Add a attribute to the end of the list or replace a existing
+     * attribute with the same name and <code>Namespace</code>.
+     *
+     * @param obj The object to insert into the list.
+     * @return true (as per the general contract of Collection.add).
+     * @throws IndexOutOfBoundsException if index < 0 || index > size()
+     */
+    public boolean add(Object obj) {
+        if (obj instanceof Attribute) {
+            Attribute attribute = (Attribute) obj;
+            int duplicate = indexOfDuplicate(attribute);
+            if (duplicate < 0) {
+                add(size(), attribute);
+            }
+            else {
+                set(duplicate, attribute);
+            }
+        }
+        else if (obj == null) {
+            throw new IllegalAddException("Cannot add null attribute");
+        }
+        else {
+            throw new IllegalAddException("Class " +
+                                          obj.getClass().getName() +
+                                          " is not an attribute");
+        }
+        return true;
+    }
+
+    /**
+     * Inserts the specified attribute at the specified position in this list.
+     * Shifts the attribute currently at that position (if any) and any
+     * subsequent attributes to the right (adds one to their indices).
+     *
+     * @param index The location to set the value to.
+     * @param obj The object to insert into the list.
+     * throws IndexOutOfBoundsException if index < 0 || index > size()
+     */
+    public void add(int index, Object obj) {
+        if (obj instanceof Attribute) {
+            Attribute attribute = (Attribute) obj;
+            int duplicate = indexOfDuplicate(attribute);
+            if (duplicate >= 0) {
+                throw new IllegalAddException("Cannot add duplicate attribute");
+            }
+            add(index, attribute);
+        }
+        else if (obj == null) {
+            throw new IllegalAddException("Cannot add null attribute");
+        }
+        else {
+            throw new IllegalAddException("Class " +
+                                          obj.getClass().getName() +
+                                          " is not an attribute");
+        }
+        modCount++;
+    }
+
+    /**
+     * Check and add the <code>Attribute</code> to this list at
+     * the given index. Note: does not check for duplicate
+     * attributes.
+     *
+     * @param index index where to add <code>Attribute</code>
+     * @param attribute <code>Attribute</code> to add
+     */
+    void add(int index, Attribute attribute) {
+        if (attribute.getParent() != null) {
+            throw new IllegalAddException(
+                          "The attribute already has an existing parent \"" +
+                          attribute.getParent().getQualifiedName() + "\"");
+        }
+
+        String reason = Verifier.checkNamespaceCollision(attribute, parent);
+        if (reason != null) {
+            throw new IllegalAddException(parent, attribute, reason);
+        }
+
+        if (index<0 || index>size) {
+            throw new IndexOutOfBoundsException("Index: " + index +
+                                                " Size: " + size());
+        }
+
+        attribute.setParent(parent);
+
+        ensureCapacity(size+1);
+        if( index==size ) {
+            elementData[size++] = attribute;
+        } else {
+            System.arraycopy(elementData, index, elementData, index + 1, size - index);
+            elementData[index] = attribute;
+            size++;
+        }
+        modCount++;
+    }
+
+    /**
+     * Add all the objects in the specified collection.
+     *
+     * @param collection The collection containing all the objects to add.
+     * @return <code>true</code> if the list was modified as a result of
+     * the add.
+     */
+    public boolean addAll(Collection collection) {
+        return addAll(size(), collection);
+    }
+
+    /**
+     * Inserts the specified collecton at the specified position in this list.
+     * Shifts the attribute currently at that position (if any) and any
+     * subsequent attributes to the right (adds one to their indices).
+     *
+     * @param index The offset to start adding the data in the collection
+     * @param collection The collection to insert into the list.
+     * @return <code>true</code> if the list was modified as a result of
+     *                           the add.
+     * throws IndexOutOfBoundsException if index < 0 || index > size()
+     */
+    public boolean addAll(int index, Collection collection) {
+        if (index<0 || index>size) {
+            throw new IndexOutOfBoundsException("Index: " + index +
+                                                " Size: " + size());
+        }
+
+        if ((collection == null) || (collection.size() == 0)) {
+            return false;
+        }
+        ensureCapacity(size() + collection.size());
+
+        int count = 0;
+
+        try {
+            Iterator i = collection.iterator();
+            while (i.hasNext()) {
+                Object obj = i.next();
+                add(index + count, obj);
+                count++;
+            }
+        }
+        catch (RuntimeException exception) {
+            for (int i = 0; i < count; i++) {
+                remove(index);
+            }
+            throw exception;
+        }
+
+        return true;
+    }
+
+    /**
+     * Clear the current list.
+     */
+    public void clear() {
+        if (elementData != null) {
+            for (int i = 0; i < size; i++) {
+                Attribute attribute = elementData[i];
+                attribute.setParent(null);
+            }
+            elementData = null;
+            size = 0;
+        }
+        modCount++;
+    }
+
+    /**
+     * Clear the current list and set it to the contents
+     * of the <code>Collection</code>.
+     * object.
+     *
+     * @param collection The collection to use.
+     */
+    void clearAndSet(Collection collection) {
+        Attribute[] old = elementData;
+        int oldSize = size;
+
+        elementData = null;
+        size = 0;
+
+        if ((collection != null) && (collection.size() != 0)) {
+            ensureCapacity(collection.size());
+            try {
+                addAll(0, collection);
+            }
+            catch (RuntimeException exception) {
+                elementData = old;
+                size = oldSize;
+                throw exception;
+            }
+        }
+
+        if (old != null) {
+            for (int i = 0; i < oldSize; i++) {
+                Attribute attribute = old[i];
+                attribute.setParent(null);
+            }
+        }
+        modCount++;
+    }
+
+    /**
+     * Increases the capacity of this <code>AttributeList</code> instance,
+     * if necessary, to ensure that it can hold at least the number of
+     * items specified by the minimum capacity argument.
+     *
+     * @param minCapacity the desired minimum capacity.
+     */
+    private void ensureCapacity(int minCapacity) {
+        if (elementData == null) {
+            elementData = new Attribute[Math.max(minCapacity, INITIAL_ARRAY_SIZE)];
+        }
+        else {
+            int oldCapacity = elementData.length;
+            if (minCapacity > oldCapacity) {
+                Attribute oldData[] = elementData;
+                int newCapacity = (oldCapacity * 3)/2 + 1;
+                if (newCapacity < minCapacity)
+                    newCapacity = minCapacity;
+                elementData = new Attribute[newCapacity];
+                System.arraycopy(oldData, 0, elementData, 0, size);
+            }
+        }
+    }
+
+    /**
+     * Return the object at the specified offset.
+     *
+     * @param index The offset of the object.
+     * @return The Object which was returned.
+     */
+    public Object get(int index) {
+        if (index<0 || index>=size) {
+            throw new IndexOutOfBoundsException("Index: " + index +
+                                                " Size: " + size());
+        }
+
+        return elementData[index];
+    }
+
+    /**
+     * Return the <code>Attribute</code> with the
+     * given name and <code>Namespace</code>.
+     *
+     * @param name name of attribute to return
+     * @param namespace <code>Namespace</code> to match
+     * @return the <code>Attribute</code>, or null if one doesn't exist.
+     */
+    Object get(String name, Namespace namespace) {
+        int index = indexOf(name, namespace);
+        if (index < 0) {
+            return null;
+        }
+        return elementData[index];
+    }
+
+    /**
+     * Return index of the <code>Attribute</code> with the
+     * given name and uri.
+     */
+    int indexOf(String name, Namespace namespace) {
+        String uri = namespace.getURI();
+        if (elementData != null) {
+            for (int i = 0; i < size; i++) {
+                Attribute old = elementData[i];
+                String oldURI = old.getNamespaceURI();
+                String oldName = old.getName();
+                if (oldURI.equals(uri) && oldName.equals(name)) {
+                    return i;
+                }
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Remove the object at the specified offset.
+     *
+     * @param index The offset of the object.
+     * @return The Object which was removed.
+     */
+    public Object remove(int index) {
+        if (index<0 || index>=size)
+            throw new IndexOutOfBoundsException("Index: " + index +
+                                                " Size: " + size());
+
+        Attribute old = elementData[index];
+        old.setParent(null);
+        int numMoved = size - index - 1;
+        if (numMoved > 0)
+            System.arraycopy(elementData, index+1, elementData, index,numMoved);
+        elementData[--size] = null; // Let gc do its work
+        modCount++;
+        return old;
+    }
+
+    /**
+     * Remove the <code>Attribute</code> with the
+     * given name and <code>Namespace</code>.
+     *
+     * @param namespace <code>Namespace</code> to match
+     * @return the <code>true</code> if attribute was removed,
+     *             <code>false</code> otherwise
+     */
+    boolean remove(String name, Namespace namespace) {
+        int index = indexOf(name, namespace);
+        if (index < 0) {
+            return false;
+        }
+        remove(index);
+        return true;
+    }
+
+    /**
+     * Set the object at the specified location to the supplied
+     * object.
+     *
+     * @param index The location to set the value to.
+     * @param obj The location to set the value to.
+     * @return The object which was replaced.
+     * throws IndexOutOfBoundsException if index < 0 || index >= size()
+     */
+    public Object set(int index, Object obj) {
+        if (obj instanceof Attribute) {
+            Attribute attribute = (Attribute) obj;
+            int duplicate = indexOfDuplicate(attribute);
+            if ((duplicate >= 0) && (duplicate != index)) {
+                throw new IllegalAddException("Cannot set duplicate attribute");
+            }
+            return set(index, attribute);
+        }
+        else if (obj == null) {
+            throw new IllegalAddException("Cannot add null attribute");
+        }
+        else {
+            throw new IllegalAddException("Class " +
+                                          obj.getClass().getName() +
+                                          " is not an attribute");
+        }
+    }
+
+    /**
+     * Set the object at the specified location to the supplied
+     * object. Note: does not check for duplicate attributes.
+     *
+     * @param index The location to set the value to.
+     * @param attribute The attribute to set.
+     * @return The object which was replaced.
+     * throws IndexOutOfBoundsException if index < 0 || index >= size()
+     */
+    Object set(int index, Attribute attribute) {
+        if (index < 0 || index >= size)
+            throw new IndexOutOfBoundsException("Index: " + index +
+                                                " Size: " + size());
+
+        if (attribute.getParent() != null) {
+            throw new IllegalAddException(
+                          "The attribute already has an existing parent \"" +
+                          attribute.getParent().getQualifiedName() + "\"");
+        }
+
+        String reason = Verifier.checkNamespaceCollision(attribute, parent);
+        if (reason != null) {
+            throw new IllegalAddException(parent, attribute, reason);
+        }
+
+        Attribute old = (Attribute) elementData[index];
+        old.setParent(null);
+
+        elementData[index] = attribute;
+        attribute.setParent(parent);
+        return old;
+    }
+
+    /**
+     * Return index of attribute with same name and Namespace, or
+     * -1 if one doesn't exist
+     */
+    private int indexOfDuplicate(Attribute attribute) {
+        int duplicate = -1;
+        String name = attribute.getName();
+        Namespace namespace = attribute.getNamespace();
+        duplicate = indexOf(name, namespace);
+        return duplicate;
+    }
+
+    /**
+     * Return the number of items in this list
+     *
+     * @return The number of items in this list.
+     */
+    public int size() {
+        return size;
+    }
+
+    /**
+     * Return this list as a <code>String</code>
+     */
+    public String toString() {
+        return super.toString();
+    }
+}

src/org/jdom/CDATA.java

@@ -0,0 +1,205 @@
+/*--
+
+ $Id: CDATA.java,v 1.32 2007/11/10 05:28:58 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+/**
+ * An XML CDATA section. Represents character-based content within an XML
+ * document that should be output within special CDATA tags. Semantically it's
+ * identical to a simple {@link Text} object, but output behavior is different.
+ * CDATA makes no guarantees about the underlying textual representation of
+ * character data, but does expose that data as a Java String.
+ *
+ * @version $Revision: 1.32 $, $Date: 2007/11/10 05:28:58 $
+ * @author  Dan Schaffer
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ * @author  Bradley S. Huffman
+ * @author  Victor Toni
+ */
+public class CDATA extends Text {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: CDATA.java,v $ $Revision: 1.32 $ $Date: 2007/11/10 05:28:58 $ $Name: jdom_1_1 $";
+
+    /**
+     * This is the protected, no-args constructor standard in all JDOM
+     * classes. It allows subclassers to get a raw instance with no
+     * initialization.
+     */
+    protected CDATA() { }
+
+    /**
+     * This constructor creates a new <code>CDATA</code> node, with the
+     * supplied string value as it's character content.
+     *
+     * @param string the node's character content.
+     * @throws IllegalDataException if <code>str</code> contains an 
+     *         illegal character such as a vertical tab (as determined
+     *          by {@link org.jdom.Verifier#checkCharacterData})
+     *         or the CDATA end delimiter <code>]]&gt;</code>.
+     */
+    public CDATA(final String string) {
+        setText(string);
+    }
+
+    /**
+     * This will set the value of this <code>CDATA</code> node.
+     *
+     * @param str value for node's content.
+     * @return the object on which the method was invoked
+     * @throws IllegalDataException if <code>str</code> contains an 
+     *         illegal character such as a vertical tab (as determined
+     *          by {@link org.jdom.Verifier#checkCharacterData})
+     *         or the CDATA end delimiter <code>]]&gt;</code>.
+     */
+    public Text setText(final String str) {
+        // Overrides Text.setText() because this needs to check that CDATA rules
+        // are enforced. We could have a separate Verifier check for CDATA
+        // beyond Text and call that alone before super.setText().
+
+        if (str == null || "".equals(str)) {
+            value = EMPTY_STRING;
+            return this;
+        }
+
+        final String reason = Verifier.checkCDATASection(str);
+        if (reason != null) {
+            throw new IllegalDataException(str, "CDATA section", reason);
+        }
+
+        value = str;
+
+        return this;
+    }
+
+    /**
+     * This will append character content to whatever content already
+     * exists within this <code>CDATA</code> node.
+     *
+     * @param str character content to append.
+     * @throws IllegalDataException if <code>str</code> contains an 
+     *         illegal character such as a vertical tab (as determined
+     *          by {@link org.jdom.Verifier#checkCharacterData})
+     *         or the CDATA end delimiter <code>]]&gt;</code>.
+     */
+    public void append(final String str) {
+        // Overrides Text.append(String) because this needs to check that CDATA
+        // rules are enforced. We could have a separate Verifier check for CDATA
+        // beyond Text and call that alone before super.setText().
+    
+        if (str == null || "".equals(str)) {
+            return;
+        }
+    
+        // we need a temp value to ensure that the value is changed _after_
+        // validation
+        final String tmpValue;
+        if (value == EMPTY_STRING) {
+            tmpValue = str;
+        } else {
+            tmpValue = value + str;
+        }
+    
+        // we have to do late checking since the end of a CDATA section could 
+        // have been created by concating both strings:
+        // "]" + "]>" 
+        // or 
+        // "]]" + ">"
+        // TODO: maybe this could be optimized for this two cases
+        final String reason = Verifier.checkCDATASection(tmpValue);
+        if (reason != null) {
+            throw new IllegalDataException(str, "CDATA section", reason);
+        }
+    
+        value = tmpValue;
+    }
+    
+    /**
+     * This will append the content of another <code>Text</code> node
+     * to this node.
+     *
+     * @param text Text node to append.
+     */
+    public void append(final Text text) {
+        // Overrides Text.append(Text) because this needs to check that CDATA
+        // rules are enforced. We could have a separate Verifier check for CDATA
+        // beyond Text and call that alone before super.setText().
+    
+        if (text == null) {
+            return;
+        }
+        append(text.getText());
+    }
+
+    /**
+     * This returns a <code>String</code> representation of the
+     * <code>CDATA</code> node, suitable for debugging. If the XML
+     * representation of the <code>CDATA</code> node is desired,
+     * either <code>{@link #getText}</code> or
+     * {@link org.jdom.output.XMLOutputter#output(CDATA, java.io.Writer)}</code>
+     * should be used.
+     *
+     * @return <code>String</code> - information about this node.
+     */
+    public String toString() {
+        return new StringBuffer(64)
+            .append("[CDATA: ")
+            .append(getText())
+            .append("]")
+            .toString();
+    }
+}

src/org/jdom/Comment.java

@@ -0,0 +1,145 @@
+/*--
+
+ $Id: Comment.java,v 1.33 2007/11/10 05:28:58 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+/**
+ * An XML comment. Methods allow the user to get and set the text of the
+ * comment.
+ *
+ * @version $Revision: 1.33 $, $Date: 2007/11/10 05:28:58 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ */
+public class Comment extends Content {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: Comment.java,v $ $Revision: 1.33 $ $Date: 2007/11/10 05:28:58 $ $Name: jdom_1_1 $";
+
+    /** Text of the <code>Comment</code> */
+    protected String text;
+
+    /**
+     * Default, no-args constructor for implementations to use if needed.
+     */
+    protected Comment() {}
+
+    /**
+     * This creates the comment with the supplied text.
+     *
+     * @param text <code>String</code> content of comment.
+     */
+    public Comment(String text) {
+        setText(text);
+    }
+
+
+    /**
+     * Returns the XPath 1.0 string value of this element, which is the
+     * text of this comment.
+     *
+     * @return the text of this comment
+     */
+    public String getValue() {
+        return text;
+    }
+
+    /**
+     * This returns the textual data within the <code>Comment</code>.
+     *
+     * @return <code>String</code> - text of comment.
+     */
+    public String getText() {
+        return text;
+    }
+
+    /**
+     * This will set the value of the <code>Comment</code>.
+     *
+     * @param text <code>String</code> text for comment.
+     * @return <code>Comment</code> - this Comment modified.
+     * @throws IllegalDataException if the given text is illegal for a
+     *         Comment.
+     */
+    public Comment setText(String text) {
+        String reason;
+        if ((reason = Verifier.checkCommentData(text)) != null) {
+            throw new IllegalDataException(text, "comment", reason);
+        }
+
+        this.text = text;
+        return this;
+    }
+
+    /**
+     * This returns a <code>String</code> representation of the
+     * <code>Comment</code>, suitable for debugging. If the XML
+     * representation of the <code>Comment</code> is desired,
+     * {@link org.jdom.output.XMLOutputter#outputString(Comment)}
+     * should be used.
+     *
+     * @return <code>String</code> - information about the
+     *         <code>Attribute</code>
+     */
+    public String toString() {
+        return new StringBuffer()
+            .append("[Comment: ")
+            .append(new org.jdom.output.XMLOutputter().outputString(this))
+            .append("]")
+            .toString();
+    }
+
+}

src/org/jdom/Content.java

@@ -0,0 +1,192 @@
+/*--
+
+ $Id: Content.java,v 1.6 2007/11/10 05:28:58 jhunter Exp $
+
+ Copyright (C) 2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+import java.io.*;
+
+/**
+ * Superclass for JDOM objects which can be legal child content
+ * of {@link org.jdom.Parent} nodes.
+ *
+ * @see org.jdom.Comment
+ * @see org.jdom.DocType
+ * @see org.jdom.Element
+ * @see org.jdom.EntityRef
+ * @see org.jdom.Parent
+ * @see org.jdom.ProcessingInstruction
+ * @see org.jdom.Text
+ *
+ * @author Bradley S. Huffman
+ * @author Jason Hunter
+ * @version $Revision: 1.6 $, $Date: 2007/11/10 05:28:58 $
+ */
+public abstract class Content implements Cloneable, Serializable {
+
+    protected Parent parent = null;
+
+    protected Content() {}
+
+    /**
+     * Detaches this child from its parent or does nothing if the child
+     * has no parent.
+     *
+     * @return this child detached
+     */
+    public Content detach() {
+        if (parent != null) {
+            parent.removeContent(this);
+        }
+        return this;
+    }
+
+    /**
+     * Return this child's parent, or null if this child is currently
+     * not attached. The parent can be either an {@link Element}
+     * or a {@link Document}.
+     *
+     * @return this child's parent or null if none
+     */
+    public Parent getParent() {
+        return parent;
+    }
+
+    /**
+     * A convenience method that returns any parent element for this element,
+     * or null if the element is unattached or is a root element.  This was the
+     * original behavior of getParent() in JDOM Beta 9 which began returning
+     * Parent in Beta 10.  This method provides a convenient upgrade path for
+     * JDOM Beta 10 and 1.0 users.
+     *
+     * @return the containing Element or null if unattached or a root element
+     */
+    public Element getParentElement() {
+        Parent parent = getParent();
+        return (Element) ((parent instanceof Element) ? parent : null);
+    }
+
+    /**
+     * Sets the parent of this Content. The caller is responsible for removing
+     * any pre-existing parentage.
+     *
+     * @param  parent              new parent element
+     * @return                     the target element
+     */
+    protected Content setParent(Parent parent) {
+        this.parent = parent;
+        return this;
+    }
+
+    /**
+     * Return this child's owning document or null if the branch containing
+     * this child is currently not attached to a document.
+     *
+     * @return this child's owning document or null if none
+     */
+    public Document getDocument() {
+        if (parent == null) return null;
+        return parent.getDocument();
+    }
+
+
+    /**
+     * Returns the XPath 1.0 string value of this child.
+     *
+     * @return xpath string value of this child.
+     */
+    public abstract String getValue();
+
+    /**
+     * Returns a deep, unattached copy of this child and its descendants
+     * detached from any parent or document.
+     *
+     * @return a detached deep copy of this child and descendants
+     */
+    public Object clone() {
+        try {
+            Content c = (Content)super.clone();
+            c.parent = null;
+            return c;
+        } catch (CloneNotSupportedException e) {
+            //Can not happen ....
+            //e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * This tests for equality of this Content object to the supplied object.
+     * Content items are considered equal only if they are referentially equal
+     * (i&#46;e&#46; the same object).  User code may choose to compare objects
+     * based on their properties instead.
+     *
+     * @param ob <code>Object</code> to compare to.
+     * @return <code>boolean</code> - whether the <code>Content</code> is
+     *         equal to the supplied <code>Object</code>.
+     */
+    public final boolean equals(Object ob) {
+        return (ob == this);
+    }
+
+    /**
+     * This returns the hash code for this <code>Content</code> item.
+     *
+     * @return <code>int</code> - hash code.
+     */
+    public final int hashCode() {
+        return super.hashCode();
+    }
+}

src/org/jdom/ContentList.java

@@ -0,0 +1,944 @@
+/*--
+
+ $Id: ContentList.java,v 1.42 2007/11/10 05:28:58 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org).
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+import java.util.*;
+
+import org.jdom.filter.*;
+
+/**
+ * A non-public list implementation holding only legal JDOM content, including
+ * content for Document or Element nodes. Users see this class as a simple List
+ * implementation.
+ *
+ * @see     CDATA
+ * @see     Comment
+ * @see     Element
+ * @see     EntityRef
+ * @see     ProcessingInstruction
+ * @see     Text
+ *
+ * @version $Revision: 1.42 $, $Date: 2007/11/10 05:28:58 $
+ * @author  Alex Rosen
+ * @author  Philippe Riand
+ * @author  Bradley S. Huffman
+ */
+final class ContentList extends AbstractList implements java.io.Serializable {
+
+	private static final String CVS_ID =
+      "@(#) $RCSfile: ContentList.java,v $ $Revision: 1.42 $ $Date: 2007/11/10 05:28:58 $ $Name: jdom_1_1 $";
+
+	private static final long serialVersionUID = 1L;
+
+	private static final int INITIAL_ARRAY_SIZE = 5;
+
+    /** Our backing list */
+    private Content elementData[];
+    private int size;
+
+    /** Document or Element this list belongs to */
+    private Parent parent;
+
+    /** Force either a Document or Element parent */
+    ContentList(Parent parent) {
+        this.parent = parent;
+    }
+
+    /**
+     * Package internal method to support building from sources that are
+     * 100% trusted.
+     *
+     * @param c content to add without any checks
+     */
+    final void uncheckedAddContent(Content c) {
+        c.parent = parent;
+        ensureCapacity(size + 1);
+        elementData[size++] = c;
+        modCount++;
+    }
+
+    /**
+     * Inserts the specified object at the specified position in this list.
+     * Shifts the object currently at that position (if any) and any
+     * subsequent objects to the right (adds one to their indices).
+     *
+     * @param index The location to set the value to.
+     * @param obj The object to insert into the list.
+     * throws IndexOutOfBoundsException if index < 0 || index > size()
+     */
+    public void add(int index, Object obj) {
+        if (obj == null) {
+            throw new IllegalAddException("Cannot add null object");
+        }
+        if (obj instanceof String) {  // String is OK to add as special case
+            obj = new Text(obj.toString());  // wrap it as a Content
+        }
+        if ((obj instanceof Content)) {
+            add(index, (Content) obj);
+        } else {
+            throw new IllegalAddException("Class " +
+                         obj.getClass().getName() +
+                         " is of unrecognized type and cannot be added");
+        }
+    }
+
+    /**
+     * @see org.jdom.ContentList#add(int, org.jdom.Content)
+     */
+    private void documentCanContain(int index, Content child) throws IllegalAddException {
+        if (child instanceof Element) {
+            if (indexOfFirstElement() >= 0) {
+                throw new IllegalAddException(
+                        "Cannot add a second root element, only one is allowed");
+            }
+            if (indexOfDocType() > index) {
+                throw new IllegalAddException(
+                        "A root element cannot be added before the DocType");
+            }
+        }
+        if (child instanceof DocType) {
+            if (indexOfDocType() >= 0) {
+                throw new IllegalAddException(
+                        "Cannot add a second doctype, only one is allowed");
+            }
+            int firstElt = indexOfFirstElement();
+            if (firstElt != -1 && firstElt < index) {
+                throw new IllegalAddException(
+                        "A DocType cannot be added after the root element");
+            }
+        }
+        if (child instanceof CDATA) {
+            throw new IllegalAddException("A CDATA is not allowed at the document root");
+        }
+
+        if (child instanceof Text) {
+            throw new IllegalAddException("A Text is not allowed at the document root");
+        }
+
+        if (child instanceof EntityRef) {
+            throw new IllegalAddException("An EntityRef is not allowed at the document root");
+        }
+    }
+
+    private static void elementCanContain(int index, Content child) throws IllegalAddException {
+        if (child instanceof DocType) {
+            throw new IllegalAddException(
+                    "A DocType is not allowed except at the document level");
+        }
+    }
+
+    /**
+     * Check and add the <code>Element</code> to this list at
+     * the given index.
+     *
+     * @param index index where to add <code>Element</code>
+     * @param child <code>Element</code> to add
+     */
+    void add(int index, Content child) {
+        if (child == null) {
+            throw new IllegalAddException("Cannot add null object");
+        }
+        if (parent instanceof Document) {
+          documentCanContain(index, child);
+        }
+        else {
+          elementCanContain(index, child);
+        }
+
+        if (child.getParent() != null) {
+            Parent p = child.getParent();
+            if (p instanceof Document) {
+                throw new IllegalAddException((Element)child,
+                   "The Content already has an existing parent document");
+            }
+            else {
+                throw new IllegalAddException(
+                     "The Content already has an existing parent \"" +
+                     ((Element)p).getQualifiedName() + "\"");
+            }
+        }
+
+        if (child == parent) {
+            throw new IllegalAddException(
+                "The Element cannot be added to itself");
+        }
+
+        // Detect if we have <a><b><c/></b></a> and c.add(a)
+        if ((parent instanceof Element && child instanceof Element) &&
+                ((Element) child).isAncestor((Element)parent)) {
+            throw new IllegalAddException(
+                "The Element cannot be added as a descendent of itself");
+        }
+
+        if (index<0 || index>size) {
+            throw new IndexOutOfBoundsException("Index: " + index +
+                                                " Size: " + size());
+        }
+
+        child.setParent(parent);
+
+        ensureCapacity(size+1);
+        if( index==size ) {
+            elementData[size++] = child;
+        } else {
+            System.arraycopy(elementData, index, elementData, index + 1, size - index);
+            elementData[index] = child;
+            size++;
+        }
+        modCount++;
+    }
+
+    /**
+     * Add the specified collecton to the end of this list.
+     *
+     * @param collection The collection to add to the list.
+     * @return <code>true</code> if the list was modified as a result of
+     *                           the add.
+     */
+    public boolean addAll(Collection collection) {
+        return addAll(size(), collection);
+    }
+
+    /**
+     * Inserts the specified collecton at the specified position in this list.
+     * Shifts the object currently at that position (if any) and any
+     * subsequent objects to the right (adds one to their indices).
+     *
+     * @param index The offset to start adding the data in the collection
+     * @param collection The collection to insert into the list.
+     * @return <code>true</code> if the list was modified as a result of
+     *                           the add.
+     * throws IndexOutOfBoundsException if index < 0 || index > size()
+     */
+    public boolean addAll(int index, Collection collection) {
+        if (index<0 || index>size) {
+            throw new IndexOutOfBoundsException("Index: " + index +
+                                                " Size: " + size());
+        }
+
+        if ((collection == null) || (collection.size() == 0)) {
+            return false;
+        }
+        ensureCapacity(size() + collection.size());
+
+        int count = 0;
+        try {
+            Iterator i = collection.iterator();
+            while (i.hasNext()) {
+                Object obj = i.next();
+                add(index + count, obj);
+                count++;
+            }
+        }
+        catch (RuntimeException exception) {
+            for (int i = 0; i < count; i++) {
+                remove(index);
+            }
+            throw exception;
+        }
+
+        return true;
+    }
+
+    /**
+     * Clear the current list.
+     */
+    public void clear() {
+        if (elementData != null) {
+            for (int i = 0; i < size; i++) {
+                Content obj = elementData[i];
+                removeParent(obj);
+            }
+            elementData = null;
+            size = 0;
+        }
+        modCount++;
+    }
+
+    /**
+     * Clear the current list and set it to the contents
+     * of the <code>Collection</code>.
+     * object.
+     *
+     * @param collection The collection to use.
+     */
+    void clearAndSet(Collection collection) {
+        Content[] old = elementData;
+        int oldSize = size;
+
+        elementData = null;
+        size = 0;
+
+        if ((collection != null) && (collection.size() != 0)) {
+            ensureCapacity(collection.size());
+            try {
+                addAll(0, collection);
+            }
+            catch (RuntimeException exception) {
+                elementData = old;
+                size = oldSize;
+                throw exception;
+            }
+        }
+
+        if (old != null) {
+            for (int i = 0; i < oldSize; i++) {
+                removeParent(old[i]);
+            }
+        }
+        modCount++;
+    }
+
+    /**
+     * Increases the capacity of this <code>ContentList</code> instance,
+     * if necessary, to ensure that it can hold at least the number of
+     * items specified by the minimum capacity argument.
+     *
+     * @param minCapacity the desired minimum capacity.
+     */
+    void ensureCapacity(int minCapacity) {
+        if( elementData==null ) {
+            elementData = new Content[Math.max(minCapacity, INITIAL_ARRAY_SIZE)];
+        } else {
+            int oldCapacity = elementData.length;
+            if (minCapacity > oldCapacity) {
+                Object oldData[] = elementData;
+                int newCapacity = (oldCapacity * 3)/2 + 1;
+                if (newCapacity < minCapacity)
+                    newCapacity = minCapacity;
+                elementData = new Content[newCapacity];
+                System.arraycopy(oldData, 0, elementData, 0, size);
+            }
+        }
+    }
+
+    /**
+     * Return the object at the specified offset.
+     *
+     * @param index The offset of the object.
+     * @return The Object which was returned.
+     */
+    public Object get(int index) {
+        if (index<0 || index>=size) {
+            throw new IndexOutOfBoundsException("Index: " + index +
+                                                " Size: " + size());
+        }
+        return elementData[index];
+    }
+
+    /**
+     * Return a view of this list based on the given filter.
+     *
+     * @param filter <code>Filter</code> for this view.
+     * @return a list representing the rules of the <code>Filter</code>.
+     */
+    List getView(Filter filter) {
+        return new FilterList(filter);
+    }
+
+    /**
+     * Return the index of the first Element in the list.  If the parent
+     * is a <code>Document</code> then the element is the root element.
+     * If the list contains no Elements, it returns -1.
+     *
+     * @return index of first element, or -1 if one doesn't exist
+     */
+    int indexOfFirstElement() {
+        if( elementData!=null ) {
+            for (int i = 0; i < size; i++) {
+                if (elementData[i] instanceof Element) {
+                    return i;
+                }
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Return the index of the DocType element in the list. If the list contains
+     * no DocType, it returns -1.
+     *
+     * @return                     index of the DocType, or -1 if it doesn't
+     *                             exist
+     */
+    int indexOfDocType() {
+        if (elementData != null) {
+            for (int i = 0; i < size; i++) {
+                if (elementData[i] instanceof DocType) {
+                    return i;
+                }
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Remove the object at the specified offset.
+     *
+     * @param index The offset of the object.
+     * @return The Object which was removed.
+     */
+    public Object remove(int index) {
+        if (index<0 || index>=size)
+            throw new IndexOutOfBoundsException("Index: " + index +
+                                                 " Size: " + size());
+
+        Content old = elementData[index];
+        removeParent(old);
+        int numMoved = size - index - 1;
+        if (numMoved > 0)
+            System.arraycopy(elementData, index+1, elementData, index,numMoved);
+        elementData[--size] = null; // Let gc do its work
+        modCount++;
+        return old;
+    }
+
+
+    /** Remove the parent of a Object */
+    private static void removeParent(Content c) {
+        c.setParent(null);
+    }
+
+    /**
+     * Set the object at the specified location to the supplied
+     * object.
+     *
+     * @param index The location to set the value to.
+     * @param obj The location to set the value to.
+     * @return The object which was replaced.
+     * throws IndexOutOfBoundsException if index < 0 || index >= size()
+     */
+    public Object set(int index, Object obj) {
+        if (index<0 || index>=size)
+            throw new IndexOutOfBoundsException("Index: " + index +
+                                                 " Size: " + size());
+
+        if ((obj instanceof Element) && (parent instanceof Document)) {
+            int root = indexOfFirstElement();
+            if ((root >= 0) && (root != index)) {
+                throw new IllegalAddException(
+                  "Cannot add a second root element, only one is allowed");
+            }
+        }
+
+        if ((obj instanceof DocType) && (parent instanceof Document)) {
+            int docTypeIndex = indexOfDocType();
+            if ((docTypeIndex >= 0) && (docTypeIndex != index)) {
+                throw new IllegalAddException(
+                        "Cannot add a second doctype, only one is allowed");
+            }
+        }
+
+        Object old = remove(index);
+        try {
+            add(index, obj);
+        }
+        catch (RuntimeException exception) {
+            add(index, old);
+            throw exception;
+        }
+        return old;
+    }
+
+    /**
+     * Return the number of items in this list
+     *
+     * @return The number of items in this list.
+     */
+    public int size() {
+        return size;
+    }
+
+    /**
+     * Return this list as a <code>String</code>
+     *
+     * @return The number of items in this list.
+     */
+    public String toString() {
+        return super.toString();
+    }
+
+    /** Give access of ContentList.modCount to FilterList */
+    private int getModCount() {
+        return modCount;
+    }
+
+    /* * * * * * * * * * * * * FilterList * * * * * * * * * * * * * * * */
+    /* * * * * * * * * * * * * FilterList * * * * * * * * * * * * * * * */
+
+    /**
+     * <code>FilterList</code> represents legal JDOM content, including content
+     * for <code>Document</code>s or <code>Element</code>s.
+     */
+
+    class FilterList extends AbstractList implements java.io.Serializable {
+
+        /** The Filter */
+        Filter filter;
+
+        /** Current number of items in this view */
+        int count = 0;
+
+        /** Expected modCount in our backing list */
+        int expected = -1;
+
+        // Implementation Note: Directly after size() is called, expected
+        //       is sync'd with ContentList.modCount and count provides
+        //       the true size of this view.  Before the first call to
+        //       size() or if the backing list is modified outside this
+        //       FilterList, both might contain bogus values and should
+        //       not be used without first calling size();
+
+        /**
+         * Create a new instance of the FilterList with the specified Filter.
+         */
+        FilterList(Filter filter) {
+            this.filter = filter;
+        }
+
+        /**
+         * Inserts the specified object at the specified position in this list.
+         * Shifts the object currently at that position (if any) and any
+         * subsequent objects to the right (adds one to their indices).
+         *
+         * @param index The location to set the value to.
+         * @param obj The object to insert into the list.
+         * throws IndexOutOfBoundsException if index < 0 || index > size()
+         */
+        public void add(int index, Object obj) {
+            if (filter.matches(obj)) {
+                int adjusted = getAdjustedIndex(index);
+                ContentList.this.add(adjusted, obj);
+                expected++;
+                count++;
+            }
+            else throw new IllegalAddException("Filter won't allow the " +
+                                obj.getClass().getName() +
+                                " '" + obj + "' to be added to the list");
+        }
+
+        /**
+         * Return the object at the specified offset.
+         *
+         * @param index The offset of the object.
+         * @return The Object which was returned.
+         */
+        public Object get(int index) {
+            int adjusted = getAdjustedIndex(index);
+            return ContentList.this.get(adjusted);
+        }
+
+        public Iterator iterator() {
+            return new FilterListIterator(filter, 0);
+        }
+
+        public ListIterator listIterator() {
+            return new FilterListIterator(filter, 0);
+        }
+
+        public ListIterator listIterator(int index) {
+            return new FilterListIterator(filter,  index);
+        }
+
+        /**
+         * Remove the object at the specified offset.
+         *
+         * @param index The offset of the object.
+         * @return The Object which was removed.
+         */
+        public Object remove(int index) {
+            int adjusted = getAdjustedIndex(index);
+            Object old = ContentList.this.get(adjusted);
+            if (filter.matches(old)) {
+                old = ContentList.this.remove(adjusted);
+                expected++;
+                count--;
+            }
+            else {
+                throw new IllegalAddException("Filter won't allow the " +
+                                             (old.getClass()).getName() +
+                                             " '" + old + "' (index " + index +
+                                             ") to be removed");
+            }
+            return old;
+        }
+
+        /**
+         * Set the object at the specified location to the supplied
+         * object.
+         *
+         * @param index The location to set the value to.
+         * @param obj The location to set the value to.
+         * @return The object which was replaced.
+         * throws IndexOutOfBoundsException if index < 0 || index >= size()
+         */
+        public Object set(int index, Object obj) {
+            Object old = null;
+            if (filter.matches(obj)) {
+                int adjusted = getAdjustedIndex(index);
+                old = ContentList.this.get(adjusted);
+                if (!filter.matches(old)) {
+                    throw new IllegalAddException("Filter won't allow the " +
+                                             (old.getClass()).getName() +
+                                             " '" + old + "' (index " + index +
+                                             ") to be removed");
+                }
+                old = ContentList.this.set(adjusted, obj);
+                expected += 2;
+            }
+            else {
+                throw new IllegalAddException("Filter won't allow index " +
+                                              index + " to be set to " +
+                                              (obj.getClass()).getName());
+            }
+            return old;
+        }
+
+        /**
+         * Return the number of items in this list
+         *
+         * @return The number of items in this list.
+         */
+        public int size() {
+            // Implementation Note: Directly after size() is called, expected
+            //       is sync'd with ContentList.modCount and count provides
+            //       the true size of this view.  Before the first call to
+            //       size() or if the backing list is modified outside this
+            //       FilterList, both might contain bogus values and should
+            //       not be used without first calling size();
+
+            if (expected == ContentList.this.getModCount()) {
+                return count;
+            }
+
+            count = 0;
+            for (int i = 0; i < ContentList.this.size(); i++) {
+                Object obj = ContentList.this.elementData[i];
+                if (filter.matches(obj)) {
+                    count++;
+                }
+            }
+            expected = ContentList.this.getModCount();
+            return count;
+        }
+
+        /**
+         * Return the adjusted index
+         *
+         * @param index Index of in this view.
+         * @return True index in backing list
+         */
+        final private int getAdjustedIndex(int index) {
+            int adjusted = 0;
+            for (int i = 0; i < ContentList.this.size; i++) {
+                Object obj = ContentList.this.elementData[i];
+                if (filter.matches(obj)) {
+                    if (index == adjusted) {
+                        return i;
+                    }
+                    adjusted++;
+                }
+            }
+
+            if (index == adjusted) {
+                return ContentList.this.size;
+            }
+
+            return ContentList.this.size + 1;
+        }
+    }
+
+    /* * * * * * * * * * * * * FilterListIterator * * * * * * * * * * * */
+    /* * * * * * * * * * * * * FilterListIterator * * * * * * * * * * * */
+
+    class FilterListIterator implements ListIterator {
+
+        /** The Filter that applies */
+        Filter filter;
+
+        /** Whether this iterator is in forward or reverse. */
+        private boolean forward = false;
+        /** Whether a call to remove() is valid */
+        private boolean canremove = false;
+        /** Whether a call to set() is valid */
+        private boolean canset = false;
+
+        /** Index in backing list of next object */
+        private int cursor = -1;
+        /** the backing index to use if we actually DO move */
+        private int tmpcursor = -1;
+        /** Index in ListIterator */
+        private int index = -1;
+
+        /** Expected modCount in our backing list */
+        private int expected = -1;
+
+        /** Number of elements matching the filter. */
+        private int fsize = 0;
+         
+        /**
+         * Default constructor
+         */
+        FilterListIterator(Filter filter, int start) {
+			this.filter = filter;
+			expected = ContentList.this.getModCount();
+			// always start list iterators in backward mode ....
+			// it makes sense... really.
+			forward = false;
+
+			if (start < 0) {
+				throw new IndexOutOfBoundsException("Index: " + start);
+			}
+
+			// the number of matching elements....
+			fsize = 0;
+
+			// go through the list, count the matching elements...
+			for (int i = 0; i < ContentList.this.size(); i++) {
+				if (filter.matches(ContentList.this.get(i))) {
+					if (start == fsize) {
+						// set the back-end cursor to the matching element....
+						cursor = i;
+						// set the front-end cursor too.
+						index = fsize;
+					}
+					fsize++;
+				}
+			}
+
+			if (start > fsize) {
+				throw new IndexOutOfBoundsException("Index: " + start + " Size: " + fsize);
+			}
+			if (cursor == -1) {
+				// implies that start == fsize (i.e. after the last element
+				// put the insertion point at the end of the Underlying
+				// content list ....
+				// i.e. an add() at this point may potentially end up with
+				// filtered content between previous() and next()
+				// the alternative is to put the cursor on the Content after
+				// the last Content that the filter passed
+				// The implications are ambiguous.
+				cursor = ContentList.this.size();
+				index = fsize;
+			}
+
+		}
+
+        /**
+		 * Returns <code>true</code> if this list iterator has a next element.
+		 */
+        public boolean hasNext() {
+        	return nextIndex() < fsize;
+        }
+
+        /**
+         * Returns the next element in the list.
+         */
+        public Object next() {
+        	if (!hasNext())
+				throw new NoSuchElementException("next() is beyond the end of the Iterator");
+			index = nextIndex();
+			cursor = tmpcursor;
+			forward = true;
+			canremove = true;
+			canset = true;
+			return ContentList.this.get(cursor);
+        }
+
+        /**
+		 * Returns <code>true</code> if this list iterator has more elements
+		 * when traversing the list in the reverse direction.
+		 */
+        public boolean hasPrevious() {
+        	return previousIndex() >= 0;
+        }
+
+        /**
+         * Returns the previous element in the list.
+         */
+        public Object previous() {
+			if (!hasPrevious())
+				throw new NoSuchElementException("previous() is before the start of the Iterator");
+			index = previousIndex();
+			cursor = tmpcursor;
+			forward = false;
+			canremove = true;
+			canset = true;
+			return ContentList.this.get(cursor);
+		}
+
+        /**
+		 * Returns the index of the element that would be returned by a
+		 * subsequent call to <code>next</code>.
+		 */
+        public int nextIndex() {
+            checkConcurrentModification();
+        	if (forward) {
+        		// Starting with next possibility ....
+        		for (int i = cursor + 1; i < ContentList.this.size(); i++) {
+        			if (filter.matches(ContentList.this.get(i))) {
+        				tmpcursor = i;
+        				return index + 1;
+        			}
+        		}
+    			// Never found another match.... put the insertion point at
+    			// the end of the list....
+    			tmpcursor = ContentList.this.size();
+    			return index + 1;
+    		}
+
+    		// We've been going back... so nextIndex() returns the same
+			// element.
+    		tmpcursor = cursor;
+    		return index;
+        }
+
+        /**
+         * Returns the index of the element that would be returned by a
+         * subsequent call to <code>previous</code>. (Returns -1 if the
+         * list iterator is at the beginning of the list.)
+         */
+        public int previousIndex() {
+			checkConcurrentModification();
+			if (!forward) {
+				// starting with next possibility ....
+				for (int i = cursor - 1; i >= 0; i--) {
+					if (filter.matches(ContentList.this.get(i))) {
+						tmpcursor = i;
+						return index - 1;
+					}
+				}
+				// Never found another match.... put the insertion point at
+				// the start of the list....
+				tmpcursor = -1;
+				return index - 1;
+			}
+
+			// We've been going forwards... so previousIndex() returns same
+			// element.
+			tmpcursor = cursor;
+			return index;
+		}
+
+        /**
+		 * Inserts the specified element into the list.
+		 */
+        public void add(Object obj) {
+			// Call to nextIndex() will check concurrent.
+			nextIndex();
+			// tmpcursor is the backing cursor of the next element
+			// Remember that List.add(index,obj) is really an insert....
+			ContentList.this.add(tmpcursor, obj);
+			forward = true;
+			expected = ContentList.this.getModCount();
+			canremove = canset = false;
+			index = nextIndex();
+			cursor = tmpcursor;
+			fsize++;
+		}
+
+        /**
+		 * Removes from the list the last element that was returned by
+		 * the last call to <code>next</code> or <code>previous</code>.
+		 */
+        public void remove() {
+			if (!canremove)
+				throw new IllegalStateException("Can not remove an "
+						+ "element unless either next() or previous() has been called "
+						+ "since the last remove()");
+			nextIndex(); // to get out cursor ...
+			ContentList.this.remove(cursor);
+			cursor = tmpcursor - 1;
+			expected = ContentList.this.getModCount();
+
+			forward = false;
+			canremove = false;
+			canset = false;
+			fsize--;
+		}
+
+        /**
+		 * Replaces the last element returned by <code>next</code> or
+		 * <code>previous</code> with the specified element.
+		 */
+        public void set(Object obj) {
+			if (!canset)
+				throw new IllegalStateException("Can not set an element "
+						+ "unless either next() or previous() has been called since the " 
+						+ "last remove() or set()");
+			checkConcurrentModification();
+
+			if (!filter.matches(obj)) {
+				throw new IllegalAddException("Filter won't allow index " + index + " to be set to "
+						+ (obj.getClass()).getName());
+			}
+			
+			ContentList.this.set(cursor, obj);
+			expected = ContentList.this.getModCount();
+			
+		}
+
+        /**
+         * Check if are backing list is being modified by someone else.
+         */
+        private void checkConcurrentModification() {
+            if (expected != ContentList.this.getModCount()) {
+                throw new ConcurrentModificationException();
+            }
+        }
+    }
+}

src/org/jdom/DataConversionException.java

@@ -0,0 +1,87 @@
+/*-- 
+
+ $Id: DataConversionException.java,v 1.14 2007/11/10 05:28:58 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom;
+
+/**
+ * Thrown when a data conversion from a string to value type fails, such as
+ * can happen with the {@link Attribute} convenience getter functions.
+ *
+ * @version $Revision: 1.14 $, $Date: 2007/11/10 05:28:58 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ */
+public class DataConversionException extends JDOMException {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: DataConversionException.java,v $ $Revision: 1.14 $ $Date: 2007/11/10 05:28:58 $ $Name: jdom_1_1 $";
+
+    /**
+     * Constructs an exception where the named construct couldn't be converted
+     * to the named data type.
+     *
+     * @param name name of the construct whose value failed conversion
+     * @param dataType type the conversion was attempting to create
+     */
+    public DataConversionException(String name, String dataType) {
+        super(new StringBuffer()
+              .append("The XML construct ")
+              .append(name)
+              .append(" could not be converted to a ")
+              .append(dataType)
+              .toString());
+    }
+}

src/org/jdom/DefaultJDOMFactory.java

@@ -0,0 +1,191 @@
+/*--
+
+ $Id: DefaultJDOMFactory.java,v 1.7 2007/11/10 05:28:58 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+import java.util.*;
+
+/**
+ * Creates the standard top-level JDOM classes (Element, Document, Comment,
+ * etc). A subclass of this factory might construct custom classes.
+ *
+ * @version $Revision: 1.7 $, $Date: 2007/11/10 05:28:58 $
+ * @author  Ken Rune Holland
+ * @author  Phil Nelson
+ * @author  Bradley S. Huffman
+ */
+public class DefaultJDOMFactory implements JDOMFactory {
+
+    private static final String CVS_ID =
+    "@(#) $RCSfile: DefaultJDOMFactory.java,v $ $Revision: 1.7 $ $Date: 2007/11/10 05:28:58 $ $Name: jdom_1_1 $";
+
+    public DefaultJDOMFactory() { }
+
+    // Allow Javadocs to inherit from JDOMFactory
+
+    public Attribute attribute(String name, String value, Namespace namespace) {
+        return new Attribute(name, value, namespace);
+    }
+
+    public Attribute attribute(String name, String value,
+                                            int type, Namespace namespace) {
+        return new Attribute(name, value, type, namespace);
+    }
+
+    public Attribute attribute(String name, String value) {
+        return new Attribute(name, value);
+    }
+
+    public Attribute attribute(String name, String value, int type) {
+        return new Attribute(name, value, type);
+    }
+
+    public CDATA cdata(String text) {
+        return new CDATA(text);
+    }
+
+    public Text text(String text) {
+        return new Text(text);
+    }
+
+    public Comment comment(String text) {
+        return new Comment(text);
+    }
+
+    public DocType docType(String elementName,
+                           String publicID, String systemID) {
+        return new DocType(elementName, publicID, systemID);
+    }
+
+    public DocType docType(String elementName, String systemID) {
+        return new DocType(elementName, systemID);
+    }
+
+    public DocType docType(String elementName) {
+        return new DocType(elementName);
+    }
+
+    public Document document(Element rootElement, DocType docType) {
+        return new Document(rootElement, docType);
+    }
+
+    public Document document(Element rootElement, DocType docType, String baseURI) {
+        return new Document(rootElement, docType, baseURI);
+    }
+
+    public Document document(Element rootElement) {
+        return new Document(rootElement);
+    }
+
+    public Element element(String name, Namespace namespace) {
+        return new Element(name, namespace);
+    }
+
+    public Element element(String name) {
+        return new Element(name);
+    }
+
+    public Element element(String name, String uri) {
+        return new Element(name, uri);
+    }
+
+    public Element element(String name, String prefix, String uri) {
+        return new Element(name, prefix, uri);
+    }
+
+    public ProcessingInstruction processingInstruction(String target,
+                                                       Map data) {
+        return new ProcessingInstruction(target, data);
+    }
+
+    public ProcessingInstruction processingInstruction(String target,
+                                                       String data) {
+        return new ProcessingInstruction(target, data);
+    }
+
+    public EntityRef entityRef(String name) {
+        return new EntityRef(name);
+    }
+
+    public EntityRef entityRef(String name, String publicID, String systemID) {
+        return new EntityRef(name, publicID, systemID);
+    }
+
+    public EntityRef entityRef(String name, String systemID) {
+        return new EntityRef(name, systemID);
+    }
+
+    // =====================================================================
+    // List manipulation
+    // =====================================================================
+
+    public void addContent(Parent parent, Content child) {
+        if (parent instanceof Document) {
+            ((Document) parent).addContent(child);
+        }
+        else {
+            ((Element) parent).addContent(child);
+        }
+    }
+
+    public void setAttribute(Element parent, Attribute a) {
+        parent.setAttribute(a);
+    }
+
+    public void addNamespaceDeclaration(Element parent, Namespace additional) {
+        parent.addNamespaceDeclaration(additional);
+    }
+}

src/org/jdom/DescendantIterator.java

@@ -0,0 +1,173 @@
+/*--
+
+ $Id: DescendantIterator.java,v 1.6 2007/11/10 05:28:58 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+import java.util.*;
+import org.jdom.Content;
+import org.jdom.Element;
+import org.jdom.Parent;
+
+/**
+ * Traverse all a parent's descendants (all children at any level below
+ * the parent).
+ *
+ * @author Bradley S. Huffman
+ * @author Jason Hunter
+ * @version $Revision: 1.6 $, $Date: 2007/11/10 05:28:58 $
+ */
+class DescendantIterator implements Iterator {
+
+    private Iterator iterator;
+    private Iterator nextIterator;
+    private List stack = new ArrayList();
+
+    private static final String CVS_ID =
+            "@(#) $RCSfile: DescendantIterator.java,v $ $Revision: 1.6 $ $Date: 2007/11/10 05:28:58 $ $Name: jdom_1_1 $";
+
+    /**
+     * Iterator for the descendants of the supplied object.
+     *
+     * @param parent document or element whose descendants will be iterated
+     */
+    DescendantIterator(Parent parent) {
+        if (parent == null) {
+            throw new IllegalArgumentException("parent parameter was null");
+        }
+        this.iterator = parent.getContent().iterator();
+    }
+
+    /**
+     * Returns true> if the iteration has more {@link Content} descendants.
+     *
+     * @return true is the iterator has more descendants
+     */
+    public boolean hasNext() {
+        if (iterator != null && iterator.hasNext()) return true;
+        if (nextIterator != null && nextIterator.hasNext()) return true;
+        if (stackHasAnyNext()) return true;
+        return false;
+    }
+
+    /**
+     * Returns the next {@link Content} descendant.
+     *
+     * @return the next descendant
+     */
+    public Object next() {
+        if (!hasNext()) {
+            throw new NoSuchElementException();
+        }
+
+        // If we need to descend, go for it and record where we are.
+        // We do the shuffle here on the next next() call so remove() is easy
+        // to code up.
+        if (nextIterator != null) {
+            push(iterator);
+            iterator = nextIterator;
+            nextIterator = null;
+        }
+
+        // If this iterator is finished, try moving up the stack
+        while (!iterator.hasNext()) {
+            if (stack.size() > 0) {
+                iterator = pop();
+            }
+            else {
+              throw new NoSuchElementException("Somehow we lost our iterator");
+            }
+        }
+
+        Content child = (Content) iterator.next();
+        if (child instanceof Element) {
+            nextIterator = ((Element)child).getContent().iterator();
+        }
+        return child;
+    }
+
+    /**
+     * Detaches the last {@link org.jdom.Content} returned by the last call to
+     * next from it's parent.  <b>Note</b>: this <b>does not</b> affect
+     * iteration and all children, siblings, and any node following the
+     * removed node (in document order) will be visited.
+     */
+    public void remove() {
+        iterator.remove();
+    }
+
+    private Iterator pop() {
+        int stackSize = stack.size();
+        if (stackSize == 0) {
+            throw new NoSuchElementException("empty stack");
+        }
+        return (Iterator) stack.remove(stackSize - 1);
+    }
+
+    private void push(Iterator itr) {
+        stack.add(itr);
+    }
+
+    private boolean stackHasAnyNext() {
+        int size = stack.size();
+        for (int i = 0; i < size; i++) {
+            Iterator itr = (Iterator) stack.get(i);
+            if (itr.hasNext()) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

src/org/jdom/DocType.java

@@ -0,0 +1,280 @@
+/*--
+
+ $Id: DocType.java,v 1.32 2007/11/10 05:28:58 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+/**
+ * An XML DOCTYPE declaration.  Method allow the user to get and set the
+ * root element name, public id, and system id.
+ *
+ * @author Brett McLaughlin
+ * @author Jason Hunter
+ * @version $Revision: 1.32 $, $Date: 2007/11/10 05:28:58 $
+ */
+public class DocType extends Content {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: DocType.java,v $ $Revision: 1.32 $ $Date: 2007/11/10 05:28:58 $ $Name: jdom_1_1 $";
+
+    /** The element being constrained */
+    protected String elementName;
+
+    /** The public ID of the DOCTYPE */
+    protected String publicID;
+
+    /** The system ID of the DOCTYPE */
+    protected String systemID;
+
+    /** The internal subset of the DOCTYPE */
+    protected String internalSubset;
+
+    /**
+     * Default, no-args constructor for implementations to use if needed.
+     */
+    protected DocType() {}
+
+    /*
+     * XXX:
+     *   We need to take care of entities and notations here.
+     */
+
+    /**
+     * This will create the <code>DocType</code> with
+     * the specified element name and a reference to an
+     * external DTD.
+     *
+     * @param elementName <code>String</code> name of
+     *        element being constrained.
+     * @param publicID <code>String</code> public ID of
+     *        referenced DTD
+     * @param systemID <code>String</code> system ID of
+     *        referenced DTD
+     * @throws IllegalDataException if the given system ID is not a legal
+     *         system literal or the public ID is not a legal public ID.
+     * @throws IllegalNameException if the given root element name is not a
+     *         legal XML element name.
+     */
+    public DocType(String elementName, String publicID, String systemID) {
+        setElementName(elementName);
+        setPublicID(publicID);
+        setSystemID(systemID);
+    }
+
+    /**
+     * This will create the <code>DocType</code> with
+     * the specified element name and reference to an
+     * external DTD.
+     *
+     * @param elementName <code>String</code> name of
+     *        element being constrained.
+     * @param systemID <code>String</code> system ID of
+     *        referenced DTD
+     * @throws IllegalDataException if the given system ID is not a legal
+     *         system literal.
+     * @throws IllegalNameException if the given root element name is not a
+     *         legal XML element name.
+     */
+    public DocType(String elementName, String systemID) {
+        this(elementName, null, systemID);
+    }
+
+    /**
+     * This will create the <code>DocType</code> with
+     * the specified element name
+     *
+     * @param elementName <code>String</code> name of
+     *        element being constrained.
+     * @throws IllegalNameException if the given root element name is not a
+     *         legal XML element name.
+     */
+    public DocType(String elementName) {
+        this(elementName, null, null);
+    }
+
+    /**
+     * This will retrieve the element name being constrained.
+     *
+     * @return <code>String</code> - element name for DOCTYPE
+     */
+    public String getElementName() {
+        return elementName;
+    }
+
+    /**
+     * This will set the root element name declared by this
+     * DOCTYPE declaration.
+     *
+     * @return DocType <code>DocType</code> this DocType object
+     * @param elementName <code>String</code> name of
+     *        root element being constrained.
+     * @throws IllegalNameException if the given root element name is not a
+     *         legal XML element name.
+     */
+    public DocType setElementName(String elementName) {
+        // This can contain a colon so we use checkXMLName()
+        // instead of checkElementName()
+        String reason = Verifier.checkXMLName(elementName);
+        if (reason != null) {
+            throw new IllegalNameException(elementName, "DocType", reason);
+        }
+        this.elementName = elementName;
+        return this;
+    }
+
+    /**
+     * This will retrieve the public ID of an externally
+     * referenced DTD, or an empty <code>String</code> if
+     * none is referenced.
+     *
+     * @return <code>String</code> - public ID of referenced DTD.
+     */
+    public String getPublicID() {
+        return publicID;
+    }
+
+    /**
+     * This will set the public ID of an externally
+     * referenced DTD.
+     *
+     * @param publicID id to set
+     * @return DocType <code>DocType</code> this DocType object
+     * @throws IllegalDataException if the given public ID is not a legal
+     *         public ID.
+     */
+    public DocType setPublicID(String publicID) {
+        String reason = Verifier.checkPublicID(publicID);
+        if (reason != null) {
+            throw new IllegalDataException(publicID, "DocType", reason);
+        }
+        this.publicID = publicID;
+
+        return this;
+    }
+
+    /**
+     * This will retrieve the system ID of an externally
+     * referenced DTD, or an empty <code>String</code> if
+     * none is referenced.
+     *
+     * @return <code>String</code> - system ID of referenced DTD.
+     */
+    public String getSystemID() {
+        return systemID;
+    }
+
+    /**
+     * This will set the system ID of an externally
+     * referenced DTD.
+     *
+     * @param systemID id to set
+     * @return systemID <code>String</code> system ID of
+     *                  referenced DTD.
+     * @throws IllegalDataException if the given system ID is not a legal
+     *         system literal.
+     */
+    public DocType setSystemID(String systemID) {
+        String reason = Verifier.checkSystemLiteral(systemID);
+        if (reason != null) {
+            throw new IllegalDataException(systemID, "DocType", reason);
+        }
+        this.systemID = systemID;
+
+        return this;
+    }
+
+    /**
+     * Returns the empty string since doctypes don't have an XPath
+     * 1.0 string value.
+     * @return the empty string
+     */
+    public String getValue() {
+        return "";  // doctypes don't have an XPath string value
+    }
+
+    /**
+     * This sets the data for the internal subset.
+     *
+     * @param newData data for the internal subset, as a
+     *        <code>String</code>.
+     */
+    public void setInternalSubset(String newData) {
+        internalSubset = newData;
+    }
+
+    /**
+     * This returns the data for the internal subset.
+     *
+     * @return <code>String</code> - the internal subset
+     */
+    public String getInternalSubset() {
+        return internalSubset;
+    }
+
+    /**
+     * This returns a <code>String</code> representation of the
+     * <code>DocType</code>, suitable for debugging.
+     *
+     * @return <code>String</code> - information about the
+     *         <code>DocType</code>
+     */
+    public String toString() {
+        return new StringBuffer()
+            .append("[DocType: ")
+            .append(new org.jdom.output.XMLOutputter().outputString(this))
+            .append("]")
+            .toString();
+    }
+}

src/org/jdom/Document.java

@@ -0,0 +1,767 @@
+/*--
+
+ $Id: Document.java,v 1.85 2007/11/10 05:28:58 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+import java.util.*;
+import org.jdom.filter.*;
+
+/**
+ * An XML document. Methods allow access to the root element as well as the
+ * {@link DocType} and other document-level information.
+ *
+ * @version $Revision: 1.85 $, $Date: 2007/11/10 05:28:58 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ * @author  Jools Enticknap
+ * @author  Bradley S. Huffman
+ */
+public class Document implements Parent {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: Document.java,v $ $Revision: 1.85 $ $Date: 2007/11/10 05:28:58 $ $Name: jdom_1_1 $";
+
+    /**
+     * This document's content including comments, PIs, a possible
+     * DocType, and a root element.
+     * Subclassers have to track content using their own
+     * mechanism.
+     */
+    ContentList content = new ContentList(this);
+
+    /**
+     *  See http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/core.html#baseURIs-Considerations
+     */
+    protected String baseURI = null;
+
+    // Supports the setProperty/getProperty calls
+    private HashMap propertyMap = null;
+
+    /**
+     * Creates a new empty document.  A document must have a root element,
+     * so this document will not be well-formed and accessor methods will
+     * throw an IllegalStateException if this document is accessed before a
+     * root element is added.  This method is most useful for build tools.
+     */
+    public Document() {}
+
+    /**
+     * This will create a new <code>Document</code>,
+     * with the supplied <code>{@link Element}</code>
+     * as the root element, the supplied
+     * <code>{@link DocType}</code> declaration, and the specified
+     * base URI.
+     *
+     * @param rootElement <code>Element</code> for document root.
+     * @param docType <code>DocType</code> declaration.
+     * @param baseURI the URI from which this doucment was loaded.
+     * @throws IllegalAddException if the given docType object
+     *         is already attached to a document or the given
+     *         rootElement already has a parent
+     */
+    public Document(Element rootElement, DocType docType, String baseURI) {
+        if (rootElement != null) {
+            setRootElement(rootElement);
+        }
+        if (docType != null) {
+            setDocType(docType);
+        }
+        if (baseURI != null) {
+            setBaseURI(baseURI);
+        }
+    }
+
+    /**
+     * This will create a new <code>Document</code>,
+     * with the supplied <code>{@link Element}</code>
+     * as the root element and the supplied
+     * <code>{@link DocType}</code> declaration.
+     *
+     * @param rootElement <code>Element</code> for document root.
+     * @param docType <code>DocType</code> declaration.
+     * @throws IllegalAddException if the given DocType object
+     *         is already attached to a document or the given
+     *         rootElement already has a parent
+     */
+    public Document(Element rootElement, DocType docType) {
+        this(rootElement, docType, null);
+    }
+
+    /**
+     * This will create a new <code>Document</code>,
+     * with the supplied <code>{@link Element}</code>
+     * as the root element, and no <code>{@link DocType}</code>
+     * declaration.
+     *
+     * @param rootElement <code>Element</code> for document root
+     * @throws IllegalAddException if the given rootElement already has
+     *         a parent.
+     */
+    public Document(Element rootElement) {
+        this(rootElement, null, null);
+    }
+
+    /**
+     * This will create a new <code>Document</code>,
+     * with the supplied list of content, and a
+     * <code>{@link DocType}</code> declaration only if the content
+     * contains a DocType instance.  A null list is treated the
+     * same as the no-arg constructor.
+     *
+     * @param content <code>List</code> of starter content
+     * @throws IllegalAddException if the List contains more than
+     *         one Element or objects of illegal types.
+     */
+    public Document(List content) {
+        setContent(content);
+    }
+
+    public int getContentSize() {
+        return content.size();
+    }
+
+    public int indexOf(Content child) {
+        return content.indexOf(child);
+    }
+
+//    /**
+//     * Starting at the given index (inclusive), return the index of
+//     * the first child matching the supplied filter, or -1
+//     * if none is found.
+//     *
+//     * @return index of child, or -1 if none found.
+//     */
+//    private int indexOf(int start, Filter filter) {
+//        int size = getContentSize();
+//        for (int i = start; i < size; i++) {
+//            if (filter.matches(getContent(i))) {
+//                return i;
+//            }
+//        }
+//        return -1;
+//    }
+
+    /**
+     * This will return <code>true</code> if this document has a
+     * root element, <code>false</code> otherwise.
+     *
+     * @return <code>true</code> if this document has a root element,
+     *         <code>false</code> otherwise.
+     */
+    public boolean hasRootElement() {
+        return (content.indexOfFirstElement() < 0) ? false : true;
+    }
+
+    /**
+     * This will return the root <code>Element</code>
+     * for this <code>Document</code>
+     *
+     * @return <code>Element</code> - the document's root element
+     * @throws IllegalStateException if the root element hasn't been set
+     */
+    public Element getRootElement() {
+        int index = content.indexOfFirstElement();
+        if (index < 0) {
+            throw new IllegalStateException("Root element not set");
+        }
+        return (Element) content.get(index);
+    }
+
+    /**
+     * This sets the root <code>{@link Element}</code> for the
+     * <code>Document</code>. If the document already has a root
+     * element, it is replaced.
+     *
+     * @param rootElement <code>Element</code> to be new root.
+     * @return <code>Document</code> - modified Document.
+     * @throws IllegalAddException if the given rootElement already has
+     *         a parent.
+     */
+    public Document setRootElement(Element rootElement) {
+        int index = content.indexOfFirstElement();
+        if (index < 0) {
+            content.add(rootElement);
+        }
+        else {
+            content.set(index, rootElement);
+        }
+        return this;
+    }
+
+    /**
+     * Detach the root <code>{@link Element}</code> from this document.
+     *
+     * @return removed root <code>Element</code>
+     */
+    public Element detachRootElement() {
+        int index = content.indexOfFirstElement();
+        if (index < 0)
+            return null;
+        return (Element) removeContent(index);
+    }
+
+    /**
+     * This will return the <code>{@link DocType}</code>
+     * declaration for this <code>Document</code>, or
+     * <code>null</code> if none exists.
+     *
+     * @return <code>DocType</code> - the DOCTYPE declaration.
+     */
+    public DocType getDocType() {
+        int index = content.indexOfDocType();
+        if (index < 0) {
+            return null;
+        }
+        else {
+            return (DocType) content.get(index);
+        }
+    }
+
+    /**
+     * This will set the <code>{@link DocType}</code>
+     * declaration for this <code>Document</code>. Note
+     * that a DocType can only be attached to one Document.
+     * Attempting to set the DocType to a DocType object
+     * that already belongs to a Document will result in an
+     * IllegalAddException being thrown.
+     *
+     * @param docType <code>DocType</code> declaration.
+     * @return object on which the method was invoked
+     * @throws IllegalAddException if the given docType is
+     *   already attached to a Document.
+     */
+    public Document setDocType(DocType docType) {
+        if (docType == null) {
+            // Remove any existing doctype
+            int docTypeIndex = content.indexOfDocType();
+            if (docTypeIndex >= 0) content.remove(docTypeIndex);
+            return this;
+        }
+
+        if (docType.getParent() != null) {
+            throw new IllegalAddException(docType,
+                              "The DocType already is attached to a document");
+        }
+
+        // Add DocType to head if new, replace old otherwise
+        int docTypeIndex = content.indexOfDocType();
+        if (docTypeIndex < 0) {
+            content.add(0, docType);
+        }
+        else {
+            content.set(docTypeIndex, docType);
+        }
+
+        return this;
+    }
+
+    /**
+     * Appends the child to the end of the content list.
+     *
+     * @param child   child to append to end of content list
+     * @return        the document on which the method was called
+     * @throws IllegalAddException if the given child already has a parent.
+     */
+    public Document addContent(Content child) {
+        content.add(child);
+        return this;
+    }
+
+    /**
+     * Appends all children in the given collection to the end of
+     * the content list.  In event of an exception during add the
+     * original content will be unchanged and the objects in the supplied
+     * collection will be unaltered.
+     *
+     * @param c   collection to append
+     * @return    the document on which the method was called
+     * @throws IllegalAddException if any item in the collection
+     *         already has a parent or is of an illegal type.
+     */
+    public Document addContent(Collection c) {
+        content.addAll(c);
+        return this;
+    }
+
+    /**
+     * Inserts the child into the content list at the given index.
+     *
+     * @param index location for adding the collection
+     * @param child      child to insert
+     * @return           the parent on which the method was called
+     * @throws IndexOutOfBoundsException if index is negative or beyond
+     *         the current number of children
+     * @throws IllegalAddException if the given child already has a parent.
+     */
+    public Document addContent(int index, Content child) {
+        content.add(index, child);
+        return this;
+    }
+
+    /**
+     * Inserts the content in a collection into the content list
+     * at the given index.  In event of an exception the original content
+     * will be unchanged and the objects in the supplied collection will be
+     * unaltered.
+     *
+     * @param index location for adding the collection
+     * @param c  collection to insert
+     * @return            the parent on which the method was called
+     * @throws IndexOutOfBoundsException if index is negative or beyond
+     *         the current number of children
+     * @throws IllegalAddException if any item in the collection
+     *         already has a parent or is of an illegal type.
+     */
+    public Document addContent(int index, Collection c) {
+        content.addAll(index, c);
+        return this;
+    }
+
+    public List cloneContent() {
+        int size = getContentSize();
+        List list = new ArrayList(size);
+        for (int i = 0; i < size; i++) {
+            Content child = getContent(i);
+            list.add(child.clone());
+        }
+        return list;
+    }
+
+    public Content getContent(int index) {
+        return (Content) content.get(index);
+    }
+
+//    public Content getChild(Filter filter) {
+//        int i = indexOf(0, filter);
+//        return (i < 0) ? null : getContent(i);
+//    }
+
+    /**
+     * This will return all content for the <code>Document</code>.
+     * The returned list is "live" in document order and changes to it
+     * affect the document's actual content.
+     *
+     * <p>
+     * Sequential traversal through the List is best done with a Iterator
+     * since the underlying implement of List.size() may require walking the
+     * entire list.
+     * </p>
+     *
+     * @return <code>List</code> - all Document content
+     * @throws IllegalStateException if the root element hasn't been set
+     */
+    public List getContent() {
+        if (!hasRootElement())
+            throw new IllegalStateException("Root element not set");
+        return content;
+    }
+
+    /**
+     * Return a filtered view of this <code>Document</code>'s content.
+     *
+     * <p>
+     * Sequential traversal through the List is best done with a Iterator
+     * since the underlying implement of List.size() may require walking the
+     * entire list.
+     * </p>
+     *
+     * @param filter <code>Filter</code> to apply
+     * @return <code>List</code> - filtered Document content
+     * @throws IllegalStateException if the root element hasn't been set
+     */
+    public List getContent(Filter filter) {
+        if (!hasRootElement())
+            throw new IllegalStateException("Root element not set");
+        return content.getView(filter);
+    }
+
+    /**
+     * Removes all child content from this parent.
+     *
+     * @return list of the old children detached from this parent
+     */
+    public List removeContent() {
+        List old = new ArrayList(content);
+        content.clear();
+        return old;
+    }
+
+    /**
+     * Remove all child content from this parent matching the supplied filter.
+     *
+     * @param filter filter to select which content to remove
+     * @return list of the old children detached from this parent
+     */
+    public List removeContent(Filter filter) {
+        List old = new ArrayList();
+        Iterator itr = content.getView(filter).iterator();
+        while (itr.hasNext()) {
+            Content child = (Content) itr.next();
+            old.add(child);
+            itr.remove();
+        }
+        return old;
+    }
+
+    /**
+     * This sets the content of the <code>Document</code>.  The supplied
+     * List should contain only objects of type <code>Element</code>,
+     * <code>Comment</code>, and <code>ProcessingInstruction</code>.
+     *
+     * <p>
+     * When all objects in the supplied List are legal and before the new
+     * content is added, all objects in the old content will have their
+     * parentage set to null (no parent) and the old content list will be
+     * cleared. This has the effect that any active list (previously obtained
+     * with a call to {@link #getContent}) will also
+     * change to reflect the new content.  In addition, all objects in the
+     * supplied List will have their parentage set to this document, but the
+     * List itself will not be "live" and further removals and additions will
+     * have no effect on this document content. If the user wants to continue
+     * working with a "live" list, then a call to setContent should be
+     * followed by a call to {@link #getContent} to
+     * obtain a "live" version of the content.
+     * </p>
+     *
+     * <p>
+     * Passing a null or empty List clears the existing content.
+     * </p>
+     *
+     * <p>
+     * In event of an exception the original content will be unchanged and
+     * the objects in the supplied content will be unaltered.
+     * </p>
+     *
+     * @param newContent <code>List</code> of content to set
+     * @return this document modified
+     * @throws IllegalAddException if the List contains objects of
+     *         illegal types or with existing parentage.
+     */
+    public Document setContent(Collection newContent) {
+        content.clearAndSet(newContent);
+        return this;
+    }
+
+    /**
+     *
+     * <p>
+     * Sets the effective URI from which this document was loaded,
+     * and against which relative URLs in this document will be resolved.
+     * </p>
+     *
+     * @param uri the base URI of this document
+     */
+    public final void setBaseURI(String uri) {
+        this.baseURI = uri;  // XXX We don't check the URI
+    }
+
+    /**
+     * <p>
+     *   Returns the URI from which this document was loaded,
+     *   or null if this is not known.
+     * </p>
+     *
+     * @return the base URI of this document
+     */
+    public final String getBaseURI() {
+        return baseURI;
+    }
+
+    /*
+     * Replace the current child the given index with the supplied child.
+     * <p>
+     * In event of an exception the original content will be unchanged and
+     * the supplied child will be unaltered.
+     * </p>
+     *
+     * @param index - index of child to replace.
+     * @param child - child to add.
+     * @throws IllegalAddException if the supplied child is already attached
+     *                             or not legal content for this parent.
+     * @throws IndexOutOfBoundsException if index is negative or greater
+     *         than the current number of children.
+     */
+    public Document setContent(int index, Content child) {
+        content.set(index, child);
+        return this;
+    }
+
+    /**
+     * Replace the child at the given index whith the supplied
+     * collection.
+     * <p>
+     * In event of an exception the original content will be unchanged and
+     * the content in the supplied collection will be unaltered.
+     * </p>
+     *
+     * @param index - index of child to replace.
+     * @param collection - collection of content to add.
+     * @return object on which the method was invoked
+     * @throws IllegalAddException if the collection contains objects of
+     *         illegal types.
+     * @throws IndexOutOfBoundsException if index is negative or greater
+     *         than the current number of children.
+     */
+    public Document setContent(int index, Collection collection) {
+        content.remove(index);
+        content.addAll(index, collection);
+        return this;
+    }
+
+    public boolean removeContent(Content child) {
+        return content.remove(child);
+    }
+
+    public Content removeContent(int index) {
+        return (Content) content.remove(index);
+    }
+
+    /**
+     * Set this document's content to be the supplied child.
+     * <p>
+     * If the supplied child is legal content for a Document and before
+     * it is added, all content in the current content list will
+     * be cleared and all current children will have their parentage set to
+     * null.
+     * <p>
+     * This has the effect that any active list (previously obtained with
+     * a call to one of the {@link #getContent} methods will also change
+     * to reflect the new content.  In addition, all content in the supplied
+     * collection will have their parentage set to this Document.  If the user
+     * wants to continue working with a <b>"live"</b> list of this Document's
+     * child, then a call to setContent should be followed by a call to one
+     * of the {@link #getContent} methods to obtain a <b>"live"</b>
+     * version of the children.
+     * <p>
+     * Passing a null child clears the existing content.
+     * <p>
+     * In event of an exception the original content will be unchanged and
+     * the supplied child will be unaltered.
+     *
+     * @param child new content to replace existing content
+     * @return           the parent on which the method was called
+     * @throws IllegalAddException if the supplied child is already attached
+     *                             or not legal content for this parent
+     */
+    public Document setContent(Content child) {
+        content.clear();
+        content.add(child);
+        return this;
+    }
+
+    /**
+     * This returns a <code>String</code> representation of the
+     * <code>Document</code>, suitable for debugging. If the XML
+     * representation of the <code>Document</code> is desired,
+     * {@link org.jdom.output.XMLOutputter#outputString(Document)}
+     * should be used.
+     *
+     * @return <code>String</code> - information about the
+     *         <code>Document</code>
+     */
+    public String toString() {
+        StringBuffer stringForm = new StringBuffer()
+            .append("[Document: ");
+
+        DocType docType = getDocType();
+        if (docType != null) {
+            stringForm.append(docType.toString())
+                      .append(", ");
+        } else {
+            stringForm.append(" No DOCTYPE declaration, ");
+        }
+
+        Element rootElement = getRootElement();
+        if (rootElement != null) {
+            stringForm.append("Root is ")
+                      .append(rootElement.toString());
+        } else {
+            stringForm.append(" No root element"); // shouldn't happen
+        }
+
+        stringForm.append("]");
+
+        return stringForm.toString();
+    }
+
+    /**
+     * This tests for equality of this <code>Document</code> to the supplied
+     * <code>Object</code>.
+     *
+     * @param ob <code>Object</code> to compare to
+     * @return <code>boolean</code> whether the <code>Document</code> is
+     *         equal to the supplied <code>Object</code>
+     */
+    public final boolean equals(Object ob) {
+        return (ob == this);
+    }
+
+    /**
+     * This returns the hash code for this <code>Document</code>.
+     *
+     * @return <code>int</code> hash code
+     */
+    public final int hashCode() {
+        return super.hashCode();
+    }
+
+    /**
+     * This will return a deep clone of this <code>Document</code>.
+     *
+     * @return <code>Object</code> clone of this <code>Document</code>
+     */
+    public Object clone() {
+        Document doc = null;
+
+        try {
+            doc = (Document) super.clone();
+        } catch (CloneNotSupportedException ce) {
+            // Can't happen
+        }
+
+        // The clone has a reference to this object's content list, so
+        // owerwrite with a empty list
+        doc.content = new ContentList(doc);
+
+        // Add the cloned content to clone
+
+        for (int i = 0; i < content.size(); i++) {
+            Object obj = content.get(i);
+            if (obj instanceof Element) {
+                Element element = (Element)((Element)obj).clone();
+                doc.content.add(element);
+            }
+            else if (obj instanceof Comment) {
+                Comment comment = (Comment)((Comment)obj).clone();
+                doc.content.add(comment);
+            }
+            else if (obj instanceof ProcessingInstruction) {
+                ProcessingInstruction pi = (ProcessingInstruction)
+                           ((ProcessingInstruction)obj).clone();
+                doc.content.add(pi);
+            }
+            else if (obj instanceof DocType) {
+                DocType dt = (DocType) ((DocType)obj).clone();
+                doc.content.add(dt);
+            }
+        }
+
+        return doc;
+    }
+
+    /**
+     * Returns an iterator that walks over all descendants in document order.
+     *
+     * @return an iterator to walk descendants
+     */
+    public Iterator getDescendants() {
+        return new DescendantIterator(this);
+    }
+
+    /**
+     * Returns an iterator that walks over all descendants in document order
+     * applying the Filter to return only elements that match the filter rule.
+     * With filters you can match only Elements, only Comments, Elements or
+     * Comments, only Elements with a given name and/or prefix, and so on.
+     *
+     * @param filter filter to select which descendants to see
+     * @return an iterator to walk descendants within a filter
+     */
+    public Iterator getDescendants(Filter filter) {
+        return new FilterIterator(new DescendantIterator(this), filter);
+    }
+
+    public Parent getParent() {
+        return null;  // documents never have parents
+    }
+
+
+
+    /**
+     * @see org.jdom.Parent#getDocument()
+     */
+    public Document getDocument() {
+        return this;
+    }
+
+    /**
+     * Assigns an arbitrary object to be associated with this document under
+     * the given "id" string.  Null values are permitted.  Strings beginning
+     * with "http://www.jdom.org/ are reserved for JDOM use.
+     *
+     * @param id     the id of the stored object
+     * @param value  the object to store
+     */
+    public void setProperty(String id, Object value) {
+        if (propertyMap == null) {
+            propertyMap = new HashMap();
+        }
+        propertyMap.put(id, value);
+    }
+
+    /**
+     * Returns the object associated with this document under the given "id"
+     * string, or null if there is no binding or if the binding explicitly
+     * stored a null value.
+     *
+     * @param id   the id of the stored object to return
+     * @return     the object associated with the given id
+     */
+    public Object getProperty(String id) {
+        if (propertyMap == null) return null;
+        return propertyMap.get(id);
+    }
+}

src/org/jdom/EntityRef.java

@@ -0,0 +1,239 @@
+/*--
+
+ $Id: EntityRef.java,v 1.22 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+/**
+ * An XML entity reference. Methods allow the user to manage its name, public
+ * id, and system id.
+ *
+ * @version $Revision: 1.22 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ * @author  Philip Nelson
+ */
+public class EntityRef extends Content {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: EntityRef.java,v $ $Revision: 1.22 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /** The name of the <code>EntityRef</code> */
+    protected String name;
+
+    /** The PublicID of the <code>EntityRef</code> */
+    protected String publicID;
+
+    /** The SystemID of the <code>EntityRef</code> */
+    protected String systemID;
+
+    /**
+     * Default, no-args constructor for implementations to use if needed.
+     */
+    protected EntityRef() {}
+
+    /**
+     * This will create a new <code>EntityRef</code> with the supplied name.
+     *
+     * @param name <code>String</code> name of element.
+     * @throws IllegalNameException if the given name is not a legal
+     *         XML name.
+     */
+    public EntityRef(String name) {
+        this(name, null, null);
+    }
+
+    /**
+     * This will create a new <code>EntityRef</code>
+     * with the supplied name and system id.
+     *
+     * @param name <code>String</code> name of element.
+     * @param systemID system id of the entity reference being constructed
+     * @throws IllegalNameException if the given name is not a legal
+     *         XML name.
+     * @throws IllegalDataException if the given system ID is not a legal
+     *         system literal.
+     */
+    public EntityRef(String name, String systemID) {
+        this(name, null, systemID);
+    }
+
+    /**
+     * This will create a new <code>EntityRef</code>
+     * with the supplied name, public id, and system id.
+     *
+     * @param name <code>String</code> name of element.
+     * @param publicID public id of the entity reference being constructed
+     * @param systemID system id of the entity reference being constructed
+     * @throws IllegalDataException if the given system ID is not a legal
+     *         system literal or the the given public ID is not a
+     *         legal public ID
+     * @throws IllegalNameException if the given name is not a legal
+     *         XML name.
+     */
+    public EntityRef(String name, String publicID, String systemID) {
+        setName(name);
+        setPublicID(publicID);
+        setSystemID(systemID);
+    }
+
+    /**
+     * This returns the name of the <code>EntityRef</code>.
+     *
+     * @return <code>String</code> - entity name.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Returns the empty string since entity references don't have an XPath
+     * 1.0 string value.
+     * @return the empty string
+     */
+    public String getValue() {
+        return "";  // entity references don't have XPath string values
+    }
+
+    /**
+     * This will return the publid ID of this <code>EntityRef</code>.
+     * If there is no public ID, then this returns <code>null</code>.
+     *
+     * @return public ID of this <code>EntityRef</code>
+     */
+    public String getPublicID() {
+        return publicID;
+    }
+
+    /**
+     * This will return the system ID of this <code>EntityRef</code>.
+     * If there is no system ID, then this returns <code>null</code>.
+     *
+     * @return system ID of this <code>EntityRef</code>
+     */
+    public String getSystemID() {
+        return systemID;
+    }
+
+    /**
+     * This will set the name of this <code>EntityRef</code>.
+     *
+     * @param name new name of the entity
+     * @return this <code>EntityRef</code> modified.
+     * @throws IllegalNameException if the given name is not a legal
+     *         XML name.
+     */
+    public EntityRef setName(String name) {
+        // This can contain a colon so we use checkXMLName()
+        // instead of checkElementName()
+        String reason = Verifier.checkXMLName(name);
+        if (reason != null) {
+            throw new IllegalNameException(name, "EntityRef", reason);
+        }
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * This will set the public ID of this <code>EntityRef</code>.
+     *
+     * @param publicID new public id
+     * @return this <code>EntityRef</code> modified.
+     * @throws IllegalDataException if the given public ID is not a legal
+     *         public ID.
+     */
+    public EntityRef setPublicID(String publicID) {
+        String reason = Verifier.checkPublicID(publicID);
+        if (reason != null) {
+            throw new IllegalDataException(publicID, "EntityRef", reason);
+        }
+        this.publicID = publicID;
+        return this;
+    }
+
+    /**
+     * This will set the system ID of this <code>EntityRef</code>.
+     *
+     * @param systemID new system id
+     * @throws IllegalDataException if the given system ID is not a legal
+     *         system literal.
+     * @return this <code>EntityRef</code> modified.
+     */
+    public EntityRef setSystemID(String systemID) {
+        String reason = Verifier.checkSystemLiteral(systemID);
+        if (reason != null) {
+            throw new IllegalDataException(systemID, "EntityRef", reason);
+        }
+        this.systemID = systemID;
+        return this;
+    }
+
+    /**
+     * This returns a <code>String</code> representation of the
+     * <code>EntityRef</code>, suitable for debugging.
+     *
+     * @return <code>String</code> - information about the
+     *         <code>EntityRef</code>
+     */
+    public String toString() {
+        return new StringBuffer()
+            .append("[EntityRef: ")
+            .append("&")
+            .append(name)
+            .append(";")
+            .append("]")
+            .toString();
+    }
+}

src/org/jdom/FilterIterator.java

@@ -0,0 +1,115 @@
+/*--
+
+ $Id: FilterIterator.java,v 1.6 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+import java.util.*;
+import org.jdom.filter.*;
+
+/**
+ * Traverse a parent's children that match the supplied filter.
+ *
+ * @author Bradley S. Huffman
+ * @version $Revision: 1.6 $, $Date: 2007/11/10 05:28:59 $
+ */
+class FilterIterator implements Iterator {
+
+    private Iterator iterator;
+    private Filter filter;
+    private Object nextObject;
+
+    private static final String CVS_ID =
+            "@(#) $RCSfile: FilterIterator.java,v $ $Revision: 1.6 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    public FilterIterator(Iterator iterator, Filter filter) {
+        if ((iterator == null) || (filter == null)) {
+            throw new IllegalArgumentException("null parameter");
+        }
+        this.iterator = iterator;
+        this.filter = filter;
+    }
+
+    public boolean hasNext() {
+        if (nextObject != null) {
+            return true;
+        }
+
+        while (iterator.hasNext()) {
+            Object obj = iterator.next();
+            if (filter.matches(obj)) {
+                nextObject = obj;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public Object next() {
+        if (!hasNext()) {
+            throw new NoSuchElementException();
+        }
+
+        Object obj = nextObject;
+        nextObject = null;
+        return obj;
+    }
+
+    public void remove() {
+        // XXX Could cause probs for sure if hasNext() is
+        // called before the remove(), although that's unlikely.
+        iterator.remove();
+    }
+}

src/org/jdom/IllegalAddException.java

@@ -0,0 +1,323 @@
+/*-- 
+
+ $Id: IllegalAddException.java,v 1.26 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom;
+
+/**
+ * Thrown when trying to add a illegal object to a JDOM construct.
+ *
+ * @version $Revision: 1.26 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ */
+public class IllegalAddException extends IllegalArgumentException {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: IllegalAddException.java,v $ $Revision: 1.26 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the addition of the <code>{@link Attribute}</code>
+     * to the <code>{@link Element}</code> is illegal.
+     *
+     * @param base <code>Element</code> that <code>Attribute</code>
+     *        couldn't be added to
+     * @param added <code>Attribute</code> that could not be added
+     * @param reason cause of the problem
+     */
+    IllegalAddException(Element base, Attribute added, String reason) {
+        super(new StringBuffer()
+              .append("The attribute \"")
+              .append(added.getQualifiedName())
+              .append("\" could not be added to the element \"")
+              .append(base.getQualifiedName())
+              .append("\": ")
+              .append(reason)
+              .toString());
+    }
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the addition of the <code>{@link Element}</code>
+     * to parent is illegal.
+     *
+     * @param base <code>Element</code> that the child
+     *        couldn't be added to
+     * @param added <code>Element</code> that could not be added
+     * @param reason cause of the problem
+     */
+    IllegalAddException(Element base, Element added, String reason) {
+        super(new StringBuffer()
+              .append("The element \"")
+              .append(added.getQualifiedName())
+              .append("\" could not be added as a child of \"")
+              .append(base.getQualifiedName())
+              .append("\": ")
+              .append(reason)
+              .toString());
+    }
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the addition of the <code>{@link Element}</code>
+     * to the <code>{@link Document}</code> is illegal.
+     *
+     * @param added <code>Element</code> that could not be added
+     * @param reason cause of the problem
+     */
+    IllegalAddException(Element added, String reason) {
+        super(new StringBuffer()
+              .append("The element \"")
+              .append(added.getQualifiedName())
+              .append("\" could not be added as the root of the document: ")
+              .append(reason)
+              .toString());
+    }
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the addition of the <code>{@link ProcessingInstruction}</code>
+     * to the <code>{@link Element}</code> is illegal.
+     *
+     * @param base <code>Element</code> that the
+     *              <code>ProcessingInstruction</code> couldn't be added to
+     * @param added <code>ProcessingInstruction</code> that could not be added
+     * @param reason cause of the problem
+     */
+    IllegalAddException(Element base, ProcessingInstruction added,
+                               String reason) {
+        super(new StringBuffer()
+              .append("The PI \"")
+              .append(added.getTarget())
+              .append("\" could not be added as content to \"")
+              .append(base.getQualifiedName())
+              .append("\": ")
+              .append(reason)
+              .toString());
+    }
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the addition of the <code>{@link ProcessingInstruction}</code>
+     * to the <code>{@link Document}</code> is illegal.
+     *
+     * @param added <code>ProcessingInstruction</code> that could not be added
+     * @param reason cause of the problem
+     */
+    IllegalAddException(ProcessingInstruction added,
+                               String reason) {
+        super(new StringBuffer()
+              .append("The PI \"")
+              .append(added.getTarget())
+              .append("\" could not be added to the top level of the document: ")
+              .append(reason)
+              .toString());
+    }
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the addition of the <code>{@link Comment}</code>
+     * to the <code>{@link Element}</code> is illegal.
+     *
+     * @param base <code>Element</code> that the <code>Comment</code>
+     *             couldn't be added to
+     * @param added <code>Comment</code> that could not be added
+     * @param reason cause of the problem
+     */
+    IllegalAddException(Element base, Comment added, String reason) {
+        super(new StringBuffer()
+              .append("The comment \"")
+              .append(added.getText())
+              .append("\" could not be added as content to \"")
+              .append(base.getQualifiedName())
+              .append("\": ")
+              .append(reason)
+              .toString());
+    }
+
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the addition of the <code>{@link CDATA}</code>
+     *
+     * @param base <code>Element</code> that the <code>CDATA</code>
+     *             couldn't be added to
+     * @param added <code>CDATA</code> that could not be added
+     * @param reason cause of the problem
+     */
+    IllegalAddException(Element base, CDATA added, String reason) {
+        super(new StringBuffer()
+              .append("The CDATA \"")
+              .append(added.getText())
+              .append("\" could not be added as content to \"")
+              .append(base.getQualifiedName())
+              .append("\": ")
+              .append(reason)
+              .toString());
+    }
+
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the addition of the <code>{@link Text}</code>
+     * to the <code>{@link Element}</code> is illegal.
+     *
+     * @param base <code>Element</code> that the <code>Comment</code>
+     *             couldn't be added to
+     * @param added <code>Text</code> that could not be added
+     * @param reason cause of the problem
+     */
+    IllegalAddException(Element base, Text added, String reason) {
+        super(new StringBuffer()
+              .append("The Text \"")
+              .append(added.getText())
+              .append("\" could not be added as content to \"")
+              .append(base.getQualifiedName())
+              .append("\": ")
+              .append(reason)
+              .toString());
+    }
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the addition of the <code>{@link Comment}</code>
+     * to the <code>{@link Document}</code> is illegal.
+     *
+     * @param added <code>Comment</code> that could not be added
+     * @param reason cause of the problem
+     */
+    IllegalAddException(Comment added, String reason) {
+        super(new StringBuffer()
+              .append("The comment \"")
+              .append(added.getText())
+              .append("\" could not be added to the top level of the document: ")
+              .append(reason)
+              .toString());
+    }
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the addition of the <code>{@link EntityRef}</code>
+     * to the <code>{@link Element}</code> is illegal.
+     *
+     * @param base <code>Element</code> that the <code>EntityRef</code>
+     *             couldn't be added to
+     * @param added <code>EntityRef</code> reference that could not be added
+     * @param reason cause of the problem
+     */
+    IllegalAddException(Element base, EntityRef added, String reason) {
+        super(new StringBuffer()
+              .append("The entity reference\"")
+              .append(added.getName())
+              .append("\" could not be added as content to \"")
+              .append(base.getQualifiedName())
+              .append("\": ")
+              .append(reason)
+              .toString());
+    }
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the addition of the <code>{@link Namespace}</code>
+     * to the <code>{@link Element}</code> is illegal.
+     *
+     * @param base <code>Element</code> that the <code>Namespace</code>
+     *             couldn't be added to
+     * @param added <code>Namespace</code> that could not be added
+     * @param reason cause of the problem
+     */
+    IllegalAddException(Element base, Namespace added, String reason) {
+        super(new StringBuffer()
+              .append("The namespace xmlns")
+              .append((added.getPrefix() == null ||
+                       added.getPrefix().equals("")) ? "=" 
+                                   : ":" + added.getPrefix() + "=")
+              .append("\"")
+              .append(added.getURI())
+              .append("\" could not be added as a namespace to \"")
+              .append(base.getQualifiedName())
+              .append("\": ")
+              .append(reason)
+              .toString());
+    }
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the addition of the <code>{@link DocType}</code>
+     * to the <code>{@link Document}</code> is illegal.
+     *
+     * @param added <code>DocType</code> that could not be added
+     * @param reason cause of the problem
+     */
+    IllegalAddException(DocType added, String reason) {
+        super(new StringBuffer()
+              .append("The DOCTYPE ")
+              .append(added.toString())
+              .append(" could not be added to the document: ")
+              .append(reason)
+              .toString());
+    }
+
+    /**
+     * This will create an <code>Exception</code> with the specified
+     * error message.
+     *
+     * @param reason cause of the problem
+     */
+    public IllegalAddException(String reason) {
+        super(reason);
+    }
+}

src/org/jdom/IllegalDataException.java

@@ -0,0 +1,118 @@
+/*-- 
+
+ $Id: IllegalDataException.java,v 1.14 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom;
+
+/**
+ * Thrown when illegal text is supplied to a JDOM construct.
+ *
+ * @version $Revision: 1.14 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Elliotte Rusty Harold
+ */
+public class IllegalDataException extends IllegalArgumentException {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: IllegalDataException.java,v $ $Revision: 1.14 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the specified data is illegal for the construct
+     * it was supplied to.
+     *
+     * @param data <code>String</code> data that breaks rules.
+     * @param construct <code>String</code> construct that data is illegal for.
+     * @param reason <code>String</code> message or reason data is illegal.
+     */
+    IllegalDataException(String data, String construct, String reason) {
+        super(new StringBuffer()
+              .append("The data \"")
+              .append(data)
+              .append("\" is not legal for a JDOM ")
+              .append(construct)
+              .append(": ")
+              .append(reason)
+              .append(".")
+              .toString());
+    }
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the specified data is illegal for the construct
+     * it was supplied to.
+     *
+     * @param data <code>String</code> data that breaks rules.
+     * @param construct <code>String</code> construct that data is illegal for.
+     */
+    IllegalDataException(String data, String construct) {
+        super(new StringBuffer()
+              .append("The data \"")
+              .append(data)
+              .append("\" is not legal for a JDOM ")
+              .append(construct)
+              .append(".")
+              .toString());
+    }
+
+    /**
+     * This will create an exceptoin with the specified error message.
+     *
+     * @param reason cause of the problem
+     */
+    public IllegalDataException(String reason) {
+        super(reason);
+    }
+}

src/org/jdom/IllegalNameException.java

@@ -0,0 +1,121 @@
+/*-- 
+
+ $Id: IllegalNameException.java,v 1.14 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom;
+
+/**
+ * Thrown when a name is supplied in construction of a JDOM construct whose
+ * where the name breaks XML naming conventions.
+ * 
+ * @version $Revision: 1.14 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Elliotte Rusty Harold
+ */
+public class IllegalNameException extends IllegalArgumentException {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: IllegalNameException.java,v $ $Revision: 1.14 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the specified name is illegal for the construct
+     * it was supplied to.
+     *
+     * @param name <code>String</code> name that breaks rules.
+     * @param construct <code>String</code> name of JDOM construct
+     *        that <code>name</code> was supplied to.
+     * @param reason <code>String</code> message or reason name is illegal.
+     */
+    IllegalNameException(String name, String construct, String reason) {
+        super(new StringBuffer()
+              .append("The name \"")
+              .append(name)
+              .append("\" is not legal for JDOM/XML ")
+              .append(construct)
+              .append("s: ")
+              .append(reason)
+              .append(".")
+              .toString());
+    }
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the specified name is illegal for the construct
+     * it was supplied to.
+     *
+     * @param name <code>String</code> name that breaks rules.
+     * @param construct <code>String</code> name of JDOM construct
+     *        that <code>name</code> was supplied to.
+     */
+    IllegalNameException(String name, String construct) {
+        super(new StringBuffer()
+              .append("The name \"")
+              .append(name)
+              .append("\" is not legal for JDOM/XML ")
+              .append(construct)
+              .append("s.")
+              .toString());
+    }
+
+    /**
+     * Creates an exception with the specified error message.
+     *
+     * @param reason cause of the problem
+     */
+    public IllegalNameException(String reason) {
+        super(reason);
+    }
+}

src/org/jdom/IllegalTargetException.java

@@ -0,0 +1,97 @@
+/*-- 
+
+ $Id: IllegalTargetException.java,v 1.15 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom;
+
+/**
+ * Thrown when a target is supplied in construction of a JDOM {@link
+ * ProcessingInstruction}, and that name breaks XML naming conventions.
+ * 
+ * @version $Revision: 1.15 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ */
+public class IllegalTargetException extends IllegalArgumentException {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: IllegalTargetException.java,v $ $Revision: 1.15 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /**
+     * This will create an <code>Exception</code> indicating
+     * that the specified target is illegal for the
+     * <code>{@link ProcessingInstruction}</code> it was supplied to.
+     *
+     * @param target <code>String</code> target that breaks rules.
+     * @param reason <code>String</code> message or reason target is illegal.
+     */
+    IllegalTargetException(String target, String reason) {
+        super(new StringBuffer()
+              .append("The target \"")
+              .append(target)
+              .append("\" is not legal for JDOM/XML Processing Instructions: ")
+              .append(reason)
+              .append(".")
+              .toString());
+    }
+
+    /**
+     * Creates an exception with the specified error message.
+     *
+     * @param reason cause of the problem
+     */
+    public IllegalTargetException(String reason) {
+        super(reason);
+    }
+}

src/org/jdom/JDOMException.java

@@ -0,0 +1,339 @@
+/*-- 
+
+ $Id: JDOMException.java,v 1.24 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.rmi.*;
+import java.sql.*;
+
+import org.xml.sax.*;
+
+/**
+ * The top level exception that JDOM classes can throw. Its subclasses add
+ * specificity to the problems that can occur using JDOM. This single exception
+ * can be caught to handle all JDOM specific problems (some methods may throw
+ * {@link java.io.IOException} and such).
+ *
+ * @version $Revision: 1.24 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ */
+public class JDOMException extends Exception {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: JDOMException.java,v $ $Revision: 1.24 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /** A wrapped <code>Throwable</code> */
+    private Throwable cause;
+
+    /**
+     * This will create an <code>Exception</code>.
+     */
+    public JDOMException() {
+        super("Error occurred in JDOM application.");
+    }
+
+    /**
+     * This will create an <code>Exception</code> with the given message.
+     *
+     * @param message <code>String</code> message indicating
+     *                the problem that occurred.
+     */    
+    public JDOMException(String message)  {
+        super(message);
+    }
+
+    /**
+     * This will create an <code>Exception</code> with the given message
+     * and wrap another <code>Exception</code>.  This is useful when
+     * the originating <code>Exception</code> should be held on to.
+     *
+     * @param message <code>String</code> message indicating
+     *                the problem that occurred.
+     * @param cause <code>Throwable</code> that caused this
+     *                  to be thrown.
+     */    
+    public JDOMException(String message, Throwable cause)  {
+        super(message);    
+        this.cause = cause;
+    }    
+
+    /** 
+     * Intializes the cause of this exception to be the specified value.
+     *
+     * @param cause <code>Throwable</code> that caused this
+     *                  to be thrown.
+     * @return a pointer to this throwable
+     */
+    // Created to match the JDK 1.4 Throwable method.
+    public Throwable initCause(Throwable cause)  {
+        this.cause = cause;
+        return this;
+    }    
+
+    /**
+     * This returns the message for the <code>Exception</code>. If
+     * there are one or more nested exceptions, their messages
+     * are appended.
+     *
+     * @return <code>String</code> - message for <code>Exception</code>.
+     */
+    public String getMessage() {
+        // Get this exception's message.
+        String msg = super.getMessage();
+
+        Throwable parent = this;
+        Throwable child;
+        
+        // Look for nested exceptions.
+        while((child = getNestedException(parent)) != null) {
+            // Get the child's message.
+            String msg2 = child.getMessage();
+            
+            // Special case: If a SAXException has no message of its own, but has a 
+            // nested exception, then it returns the nested exception's message as its
+            // message. We don't want to add that message twice.
+            if (child instanceof SAXException) {
+                Throwable grandchild = ((SAXException)child).getException();
+                // If the SAXException tells us that it's message is identical to 
+                // its nested exception's message, then we skip it, so we don't
+                // add it twice.
+                if (grandchild != null && msg2 != null && msg2.equals(grandchild.getMessage())) {
+                    msg2 = null;
+                }
+            }
+
+            // If we found a message for the child exception, we append it.
+            if (msg2 != null) {
+                if (msg != null) {
+                    msg += ": " + msg2;
+                } else {
+                    msg = msg2;
+                }
+            }
+
+            // Any nested JDOMException will append its own children,
+            // so we need to break out of here.
+            if (child instanceof JDOMException) {
+                break;
+            }
+            parent = child;
+        }
+
+        // Return the completed message.
+        return msg;
+    }
+
+    /**
+     * This prints the stack trace of the <code>Exception</code>. If
+     * there is a root cause, the stack trace of the root
+     * <code>Exception</code> is printed right after.
+     */
+    public void printStackTrace() {
+        // Print the stack trace for this exception.
+        super.printStackTrace();
+
+        Throwable parent = this;
+        Throwable child;
+
+        // Print the stack trace for each nested exception.
+        while((child = getNestedException(parent)) != null) {
+            System.err.print("Caused by: ");
+            child.printStackTrace();
+            // Any nested JDOMException will print its own children,
+            // so we need to break out of here.
+            if (child instanceof JDOMException) {
+                break;
+            }
+            parent = child;
+        }
+    }
+
+    /**
+     * Prints the stack trace of the <code>Exception</code> to the given
+     * PrintStream. If there is a root cause, the stack trace of the root
+     * <code>Exception</code> is printed right after.
+     *
+     * @param s PrintStream to print to
+     */
+    public void printStackTrace(PrintStream s) {
+        // Print the stack trace for this exception.
+        super.printStackTrace(s);
+
+        Throwable parent = this;
+        Throwable child;
+
+        // Print the stack trace for each nested exception.
+        while((child = getNestedException(parent)) != null) {
+            s.print("Caused by: ");
+            child.printStackTrace(s);
+            // Any nested JDOMException will print its own children,
+            // so we need to break out of here.
+            if (child instanceof JDOMException) {
+                break;
+            }
+            parent = child;
+        }
+    }
+
+    /**
+     * Prints the stack trace of the <code>Exception</code> to the given
+     * PrintWriter. If there is a root cause, the stack trace of the root
+     * <code>Exception</code> is printed right after.
+     *
+     * @param w PrintWriter to print to
+     */
+    public void printStackTrace(PrintWriter w) {
+        // Print the stack trace for this exception.
+        super.printStackTrace(w);
+
+        Throwable parent = this;
+        Throwable child;
+
+        // Print the stack trace for each nested exception.
+        while((child = getNestedException(parent)) != null) {
+            w.print("Caused by: ");
+            child.printStackTrace(w);
+            // Any nested JDOMException will print its own children,
+            // so we need to break out of here.
+            if (child instanceof JDOMException) {
+                break;
+            }
+            parent = child;
+        }
+    }
+
+    /**
+     * This will return the root cause <code>Throwable</code>, or null
+     * if one does not exist.
+     * 
+     * @return <code>Throwable</code> - the wrapped <code>Throwable</code>.
+     */
+    public Throwable getCause()  {
+        return cause;             
+    }
+
+    // If this Throwable has a nested (child) exception, then we return it.
+    // Otherwise we return null.
+    private static Throwable getNestedException(Throwable parent) {
+        if (parent instanceof JDOMException) {
+            return ((JDOMException)parent).getCause();
+        }
+        
+        if (parent instanceof SAXException) {
+            return ((SAXException)parent).getException();
+        }
+        
+        if (parent instanceof SQLException) {
+            return ((SQLException)parent).getNextException();
+        }
+        
+        if (parent instanceof InvocationTargetException) {
+            return ((InvocationTargetException)parent).getTargetException();
+        }
+        
+        if (parent instanceof ExceptionInInitializerError) {
+            return ((ExceptionInInitializerError)parent).getException();
+        }
+        
+        if (parent instanceof RemoteException) {
+            return ((RemoteException)parent).detail;
+        }
+        
+        // These classes are not part of standard JDK 1.1 or 1.2, so we 
+        // use reflection to access them.
+
+        Throwable nestedException = getNestedException(parent, "javax.naming.NamingException", "getRootCause");
+        if (nestedException != null) {
+            return nestedException;
+        }
+        
+        nestedException = getNestedException(parent, "javax.servlet.ServletException", "getRootCause");
+        if (nestedException != null) {
+            return nestedException;
+        }
+
+        return null;
+    }
+
+    // This method uses reflection to obtain the nest exception of a Throwable. We use reflection
+    // because the desired class may not exist in the currently-running VM.
+    private static Throwable getNestedException(
+                                 Throwable parent, String className, String methodName) {
+        try {
+            // See if this Throwable is of the desired type, by using isAssignableFrom().
+            Class testClass = Class.forName(className);
+            Class objectClass = parent.getClass();
+            if (testClass.isAssignableFrom(objectClass)) {
+                // Use reflection to call the specified method.
+                Class[] argClasses = new Class[0];
+                Method method = testClass.getMethod(methodName, argClasses);
+                Object[] args = new Object[0];
+                return (Throwable)method.invoke(parent, args);
+            }
+        }
+        catch(Exception ex) {
+            // Most likely, the desired class is not available in this VM. That's fine.
+            // Even if it's caused by something else, we don't want to display an error
+            // here, since we're already in the process of trying to display the original
+            // error - another error here will just confuse things.
+        }
+
+        return null;
+    }
+}

src/org/jdom/JDOMFactory.java

@@ -0,0 +1,338 @@
+/*--
+
+ $Id: JDOMFactory.java,v 1.9 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+import java.util.*;
+
+/**
+ * An interface to be used by builders when constructing JDOM objects. The
+ * <code>DefaultJDOMFactory</code> creates the standard top-level JDOM classes
+ * (Element, Document, Comment, etc). Another implementation of this factory
+ * could be used to create custom classes.
+ *
+ * @version $Revision: 1.9 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Ken Rune Holland
+ * @author  Phil Nelson
+ * @author  Bradley S. Huffman
+ */
+public interface JDOMFactory {
+
+    // **** constructing Attributes ****
+
+    /**
+     * <p>
+     * This will create a new <code>Attribute</code> with the
+     *   specified (local) name and value, and in the provided
+     *   <code>{@link org.jdom.Namespace}</code>.
+     * </p>
+     *
+     * @param name <code>String</code> name of <code>Attribute</code>.
+     * @param value <code>String</code> value for new attribute.
+     */
+    public Attribute attribute(String name, String value, Namespace namespace);
+
+    /**
+     * This will create a new <code>Attribute</code> with the
+     * specified (local) name, value, and type, and in the provided
+     * <code>{@link org.jdom.Namespace}</code>.
+     *
+     * @param name <code>String</code> name of <code>Attribute</code>.
+     * @param value <code>String</code> value for new attribute.
+     * @param type <code>int</code> type for new attribute.
+     * @param namespace <code>Namespace</code> namespace for new attribute.
+     */
+    public Attribute attribute(String name, String value,
+                                            int type, Namespace namespace);
+
+    /**
+     * This will create a new <code>Attribute</code> with the
+     * specified (local) name and value, and does not place
+     * the attribute in a <code>{@link org.jdom.Namespace}</code>.
+     * <p>
+     * <b>Note</b>: This actually explicitly puts the
+     * <code>Attribute</code> in the "empty" <code>Namespace</code>
+     * (<code>{@link org.jdom.Namespace#NO_NAMESPACE}</code>).
+     * </p>
+     *
+     * @param name <code>String</code> name of <code>Attribute</code>.
+     * @param value <code>String</code> value for new attribute.
+     */
+    public Attribute attribute(String name, String value);
+
+    /**
+     * This will create a new <code>Attribute</code> with the
+     * specified (local) name, value and type, and does not place
+     * the attribute in a <code>{@link org.jdom.Namespace}</code>.
+     * <p>
+     * <b>Note</b>: This actually explicitly puts the
+     * <code>Attribute</code> in the "empty" <code>Namespace</code>
+     * (<code>{@link org.jdom.Namespace#NO_NAMESPACE}</code>).
+     * </p>
+     *
+     * @param name <code>String</code> name of <code>Attribute</code>.
+     * @param value <code>String</code> value for new attribute.
+     * @param type <code>int</code> type for new attribute.
+     */
+    public Attribute attribute(String name, String value, int type);
+
+    // **** constructing CDATA ****
+
+    /**
+     * This creates the CDATA with the supplied text.
+     *
+     * @param str <code>String</code> content of CDATA.
+     */
+    public CDATA cdata(String str);
+
+    // **** constructing Text ****
+
+    /**
+     * This creates the Text with the supplied text.
+     *
+     * @param str <code>String</code> content of Text.
+     */
+    public Text text(String str);
+
+    // **** constructing Comment ****
+
+    /**
+     * This creates the comment with the supplied text.
+     *
+     * @param text <code>String</code> content of comment.
+     */
+    public Comment comment(String text);
+
+    // **** constructing DocType
+
+    /**
+     * This will create the <code>DocType</code> with
+     * the specified element name and a reference to an
+     * external DTD.
+     *
+     * @param elementName <code>String</code> name of
+     *        element being constrained.
+     * @param publicID <code>String</code> public ID of
+     *        referenced DTD
+     * @param systemID <code>String</code> system ID of
+     *        referenced DTD
+     */
+    public DocType docType(String elementName,
+                           String publicID, String systemID);
+
+    /**
+     * This will create the <code>DocType</code> with
+     * the specified element name and reference to an
+     * external DTD.
+     *
+     * @param elementName <code>String</code> name of
+     *        element being constrained.
+     * @param systemID <code>String</code> system ID of
+     *        referenced DTD
+     */
+    public DocType docType(String elementName, String systemID);
+
+    /**
+     * This will create the <code>DocType</code> with
+     * the specified element name
+     *
+     * @param elementName <code>String</code> name of
+     *        element being constrained.
+     */
+    public DocType docType(String elementName);
+
+    // **** constructing Document
+
+    /**
+     * This will create a new <code>Document</code>,
+     * with the supplied <code>{@link org.jdom.Element}</code>
+     * as the root element and the supplied
+     * <code>{@link org.jdom.DocType}</code> declaration.
+     *
+     * @param rootElement <code>Element</code> for document root.
+     * @param docType     <code>DocType</code> declaration.
+     */
+    public Document document(Element rootElement, DocType docType);
+
+    /**
+     * This will create a new <code>Document</code>,
+     * with the supplied <code>{@link org.jdom.Element}</code>
+     * as the root element and the supplied
+     * <code>{@link org.jdom.DocType}</code> declaration.
+     *
+     * @param rootElement <code>Element</code> for document root.
+     * @param docType <code>DocType</code> declaration.
+     * @param baseURI the URI from which this doucment was loaded.
+     */
+    public Document document(Element rootElement, DocType docType, String baseURI);
+
+    /**
+     * This will create a new <code>Document</code>,
+     * with the supplied <code>{@link org.jdom.Element}</code>
+     * as the root element, and no <code>{@link org.jdom.DocType}</code>
+     * declaration.
+     *
+     * @param rootElement <code>Element</code> for document root
+     */
+    public Document document(Element rootElement);
+
+    // **** constructing Elements ****
+
+    /**
+     * This will create a new <code>Element</code>
+     * with the supplied (local) name, and define
+     * the <code>{@link org.jdom.Namespace}</code> to be used.
+     *
+     * @param name <code>String</code> name of element.
+     * @param namespace <code>Namespace</code> to put element in.
+         */
+    public Element element(String name, Namespace namespace);
+
+    /**
+     * This will create an <code>Element</code> in no
+     * <code>{@link org.jdom.Namespace}</code>.
+     *
+     * @param name <code>String</code> name of element.
+     */
+    public Element element(String name);
+
+    /**
+     * This will create a new <code>Element</code> with
+     * the supplied (local) name, and specifies the URI
+     * of the <code>{@link org.jdom.Namespace}</code> the <code>Element</code>
+     * should be in, resulting it being unprefixed (in the default
+     * namespace).
+     *
+     * @param name <code>String</code> name of element.
+     * @param uri <code>String</code> URI for <code>Namespace</code> element
+     *        should be in.
+     */
+    public Element element(String name, String uri);
+
+    /**
+     * This will create a new <code>Element</code> with
+     * the supplied (local) name, and specifies the prefix and URI
+     * of the <code>{@link org.jdom.Namespace}</code> the <code>Element</code>
+     * should be in.
+     *
+     * @param name <code>String</code> name of element.
+     * @param uri <code>String</code> URI for <code>Namespace</code> element
+     *        should be in.
+     */
+    public Element element(String name, String prefix, String uri);
+
+    // **** constructing ProcessingInstruction ****
+
+    /**
+     * This will create a new <code>ProcessingInstruction</code>
+     * with the specified target and data.
+     *
+     * @param target <code>String</code> target of PI.
+     * @param data <code>Map</code> data for PI, in
+     *             name/value pairs
+     */
+    public ProcessingInstruction processingInstruction(String target,
+                                                       Map data);
+
+    /**
+     * This will create a new <code>ProcessingInstruction</code>
+     * with the specified target and data.
+     *
+     * @param target <code>String</code> target of PI.
+     * @param data <code>String</code> data for PI.
+     */
+    public ProcessingInstruction processingInstruction(String target,
+                                                       String data);
+
+    // **** constructing EntityRef ****
+
+    /**
+     * This will create a new <code>EntityRef</code>
+     * with the supplied name.
+     *
+     * @param name <code>String</code> name of element.
+     */
+    public EntityRef entityRef(String name);
+
+    /**
+     * This will create a new <code>EntityRef</code>
+     * with the supplied name, public ID, and system ID.
+     *
+     * @param name <code>String</code> name of element.
+     * @param publicID <code>String</code> public ID of element.
+     * @param systemID <code>String</code> system ID of element.
+     */
+    public EntityRef entityRef(String name, String publicID, String systemID);
+
+    /**
+     * This will create a new <code>EntityRef</code>
+     * with the supplied name and system ID.
+     *
+     * @param name <code>String</code> name of element.
+     * @param systemID <code>String</code> system ID of element.
+     */
+    public EntityRef entityRef(String name, String systemID);
+
+    // =====================================================================
+    // List manipulation
+    // =====================================================================
+
+    public void addContent(Parent parent, Content content);
+
+    public void setAttribute(Element element, Attribute a);
+
+    public void addNamespaceDeclaration(Element element, Namespace additional);
+}

src/org/jdom/Namespace.java

@@ -0,0 +1,278 @@
+/*-- 
+
+ $Id: Namespace.java,v 1.43 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom;
+
+import java.util.*;
+
+/**
+ * An XML namespace representation, as well as a factory for creating XML
+ * namespace objects. Namespaces are not Serializable, however objects that use
+ * namespaces have special logic to handle serialization manually. These classes
+ * call the getNamespace() method on deserialization to ensure there is one
+ * unique Namespace object for any unique prefix/uri pair.
+ *
+ * @version $Revision: 1.43 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Elliotte Rusty Harold
+ * @author  Jason Hunter
+ * @author  Wesley Biggs
+ */
+public final class Namespace {
+
+    // XXX May want to use weak references to keep the maps from growing 
+    // large with extended use
+
+    // XXX We may need to make the namespaces HashMap synchronized with
+    // reader/writer locks or perhaps make Namespace no longer a flyweight.
+    // As written, multiple put() calls may happen from different threads 
+    // concurrently and cause a ConcurrentModificationException. See
+    // http://lists.denveronline.net/lists/jdom-interest/2000-September/003009.html.
+    // No one has ever reported this over the many years, so don't worry yet.
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: Namespace.java,v $ $Revision: 1.43 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /** 
+     * Factory list of namespaces. 
+     * Keys are <i>prefix</i>&amp;<i>URI</i>. 
+     * Values are Namespace objects 
+     */
+    private static HashMap namespaces;
+
+    /** Define a <code>Namespace</code> for when <i>not</i> in a namespace */
+    public static final Namespace NO_NAMESPACE = new Namespace("", "");
+
+    /** Define a <code>Namespace</code> for the standard xml prefix. */
+    public static final Namespace XML_NAMESPACE =
+        new Namespace("xml", "http://www.w3.org/XML/1998/namespace");
+
+    /** The prefix mapped to this namespace */
+    private String prefix;
+
+    /** The URI for this namespace */
+    private String uri;
+
+    /**
+     * This static initializer acts as a factory contructor.
+     * It sets up storage and required initial values.
+     */
+    static {
+        namespaces = new HashMap(16);
+
+        // Add the "empty" namespace
+        namespaces.put(new NamespaceKey(NO_NAMESPACE), NO_NAMESPACE);
+        namespaces.put(new NamespaceKey(XML_NAMESPACE), XML_NAMESPACE);
+    }
+
+    /**
+     * This will retrieve (if in existence) or create (if not) a 
+     * <code>Namespace</code> for the supplied prefix and URI.
+     *
+     * @param prefix <code>String</code> prefix to map to 
+     *               <code>Namespace</code>.
+     * @param uri <code>String</code> URI of new <code>Namespace</code>.
+     * @return <code>Namespace</code> - ready to use namespace.
+     * @throws IllegalNameException if the given prefix and uri make up
+     *         an illegal namespace name.
+     */
+    public static Namespace getNamespace(String prefix, String uri) {
+        // Sanity checking
+        if ((prefix == null) || (prefix.trim().equals(""))) {
+            // Short-cut out for common case of no namespace
+            if ((uri == null) || (uri.trim().equals(""))) {
+                return NO_NAMESPACE;
+            }
+            prefix = "";
+        }
+        else if ((uri == null) || (uri.trim().equals(""))) {
+            uri = "";
+        }
+
+        // Return existing namespace if found. The preexisting namespaces
+        // should all be legal. In other words, an illegal namespace won't
+        // have been placed in this.  Thus we can do this test before
+        // verifying the URI and prefix.
+        NamespaceKey lookup = new NamespaceKey(prefix, uri);
+        Namespace preexisting = (Namespace) namespaces.get(lookup);
+        if (preexisting != null) {
+            return preexisting;
+        }
+
+        // Ensure proper naming
+        String reason;
+        if ((reason = Verifier.checkNamespacePrefix(prefix)) != null) {
+            throw new IllegalNameException(prefix, "Namespace prefix", reason);
+        }
+        if ((reason = Verifier.checkNamespaceURI(uri)) != null) {
+            throw new IllegalNameException(uri, "Namespace URI", reason);
+        }
+
+        // Unless the "empty" Namespace (no prefix and no URI), require a URI
+        if ((!prefix.equals("")) && (uri.equals(""))) {
+            throw new IllegalNameException("", "namespace",
+                "Namespace URIs must be non-null and non-empty Strings");
+        }
+
+        // Handle XML namespace mislabels. If the user requested the correct
+        // namespace and prefix -- xml, http://www.w3.org/XML/1998/namespace
+        // -- then it was already returned from the preexisting namespaces.
+        // Thus any use of the xml prefix or the
+        // http://www.w3.org/XML/1998/namespace URI at this point must be
+        // incorrect. 
+        if (prefix.equals("xml")) {
+            throw new IllegalNameException(prefix, "Namespace prefix",
+             "The xml prefix can only be bound to " +
+             "http://www.w3.org/XML/1998/namespace");        
+        }
+
+        // The erratum to Namespaces in XML 1.0 that suggests this 
+        // next check is controversial. Not everyone accepts it. 
+        if (uri.equals("http://www.w3.org/XML/1998/namespace")) {
+            throw new IllegalNameException(uri, "Namespace URI",
+             "The http://www.w3.org/XML/1998/namespace must be bound to " +
+             "the xml prefix.");        
+        }
+
+        // Finally, store and return
+        Namespace ns = new Namespace(prefix, uri);
+        namespaces.put(lookup, ns);
+        return ns;
+    }
+
+    /**
+     * This will retrieve (if in existence) or create (if not) a 
+     * <code>Namespace</code> for the supplied URI, and make it usable 
+     * as a default namespace, as no prefix is supplied.
+     *
+     * @param uri <code>String</code> URI of new <code>Namespace</code>.
+     * @return <code>Namespace</code> - ready to use namespace.
+     */
+    public static Namespace getNamespace(String uri) {
+        return getNamespace("", uri);
+    }
+
+    /**
+     * This constructor handles creation of a <code>Namespace</code> object
+     * with a prefix and URI; it is intentionally left <code>private</code>
+     * so that it cannot be invoked by external programs/code.
+     *
+     * @param prefix <code>String</code> prefix to map to this namespace.
+     * @param uri <code>String</code> URI for namespace.
+     */
+    private Namespace(String prefix, String uri) {
+        this.prefix = prefix;
+        this.uri = uri;
+    }
+
+    /**
+     * This returns the prefix mapped to this <code>Namespace</code>.
+     *
+     * @return <code>String</code> - prefix for this <code>Namespace</code>.
+     */
+    public String getPrefix() {
+        return prefix;
+    }
+
+    /**
+     * This returns the namespace URI for this <code>Namespace</code>.
+     *
+     * @return <code>String</code> - URI for this <code>Namespace</code>.
+     */
+    public String getURI() {
+        return uri;
+    }
+
+    /**
+     * This tests for equality - Two <code>Namespaces</code>
+     * are equal if and only if their URIs are byte-for-byte equals.
+     *
+     * @param ob <code>Object</code> to compare to this <code>Namespace</code>.
+     * @return <code>boolean</code> - whether the supplied object is equal to
+     *         this <code>Namespace</code>.
+     */
+    public boolean equals(Object ob) {
+        if (this == ob) {
+            return true;
+        }
+        if (ob instanceof Namespace) {  // instanceof returns false if null
+            return uri.equals(((Namespace)ob).uri);
+        }
+        return false;
+    }
+
+    /**
+     * This returns a <code>String</code> representation of this 
+     * <code>Namespace</code>, suitable for use in debugging.
+     *
+     * @return <code>String</code> - information about this instance.
+     */
+    public String toString() {
+        return "[Namespace: prefix \"" + prefix + "\" is mapped to URI \"" + 
+               uri + "\"]";
+    }
+
+    /**
+     * This returns a probably unique hash code for the <code>Namespace</code>.
+     * If two namespaces have the same URI, they are equal and have the same
+     * hash code, even if they have different prefixes.
+     *
+     * @return <code>int</code> - hash code for this <code>Namespace</code>.
+     */
+    public int hashCode() {
+        return uri.hashCode();
+    }
+}

src/org/jdom/NamespaceKey.java

@@ -0,0 +1,108 @@
+/*-- 
+
+ $Id: NamespaceKey.java,v 1.2 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom;
+
+import java.util.*;
+
+/**
+ * Key for storing a namespace representation in a map.
+ *
+ * @version $Revision: 1.2 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Tatu Saloranta
+ * @author  Bradley S. Huffman
+ */
+final class NamespaceKey {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: NamespaceKey.java,v $ $Revision: 1.2 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    private String prefix;
+    private String uri;
+    private int hash;
+
+    public NamespaceKey(String prefix, String uri) {
+        this.prefix = prefix;
+        this.uri = uri;
+        this.hash = prefix.hashCode();
+    }
+
+    public NamespaceKey(Namespace namespace) {
+        this(namespace.getPrefix(), namespace.getURI());
+    }
+
+    public boolean equals(Object ob) {
+        if (this == ob) {
+            return true;
+        }
+        else if (ob instanceof NamespaceKey) {
+            NamespaceKey other = (NamespaceKey) ob;
+            return prefix.equals(other.prefix) && uri.equals(other.uri);
+        }
+        else {
+            return false;
+        }
+    }
+
+    public int hashCode() {
+        return hash;
+    }
+    
+    public String toString() {
+        return "[NamespaceKey: prefix \"" + prefix +
+               "\" is mapped to URI \"" + uri + "\"]";
+    }
+}

src/org/jdom/Parent.java

@@ -0,0 +1,239 @@
+/*--
+
+ $Id: Parent.java,v 1.13 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+import java.io.Serializable;
+import java.util.*;
+import org.jdom.filter.Filter;
+
+/**
+ * Superclass for JDOM objects which are allowed to contain
+ * {@link Content} content.
+ *
+ * @see org.jdom.Content
+ * @see org.jdom.Document
+ * @see org.jdom.Element
+ *
+ * @author Bradley S. Huffman
+ * @author Jason Hunter
+ * @version $Revision: 1.13 $, $Date: 2007/11/10 05:28:59 $
+ */
+public interface Parent extends Cloneable, Serializable {
+
+    /**
+     * Returns the number of children in this parent's content list.
+     * Children may be any {@link Content} type.
+     *
+     * @return number of children
+     */
+    int getContentSize();
+
+    /**
+     * Returns the index of the supplied child in the content list,
+     * or -1 if not a child of this parent.
+     *
+     * @param child  child to search for
+     * @return       index of child, or -1 if not found
+     */
+    int indexOf(Content child);
+
+//    /**
+//     * Starting at the given index (inclusive), returns the index of
+//     * the first child matching the supplied filter, or -1
+//     * if none is found.
+//     *
+//     * @return index of child, or -1 if none found
+//     */
+//    int indexOf(int index, Filter filter);
+
+    /**
+     * Returns a list containing detached clones of this parent's content list.
+     *
+     * @return list of cloned child content
+     */
+    List cloneContent();
+
+    /**
+     * Returns the child at the given index.
+     *
+     * @param index location of desired child
+     * @return child at the given index
+     * @throws IndexOutOfBoundsException if index is negative or beyond
+     *         the current number of children
+     * @throws IllegalStateException if parent is a Document
+     *         and the root element is not set
+     */
+    Content getContent(int index);
+
+    /**
+     * Returns the full content of this parent as a {@link java.util.List}
+     * which contains objects of type {@link Content}. The returned list is
+     * <b>"live"</b> and in document order. Any modifications
+     * to it affect the element's actual contents. Modifications are checked
+     * for conformance to XML 1.0 rules.
+     * <p>
+     * Sequential traversal through the List is best done with an Iterator
+     * since the underlying implement of {@link java.util.List#size} may
+     * require walking the entire list and indexed lookups may require
+     * starting at the beginning each time.
+     *
+     * @return a list of the content of the parent
+     * @throws IllegalStateException if parent is a Document
+     *         and the root element is not set
+     */
+    List getContent();
+
+    /**
+     * Returns as a {@link java.util.List} the content of
+     * this parent that matches the supplied filter. The returned list is
+     * <b>"live"</b> and in document order. Any modifications to it affect
+     * the element's actual contents. Modifications are checked for
+     * conformance to XML 1.0 rules.
+     * <p>
+     * Sequential traversal through the List is best done with an Iterator
+     * since the underlying implement of {@link java.util.List#size} may
+     * require walking the entire list and indexed lookups may require
+     * starting at the beginning each time.
+     *
+     * @param  filter filter to apply
+     * @return a list of the content of the parent matching the filter
+     * @throws IllegalStateException if parent is a Document
+     *         and the root element is not set
+     */
+    List getContent(Filter filter);
+
+    /**
+     * Removes all content from this parent and returns the detached
+     * children.
+     *
+     * @return list of the old content detached from this parent
+     */
+    List removeContent();
+
+    /**
+     * Removes from this parent all child content matching the given filter
+     * and returns a list of the detached children.
+     *
+     * @param  filter filter to apply
+     * @return list of the detached children matching the filter
+     */
+    List removeContent(Filter filter);
+
+    /**
+     * Removes a single child node from the content list.
+     *
+     * @param  child  child to remove
+     * @return whether the removal occurred
+     */
+    boolean removeContent(Content child);
+
+    /**
+     * Removes and returns the child at the given
+     * index, or returns null if there's no such child.
+     *
+     * @param index index of child to remove
+     * @return detached child at given index or null if no
+     * @throws IndexOutOfBoundsException if index is negative or beyond
+     *             the current number of children
+     */
+    Content removeContent(int index);
+
+    /**
+     * Obtain a deep, unattached copy of this parent and it's children.
+     *
+     * @return a deep copy of this parent and it's children.
+     */
+    Object clone();
+
+    /**
+     * Returns an {@link java.util.Iterator} that walks over all descendants
+     * in document order.
+     *
+     * @return an iterator to walk descendants
+     */
+    Iterator getDescendants();
+
+    /**
+     * Returns an {@link java.util.Iterator} that walks over all descendants
+     * in document order applying the Filter to return only elements that
+     * match the filter rule.  With filters you can match only Elements,
+     * only Comments, Elements or Comments, only Elements with a given name
+     * and/or prefix, and so on.
+     *
+     * @param filter filter to select which descendants to see
+     * @return an iterator to walk descendants that match a filter
+     */
+    Iterator getDescendants(Filter filter);
+
+    /**
+     * Return this parent's parent, or null if this parent is currently
+     * not attached to another parent. This is the same method as in Content but
+     * also added to Parent to allow more easy up-the-tree walking.
+     *
+     * @return this parent's parent or null if none
+     */
+    Parent getParent();
+
+    /**
+     * Return this parent's owning document or null if the branch containing
+     * this parent is currently not attached to a document.
+     *
+     * @return this child's owning document or null if none
+     */
+    Document getDocument();
+
+}

src/org/jdom/ProcessingInstruction.java

@@ -0,0 +1,473 @@
+/*--
+
+ $Id: ProcessingInstruction.java,v 1.47 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+import java.util.*;
+
+/**
+ * An XML processing instruction. Methods allow the user to obtain the target of
+ * the PI as well as its data. The data can always be accessed as a String or,
+ * if the data appears akin to an attribute list, can be retrieved as name/value
+ * pairs.
+ *
+ * @version $Revision: 1.47 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ * @author  Steven Gould
+ */
+
+public class ProcessingInstruction extends Content {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: ProcessingInstruction.java,v $ $Revision: 1.47 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /** The target of the PI */
+    protected String target;
+
+    /** The data for the PI as a String */
+    protected String rawData;
+
+    /** The data for the PI in name/value pairs */
+    protected Map mapData;
+
+    /**
+     * Default, no-args constructor for implementations
+     * to use if needed.
+     */
+    protected ProcessingInstruction() { }
+
+    /**
+     * This will create a new <code>ProcessingInstruction</code>
+     * with the specified target and data.
+     *
+     * @param target <code>String</code> target of PI.
+     * @param data <code>Map</code> data for PI, in
+     *             name/value pairs
+     * @throws IllegalTargetException if the given target is illegal
+     *         as a processing instruction name.
+     */
+    public ProcessingInstruction(String target, Map data) {
+        setTarget(target);
+        setData(data);
+    }
+
+    /**
+     * This will create a new <code>ProcessingInstruction</code>
+     * with the specified target and data.
+     *
+     * @param target <code>String</code> target of PI.
+     * @param data <code>String</code> data for PI.
+     * @throws IllegalTargetException if the given target is illegal
+     *         as a processing instruction name.
+     */
+    public ProcessingInstruction(String target, String data) {
+        setTarget(target);
+        setData(data);
+    }
+
+    /**
+     * This will set the target for the PI.
+     *
+     * @param newTarget <code>String</code> new target of PI.
+     * @return <code>ProcessingInstruction</code> - this PI modified.
+     */
+    public ProcessingInstruction setTarget(String newTarget) {
+        String reason;
+        if ((reason = Verifier.checkProcessingInstructionTarget(newTarget))
+                                    != null) {
+            throw new IllegalTargetException(newTarget, reason);
+        }
+
+        target = newTarget;
+        return this;
+    }
+
+    /**
+     * Returns the XPath 1.0 string value of this element, which is the
+     * data of this PI.
+     *
+     * @return the data of this PI
+     */
+    public String getValue() {
+        return rawData;
+    }
+
+
+    /**
+     * This will retrieve the target of the PI.
+     *
+     * @return <code>String</code> - target of PI.
+     */
+    public String getTarget() {
+        return target;
+    }
+
+    /**
+     * This will return the raw data from all instructions.
+     *
+     * @return <code>String</code> - data of PI.
+     */
+    public String getData() {
+        return rawData;
+    }
+
+    /**
+     * This will return a <code>List</code> containing the names of the
+     * "attribute" style pieces of name/value pairs in this PI's data.
+     *
+     * @return <code>List</code> - the <code>List</code> containing the
+     *         "attribute" names.
+     */
+    public List getPseudoAttributeNames() {
+      Set mapDataSet = mapData.entrySet();
+      List nameList = new ArrayList();
+      for (Iterator i = mapDataSet.iterator(); i.hasNext();) {
+         String wholeSet = (i.next()).toString();
+         String attrName = wholeSet.substring(0,(wholeSet.indexOf("=")));
+         nameList.add(attrName);
+      }
+      return nameList;
+    }
+
+    /**
+     * This will set the raw data for the PI.
+     *
+     * @param data <code>String</code> data of PI.
+     * @return <code>ProcessingInstruction</code> - this PI modified.
+     */
+    public ProcessingInstruction setData(String data) {
+        String reason = Verifier.checkProcessingInstructionData(data);
+        if (reason != null) {
+            throw new IllegalDataException(data, reason);
+        }
+
+        this.rawData = data;
+        this.mapData = parseData(data);
+        return this;
+    }
+
+    /**
+     * This will set the name/value pairs within the passed
+     * <code>Map</code> as the pairs for the data of
+     * this PI.  The keys should be the pair name
+     * and the values should be the pair values.
+     *
+     * @param data new map data to use
+     * @return <code>ProcessingInstruction</code> - modified PI.
+     */
+    public ProcessingInstruction setData(Map data) {
+        String temp = toString(data);
+
+        String reason = Verifier.checkProcessingInstructionData(temp);
+        if (reason != null) {
+            throw new IllegalDataException(temp, reason);
+        }
+
+        this.rawData = temp;
+        this.mapData = data;
+        return this;
+    }
+
+
+    /**
+     * This will return the value for a specific
+     * name/value pair on the PI.  If no such pair is
+     * found for this PI, null is returned.
+     *
+     * @param name <code>String</code> name of name/value pair
+     *             to lookup value for.
+     * @return <code>String</code> - value of name/value pair.
+     */
+    public String getPseudoAttributeValue(String name) {
+        return (String)mapData.get(name);
+    }
+
+    /**
+     * This will set a pseudo attribute with the given name and value.
+     * If the PI data is not already in a pseudo-attribute format, this will
+     * replace the existing data.
+     *
+     * @param name <code>String</code> name of pair.
+     * @param value <code>String</code> value for pair.
+     * @return <code>ProcessingInstruction</code> this PI modified.
+     */
+    public ProcessingInstruction setPseudoAttribute(String name, String value) {
+        String reason = Verifier.checkProcessingInstructionData(name);
+        if (reason != null) {
+            throw new IllegalDataException(name, reason);
+        }
+
+        reason = Verifier.checkProcessingInstructionData(value);
+        if (reason != null) {
+            throw new IllegalDataException(value, reason);
+        }
+
+        this.mapData.put(name, value);
+        this.rawData = toString(mapData);
+        return this;
+    }
+
+
+    /**
+     * This will remove the pseudo attribute with the specified name.
+     *
+     * @param name name of pseudo attribute to remove
+     * @return <code>boolean</code> - whether the requested
+     *         instruction was removed.
+     */
+    public boolean removePseudoAttribute(String name) {
+        if ((mapData.remove(name)) != null) {
+            rawData = toString(mapData);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * This will convert the Map to a string representation.
+     *
+     * @param mapData <code>Map</code> PI data to convert
+     * @return a string representation of the Map as appropriate for a PI
+     */
+    private String toString(Map mapData) {
+        StringBuffer rawData = new StringBuffer();
+
+        Iterator i = mapData.keySet().iterator();
+        while (i.hasNext()) {
+            String name = (String)i.next();
+            String value = (String)mapData.get(name);
+            rawData.append(name)
+                   .append("=\"")
+                   .append(value)
+                   .append("\" ");
+        }
+        // Remove last space, if we did any appending
+        if (rawData.length() > 0) {
+            rawData.setLength(rawData.length() - 1);
+        }
+
+        return rawData.toString();
+    }
+
+    /**
+     * This will parse and load the instructions for the PI.
+     * This is separated to allow it to occur once and then be reused.
+     */
+    private Map parseData(String rawData) {
+        // The parsing here is done largely "by hand" which means the code
+        // gets a little tricky/messy.  The following conditions should
+        // now be handled correctly:
+        //   <?pi href="http://hi/a=b"?>        Reads OK
+        //   <?pi href = 'http://hi/a=b' ?>     Reads OK
+        //   <?pi href\t = \t'http://hi/a=b'?>  Reads OK
+        //   <?pi href  =  "http://hi/a=b"?>    Reads OK
+        //   <?pi?>                             Empty Map
+        //   <?pi id=22?>                       Empty Map
+        //   <?pi id='22?>                      Empty Map
+
+        Map data = new HashMap();
+
+        // System.out.println("rawData: " + rawData);
+
+        // The inputData variable holds the part of rawData left to parse
+        String inputData = rawData.trim();
+
+        // Iterate through the remaining inputData string
+        while (!inputData.trim().equals("")) {
+            //System.out.println("parseData() looking at: " + inputData);
+
+            // Search for "name =", "name=" or "name1 name2..."
+            String name = "";
+            String value = "";
+            int startName = 0;
+            char previousChar = inputData.charAt(startName);
+            int pos = 1;
+            for (; pos<inputData.length(); pos++) {
+                char currentChar = inputData.charAt(pos);
+                if (currentChar == '=') {
+                    name = inputData.substring(startName, pos).trim();
+                    // Get the boundaries on the quoted string
+                    // We use boundaries so we know where to start next
+                    int[] bounds = extractQuotedString(
+                                     inputData.substring(pos+1));
+                    // A null value means a parse error and we return empty!
+                    if (bounds == null) {
+                        return new HashMap();
+                    }
+                    value = inputData.substring(bounds[0]+pos+1,
+                                                bounds[1]+pos+1);
+                    pos += bounds[1] + 1;  // skip past value
+                    break;
+                }
+                else if (Character.isWhitespace(previousChar)
+                          && !Character.isWhitespace(currentChar)) {
+                    startName = pos;
+                }
+
+                previousChar = currentChar;
+            }
+
+            // Remove the first pos characters; they have been processed
+            inputData = inputData.substring(pos);
+
+            // System.out.println("Extracted (name, value) pair: ("
+            //                          + name + ", '" + value+"')");
+
+            // If both a name and a value have been found, then add
+            // them to the data Map
+            if (name.length() > 0 && value != null) {
+                //if (data.containsKey(name)) {
+                    // A repeat, that's a parse error, so return a null map
+                    //return new HashMap();
+                //}
+                //else {
+                    data.put(name, value);
+                //}
+            }
+        }
+
+        return data;
+    }
+
+    /**
+     * This is a helper routine, only used by parseData, to extract a
+     * quoted String from the input parameter, rawData. A quoted string
+     * can use either single or double quotes, but they must match up.
+     * A singly quoted string can contain an unbalanced amount of double
+     * quotes, or vice versa. For example, the String "JDOM's the best"
+     * is legal as is 'JDOM"s the best'.
+     *
+     * @param rawData the input string from which a quoted string is to
+     *                be extracted.
+     * @return the first quoted string encountered in the input data. If
+     *         no quoted string is found, then the empty string, "", is
+     *         returned.
+     * @see #parseData
+     */
+    private static int[] extractQuotedString(String rawData) {
+        // Remembers whether we're actually in a quoted string yet
+        boolean inQuotes = false;
+
+        // Remembers which type of quoted string we're in
+        char quoteChar = '"';
+
+        // Stores the position of the first character inside
+        //  the quoted string (i.e. the start of the return string)
+        int start = 0;
+
+        // Iterate through the input string looking for the start
+        // and end of the quoted string
+        for (int pos=0; pos < rawData.length(); pos++) {
+            char currentChar = rawData.charAt(pos);
+            if (currentChar=='"' || currentChar=='\'') {
+                if (!inQuotes) {
+                    // We're entering a quoted string
+                    quoteChar = currentChar;
+                    inQuotes = true;
+                    start = pos+1;
+                }
+                else if (quoteChar == currentChar) {
+                    // We're leaving a quoted string
+                    inQuotes = false;
+                    return new int[] { start, pos };
+                }
+                // Otherwise we've encountered a quote
+                // inside a quote, so just continue
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * This returns a <code>String</code> representation of the
+     * <code>ProcessingInstruction</code>, suitable for debugging. If the XML
+     * representation of the <code>ProcessingInstruction</code> is desired,
+     * {@link org.jdom.output.XMLOutputter#outputString(ProcessingInstruction)}
+     * should be used.
+     *
+     * @return <code>String</code> - information about the
+     *         <code>ProcessingInstruction</code>
+     */
+    public String toString() {
+        return new StringBuffer()
+            .append("[ProcessingInstruction: ")
+            .append(new org.jdom.output.XMLOutputter().outputString(this))
+            .append("]")
+            .toString();
+    }
+
+    /**
+     * This will return a clone of this <code>ProcessingInstruction</code>.
+     *
+     * @return <code>Object</code> - clone of this
+     * <code>ProcessingInstruction</code>.
+     */
+    public Object clone() {
+        ProcessingInstruction pi = (ProcessingInstruction) super.clone();
+
+        // target and rawdata are immutable and references copied by
+        // Object.clone()
+
+        // Create a new Map object for the clone (since Map isn't Cloneable)
+        if (mapData != null) {
+            pi.mapData = parseData(rawData);
+        }
+        return pi;
+    }
+}

src/org/jdom/Text.java

@@ -0,0 +1,271 @@
+/*--
+
+ $Id: Text.java,v 1.25 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom;
+
+/**
+ * Character-based XML content. Provides a modular, parentable method of
+ * representing text. Text makes no guarantees about the underlying textual
+ * representation of character data, but does expose that data as a Java String.
+ *
+ * @version $Revision: 1.25 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ * @author  Bradley S. Huffman
+ */
+public class Text extends Content {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: Text.java,v $ $Revision: 1.25 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    static final String EMPTY_STRING = "";
+
+    /** The actual character content */
+    // XXX See http://www.servlets.com/archive/servlet/ReadMsg?msgId=8612
+    // from elharo for a description of why Java characters may not suffice
+    // long term
+    protected String value;
+
+    /**
+     * This is the protected, no-args constructor standard in all JDOM
+     * classes. It allows subclassers to get a raw instance with no
+     * initialization.
+     */
+    protected Text() { }
+
+    /**
+     * This constructor creates a new <code>Text</code> node, with the
+     * supplied string value as it's character content.
+     *
+     * @param str the node's character content.
+     * @throws IllegalDataException if <code>str</code> contains an
+     *         illegal character such as a vertical tab (as determined
+     *         by {@link org.jdom.Verifier#checkCharacterData})
+     */
+    public Text(String str) {
+        setText(str);
+    }
+
+    /**
+     * This returns the value of this <code>Text</code> node as a Java
+     * <code>String</code>.
+     *
+     * @return <code>String</code> - character content of this node.
+     */
+    public String getText() {
+        return value;
+    }
+
+    /**
+     * This returns the textual content with all surrounding whitespace
+     * removed.  If only whitespace exists, the empty string is returned.
+     *
+     * @return trimmed text content or empty string
+     */
+    public String getTextTrim() {
+        return getText().trim();
+    }
+
+    /**
+     * This returns the textual content with all surrounding whitespace
+     * removed and internal whitespace normalized to a single space.  If
+     * only whitespace exists, the empty string is returned.
+     *
+     * @return normalized text content or empty string
+     */
+    public String getTextNormalize() {
+        return normalizeString(getText());
+    }
+
+    /**
+     * This returns a new string with all surrounding whitespace
+     * removed and internal whitespace normalized to a single space.  If
+     * only whitespace exists, the empty string is returned.
+     * <p>
+     * Per XML 1.0 Production 3 whitespace includes: #x20, #x9, #xD, #xA
+     * </p>
+     *
+     * @param str string to be normalized.
+     * @return normalized string or empty string
+     */
+    public static String normalizeString(String str) {
+        if (str == null)
+            return EMPTY_STRING;
+
+        char[] c = str.toCharArray();
+        char[] n = new char[c.length];
+        boolean white = true;
+        int pos = 0;
+        for (int i = 0; i < c.length; i++) {
+            if (" \t\n\r".indexOf(c[i]) != -1) {
+                if (!white) {
+                    n[pos++] = ' ';
+                    white = true;
+                }
+            }
+            else {
+                n[pos++] = c[i];
+                white = false;
+            }
+        }
+        if (white && pos > 0) {
+            pos--;
+        }
+        return new String(n, 0, pos);
+    }
+
+    /**
+     * This will set the value of this <code>Text</code> node.
+     *
+     * @param str value for node's content.
+     * @return the object on which the method was invoked
+     * @throws IllegalDataException if <code>str</code> contains an
+     *         illegal character such as a vertical tab (as determined
+     *         by {@link org.jdom.Verifier#checkCharacterData})
+     */
+    public Text setText(String str) {
+        String reason;
+
+        if (str == null) {
+            value = EMPTY_STRING;
+            return this;
+        }
+
+        if ((reason = Verifier.checkCharacterData(str)) != null) {
+            throw new IllegalDataException(str, "character content", reason);
+        }
+        value = str;
+        return this;
+    }
+
+    /**
+     * This will append character content to whatever content already
+     * exists within this <code>Text</code> node.
+     *
+     * @param str character content to append.
+     * @throws IllegalDataException if <code>str</code> contains an
+     *         illegal character such as a vertical tab (as determined
+     *         by {@link org.jdom.Verifier#checkCharacterData})
+     */
+    public void append(String str) {
+        String reason;
+
+        if (str == null) {
+            return;
+        }
+        if ((reason = Verifier.checkCharacterData(str)) != null) {
+            throw new IllegalDataException(str, "character content", reason);
+        }
+
+        if (str == EMPTY_STRING)
+             value = str;
+        else value += str;
+    }
+
+    /**
+     * This will append the content of another <code>Text</code> node
+     * to this node.
+     *
+     * @param text Text node to append.
+     */
+    public void append(Text text) {
+        if (text == null) {
+            return;
+        }
+        value += text.getText();
+    }
+
+    /**
+     * Returns the XPath 1.0 string value of this element, which is the
+     * text itself.
+     *
+     * @return the text
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * This returns a <code>String</code> representation of the
+     * <code>Text</code> node, suitable for debugging. If the XML
+     * representation of the <code>Text</code> node is desired,
+     * either <code>{@link #getText}</code> or
+     * {@link org.jdom.output.XMLOutputter#outputString(Text)}</code>
+     * should be used.
+     *
+     * @return <code>String</code> - information about this node.
+     */
+    public String toString() {
+        return new StringBuffer(64)
+            .append("[Text: ")
+            .append(getText())
+            .append("]")
+            .toString();
+    }
+
+    /**
+     * This will return a clone of this <code>Text</code> node, with the
+     * same character content, but no parent.
+     *
+     * @return <code>Text</code> - cloned node.
+     */
+    public Object clone() {
+        Text text = (Text)super.clone();
+        text.value = value;
+        return text;
+    }
+
+}

src/org/jdom/UncheckedJDOMFactory.java

@@ -0,0 +1,287 @@
+/*-- 
+
+ $Id: UncheckedJDOMFactory.java,v 1.4 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom;
+
+import java.util.*;
+
+/**
+ * Special factory for building documents without any content or structure
+ * checking.  This should only be used when you are 100% positive that the
+ * input is absolutely correct.  This factory can speed builds, but any
+ * problems in the input will be uncaught until later when they could cause
+ * infinite loops, malformed XML, or worse.  Use with extreme caution.
+ */
+public class UncheckedJDOMFactory implements JDOMFactory {
+
+    // =====================================================================
+    // Element Factory
+    // =====================================================================
+
+    public Element element(String name, Namespace namespace) {
+        Element e = new Element();
+        e.name = name;
+        if (namespace == null) {
+            namespace = Namespace.NO_NAMESPACE;
+        }
+        e.namespace = namespace;
+        return e;
+    }
+
+    public Element element(String name) {
+        Element e = new Element();
+        e.name = name;
+        e.namespace = Namespace.NO_NAMESPACE;
+        return e;
+    }
+
+    public Element element(String name, String uri) {
+        return element(name, Namespace.getNamespace("", uri));
+    }
+
+    public Element element(String name, String prefix, String uri) {
+        return element(name, Namespace.getNamespace(prefix, uri));
+    }
+
+    // =====================================================================
+    // Attribute Factory
+    // =====================================================================
+
+    public Attribute attribute(String name, String value, Namespace namespace) {
+        Attribute a = new Attribute();
+        a.name = name;
+        a.value = value;
+        if (namespace == null) {
+            namespace = Namespace.NO_NAMESPACE;
+        }
+        a.namespace = namespace;
+        return a;
+    }
+
+    public Attribute attribute(String name, String value, int type, Namespace namespace) {
+        Attribute a = new Attribute();
+        a.name = name;
+        a.type = type;
+        a.value = value;
+        if (namespace == null) {
+            namespace = Namespace.NO_NAMESPACE;
+        }
+        a.namespace = namespace;
+        return a;
+    }
+
+    public Attribute attribute(String name, String value) {
+        Attribute a = new Attribute();
+        a.name = name;
+        a.value = value;
+        a.namespace = Namespace.NO_NAMESPACE;
+        return a;
+    }
+
+    public Attribute attribute(String name, String value, int type) {
+        Attribute a = new Attribute();
+        a.name = name;
+        a.type = type;
+        a.value = value;
+        a.namespace = Namespace.NO_NAMESPACE;
+        return a;
+    }
+
+    // =====================================================================
+    // Text Factory
+    // =====================================================================
+
+    public Text text(String str) {
+        Text t = new Text();
+        t.value = str;
+        return t;
+    }
+
+    // =====================================================================
+    // CDATA Factory
+    // =====================================================================
+
+    public CDATA cdata(String str) {
+        CDATA c = new CDATA();
+        c.value = str;
+        return c;
+    }
+
+    // =====================================================================
+    // Comment Factory
+    // =====================================================================
+
+    public Comment comment(String str) {
+        Comment c = new Comment();
+        c.text = str;
+        return c;
+    }
+
+    // =====================================================================
+    // Processing Instruction Factory
+    // =====================================================================
+
+    public ProcessingInstruction processingInstruction(String target, Map data) {
+        ProcessingInstruction p = new ProcessingInstruction();
+        p.target = target;
+        p.setData(data);
+        return p;
+    }
+
+    public ProcessingInstruction processingInstruction(String target, String data) {
+        ProcessingInstruction p = new ProcessingInstruction();
+        p.target = target;
+        p.setData(data);
+        return p;
+    }
+
+    // =====================================================================
+    // Entity Ref Factory
+    // =====================================================================
+
+    public EntityRef entityRef(String name) {
+        EntityRef e = new org.jdom.EntityRef();
+        e.name = name;
+        return e;
+    }
+
+    public EntityRef entityRef(String name, String systemID) {
+        EntityRef e = new EntityRef();
+        e.name = name;
+        e.systemID = systemID;
+        return e;
+    }
+
+    public EntityRef entityRef(String name, String publicID, String systemID) {
+        EntityRef e = new EntityRef();
+        e.name = name;
+        e.publicID = publicID;
+        e.systemID = systemID;
+        return e;
+    }
+
+    // =====================================================================
+    // DocType Factory
+    // =====================================================================
+
+    public DocType docType(String elementName, String publicID, String systemID) {
+        DocType d = new DocType();
+        d.elementName = elementName;
+        d.publicID = publicID;
+        d.systemID = systemID;
+        return d;
+    }
+
+    public DocType docType(String elementName, String systemID) {
+        return docType(elementName, null, systemID);
+    }
+
+    public DocType docType(String elementName) {
+        return docType(elementName, null, null);
+    }
+
+    // =====================================================================
+    // Document Factory
+    // =====================================================================
+
+    public Document document(Element rootElement, DocType docType, String baseURI) {
+        Document d = new Document();
+        if (docType != null) {
+            addContent(d, docType);
+        }
+        if (rootElement != null) {
+            addContent(d, rootElement);
+        }
+        if (baseURI != null) {
+            d.baseURI = baseURI;
+        }
+        return d;
+    }
+
+    public Document document(Element rootElement, DocType docType) {
+        return document(rootElement, docType, null);
+    }
+
+    public Document document(Element rootElement) {
+        return document(rootElement, null, null);
+    }
+
+    // =====================================================================
+    // List manipulation
+    // =====================================================================
+
+    public void addContent(Parent parent, Content child) {
+        if (parent instanceof Element) {
+            Element elt = (Element) parent;
+            elt.content.uncheckedAddContent(child);
+        }
+        else {
+            Document doc = (Document) parent;
+            doc.content.uncheckedAddContent(child);
+        }
+    }
+
+    public void setAttribute(Element parent, Attribute a) {
+        parent.attributes.uncheckedAddAttribute(a);
+    }
+
+    public void addNamespaceDeclaration(Element parent, Namespace additional) {
+        if (parent.additionalNamespaces == null) {
+            parent.additionalNamespaces = new ArrayList(5); //Element.INITIAL_ARRAY_SIZE
+        }
+        parent.additionalNamespaces.add(additional);
+    }
+}

src/org/jdom/adapters/AbstractDOMAdapter.java

@@ -0,0 +1,172 @@
+/*-- 
+
+ $Id: AbstractDOMAdapter.java,v 1.21 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.adapters;
+
+import java.io.*;
+import java.lang.reflect.*;
+
+import org.jdom.*;
+import org.w3c.dom.*;
+import org.w3c.dom.Document;
+
+/**
+ * A DOMAdapter utility abstract base class.
+ * 
+ * @version $Revision: 1.21 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ */
+public abstract class AbstractDOMAdapter implements DOMAdapter {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: AbstractDOMAdapter.java,v $ $Revision: 1.21 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /**
+     * This creates a new <code>{@link Document}</code> from an
+     * existing <code>InputStream</code> by letting a DOM
+     * parser handle parsing using the supplied stream.
+     *
+     * @param filename file to parse.
+     * @param validate <code>boolean</code> to indicate if validation should occur.
+     * @return <code>Document</code> - instance ready for use.
+     * @throws IOException when I/O error occurs.
+     * @throws JDOMException when errors occur in parsing.
+     */
+    public Document getDocument(File filename, boolean validate)
+        throws IOException, JDOMException {
+
+        return getDocument(new FileInputStream(filename), validate);
+    }
+
+    /**
+     * This creates a new <code>{@link Document}</code> from an
+     * existing <code>InputStream</code> by letting a DOM
+     * parser handle parsing using the supplied stream.
+     *
+     * @param in <code>InputStream</code> to parse.
+     * @param validate <code>boolean</code> to indicate if validation should occur.
+     * @return <code>Document</code> - instance ready for use.
+     * @throws IOException when I/O error occurs.
+     * @throws JDOMException when errors occur in parsing.
+     */
+    public abstract Document getDocument(InputStream in, boolean validate)
+        throws IOException, JDOMException;
+
+    /**
+     * This creates an empty <code>Document</code> object based
+     * on a specific parser implementation.
+     *
+     * @return <code>Document</code> - created DOM Document.
+     * @throws JDOMException when errors occur.
+     */
+    public abstract Document createDocument() throws JDOMException;
+
+    /**
+     * This creates an empty <code>Document</code> object based
+     * on a specific parser implementation with the given DOCTYPE.
+     * If the doctype parameter is null, the behavior is the same as
+     * calling <code>createDocument()</code>.
+     *
+     * @param doctype Initial <code>DocType</code> of the document.
+     * @return <code>Document</code> - created DOM Document.
+     * @throws JDOMException when errors occur.
+     */
+    public Document createDocument(DocType doctype) throws JDOMException {
+        if (doctype == null) {
+            return createDocument();
+        }
+  
+        DOMImplementation domImpl = createDocument().getImplementation();
+        DocumentType domDocType = domImpl.createDocumentType(
+                                      doctype.getElementName(),
+                                      doctype.getPublicID(),
+                                      doctype.getSystemID());
+
+        // Set the internal subset if possible
+        setInternalSubset(domDocType, doctype.getInternalSubset());
+
+        return domImpl.createDocument("http://temporary",
+                                      doctype.getElementName(),
+                                      domDocType);
+    }
+
+    /**
+     * This attempts to change the DocumentType to have the given internal DTD 
+     * subset value.  This is not a standard ability in DOM, so it's only
+     * available with some parsers.  Subclasses can alter the mechanism by
+     * which the attempt is made to set the value.
+     *
+     * @param dt DocumentType to be altered
+     * @param s String to use as the internal DTD subset
+     */
+    protected void setInternalSubset(DocumentType dt, String s) {
+        if (dt == null || s == null) return;
+
+        // Default behavior is to attempt a setInternalSubset() call using
+        // reflection.  This method is not part of the DOM spec, but it's
+        // available on Xerces 1.4.4+.  It's not currently in Crimson.
+        try {
+            Class dtclass = dt.getClass();
+            Method setInternalSubset = dtclass.getMethod(
+                "setInternalSubset", new Class[] {java.lang.String.class});
+            setInternalSubset.invoke(dt, new Object[] {s});
+        }
+        catch (Exception e) {
+            // ignore
+        }
+    }
+}

src/org/jdom/adapters/CrimsonDOMAdapter.java

@@ -0,0 +1,146 @@
+/*-- 
+
+ $Id: CrimsonDOMAdapter.java,v 1.17 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.adapters;
+
+import java.io.*;
+import java.lang.reflect.*;
+
+import org.jdom.*;
+import org.w3c.dom.Document;
+import org.xml.sax.*;
+
+/**
+ * An adapter for the Apache Crimson DOM parser.
+ * 
+ * @version $Revision: 1.17 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Jason Hunter
+ */
+public class CrimsonDOMAdapter extends AbstractDOMAdapter {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: CrimsonDOMAdapter.java,v $ $Revision: 1.17 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /**
+     * This creates a new <code>{@link Document}</code> from an
+     * existing <code>InputStream</code> by letting a DOM
+     * parser handle parsing using the supplied stream.
+     *
+     * @param in <code>InputStream</code> to parse.
+     * @param validate <code>boolean</code> to indicate if validation should occur.
+     * @return <code>Document</code> - instance ready for use.
+     * @throws IOException when I/O error occurs.
+     * @throws JDOMException when errors occur in parsing.
+     */
+    public Document getDocument(InputStream in, boolean validate)
+        throws IOException, JDOMException  {
+
+        try {
+            Class[] parameterTypes = new Class[2];
+            parameterTypes[0] = Class.forName("java.io.InputStream");
+            parameterTypes[1] = boolean.class;
+
+            Object[] args = new Object[2];
+            args[0] = in;
+            args[1] = new Boolean(false);
+
+            // Load the parser class and invoke the parse method
+            Class parserClass = Class.forName("org.apache.crimson.tree.XmlDocument");
+            Method createXmlDocument =
+                parserClass.getMethod("createXmlDocument", parameterTypes);
+            Document doc =
+                (Document)createXmlDocument.invoke(null, args);
+
+            return doc;
+
+        } catch (InvocationTargetException e) {
+            Throwable targetException = e.getTargetException();
+            if (targetException instanceof org.xml.sax.SAXParseException) {
+                SAXParseException parseException = (SAXParseException)targetException;
+                throw new JDOMException("Error on line " + parseException.getLineNumber() +
+                                      " of XML document: " + parseException.getMessage(), parseException);
+            } else if (targetException instanceof IOException) {
+                IOException ioException = (IOException) targetException;
+                throw ioException;
+            } else {
+                throw new JDOMException(targetException.getMessage(), targetException);
+            }
+        } catch (Exception e) {
+            throw new JDOMException(e.getClass().getName() + ": " +
+                                  e.getMessage(), e);
+        }
+    }
+
+    /**
+     * This creates an empty <code>Document</code> object based
+     * on a specific parser implementation.
+     *
+     * @return <code>Document</code> - created DOM Document.
+     * @throws JDOMException when errors occur.
+     */
+    public Document createDocument() throws JDOMException {
+        try {
+            return
+                (Document)Class.forName(
+                    "org.apache.crimson.tree.XmlDocument")
+                    .newInstance();
+
+        } catch (Exception e) {
+            throw new JDOMException(e.getClass().getName() + ": " +
+                                  e.getMessage() + " when creating document", e);
+        }
+    }
+}

src/org/jdom/adapters/DOMAdapter.java

@@ -0,0 +1,123 @@
+/*-- 
+
+ $Id: DOMAdapter.java,v 1.22 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.adapters;
+
+import java.io.*;
+
+import org.jdom.*;
+import org.w3c.dom.Document;
+
+/**
+ * Defines a standard set of adapter methods for interfacing with a DOM parser
+ * and obtaining a DOM {@link org.w3c.dom.Document org.w3c.dom.Document} object.
+ * Implementing classes map these calls to DOM parser-specific calls, allowing
+ * any third-party parser to be used with JDOM.
+ *
+ * @version $Revision: 1.22 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ */
+public interface DOMAdapter {
+
+    /**
+     * This creates a new <code>Document</code> from a
+     * given filename by letting a DOM parser handle parsing from the file.
+     *
+     * @param filename file to parse.
+     * @param validate <code>boolean</code> to indicate if validation 
+     * should occur.
+     * @return <code>Document</code> - instance ready for use.
+     * @throws IOException when I/O error occurs.
+     * @throws JDOMException when errors occur in parsing.
+     */
+    public Document getDocument(File filename, boolean validate)
+        throws IOException, JDOMException;
+
+    /**
+     * This creates a new <code>Document</code> from an
+     * existing <code>InputStream</code> by letting a DOM
+     * parser handle parsing using the supplied stream.
+     *
+     * @param in <code>InputStream</code> to parse.
+     * @param validate <code>boolean</code> to indicate if validation 
+     * should occur.
+     * @return <code>Document</code> - instance ready for use.
+     * @throws IOException when I/O error occurs.
+     * @throws JDOMException when errors occur in parsing.
+     */
+    public Document getDocument(InputStream in, boolean validate)
+        throws IOException, JDOMException;
+
+    /**
+     * This creates an empty <code>Document</code> object based
+     * on a specific parser implementation.
+     *
+     * @return <code>Document</code> - created DOM Document.
+     * @throws JDOMException when errors occur.
+     */
+    public Document createDocument() throws JDOMException;
+
+    /**
+     * This creates an empty <code>Document</code> object based
+     * on a specific parser implementation with the given DOCTYPE.
+     *
+     * @param doctype Initial <code>DocType</code> of the document.
+     * @return <code>Document</code> - created DOM Document.
+     * @throws JDOMException when errors occur.
+     */
+    public Document createDocument(DocType doctype) throws JDOMException;
+}

src/org/jdom/adapters/JAXPDOMAdapter.java

@@ -0,0 +1,195 @@
+/*-- 
+
+ $Id: JAXPDOMAdapter.java,v 1.13 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.adapters;
+
+import java.io.*;
+import java.lang.reflect.*;
+
+import org.jdom.*;
+import org.jdom.input.*;
+import org.w3c.dom.Document;
+
+/**
+ * An adapter for any parser supporting the Sun JAXP APIs.
+ * 
+ * @version $Revision: 1.13 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Jason Hunter
+ */
+public class JAXPDOMAdapter extends AbstractDOMAdapter {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: JAXPDOMAdapter.java,v $ $Revision: 1.13 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /**
+     * This creates a new <code>{@link Document}</code> from an
+     * existing <code>InputStream</code> by letting a JAXP
+     * parser handle parsing using the supplied stream.
+     *
+     * @param in <code>InputStream</code> to parse.
+     * @param validate <code>boolean</code> to indicate if validation 
+     *        should occur.
+     * @return <code>Document</code> - instance ready for use.
+     * @throws IOException when I/O error occurs.
+     * @throws JDOMException when errors occur in parsing.
+      */
+    public Document getDocument(InputStream in, boolean validate)
+        throws IOException, JDOMException {
+
+        try {
+            // Try using JAXP...
+            // Note we need DOM Level 2 and thus JAXP 1.1.
+            Class.forName("javax.xml.transform.Transformer");
+
+            // Try JAXP 1.1 calls to build the document
+            Class factoryClass =
+                Class.forName("javax.xml.parsers.DocumentBuilderFactory");
+
+            // factory = DocumentBuilderFactory.newInstance();
+            Method newParserInstance =
+                factoryClass.getMethod("newInstance", null);
+            Object factory = newParserInstance.invoke(null, null);
+
+            // factory.setValidating(validate);
+            Method setValidating =
+                factoryClass.getMethod("setValidating",
+                                   new Class[]{boolean.class});
+            setValidating.invoke(factory,
+                                 new Object[]{new Boolean(validate)});
+
+            // factory.setNamespaceAware(true);
+            Method setNamespaceAware =
+                factoryClass.getMethod("setNamespaceAware",
+                                       new Class[]{boolean.class});
+            setNamespaceAware.invoke(factory,
+                                 new Object[]{Boolean.TRUE});
+    
+            // jaxpParser = factory.newDocumentBuilder();
+            Method newDocBuilder =
+                factoryClass.getMethod("newDocumentBuilder", null);
+            Object jaxpParser  = newDocBuilder.invoke(factory, null);
+
+            // jaxpParser.setErrorHandler(null);
+            Class parserClass = jaxpParser.getClass();
+            Method setErrorHandler =
+                parserClass.getMethod("setErrorHandler",
+                                 new Class[]{org.xml.sax.ErrorHandler.class});
+            setErrorHandler.invoke(jaxpParser,
+                                 new Object[]{new BuilderErrorHandler()});
+
+            // domDoc = jaxpParser.parse(in);
+            Method parse = parserClass.getMethod(
+                "parse", new Class[]{InputStream.class});
+            org.w3c.dom.Document domDoc = (org.w3c.dom.Document)
+                parse.invoke(jaxpParser, new Object[]{in});
+
+            return domDoc;
+        } catch (InvocationTargetException e) {
+            Throwable targetException = e.getTargetException();
+            if (targetException instanceof IOException) {
+                throw (IOException) targetException;
+            } else {
+                throw new JDOMException(targetException.getMessage(), targetException);
+            }
+        } catch (Exception e) {
+            throw new JDOMException("Reflection failed while parsing a document with JAXP", e); 
+        }
+
+        // Allow all exceptions to pass through
+    }
+
+    /**
+     * This creates an empty <code>Document</code> object based
+     * on a specific parser implementation.
+     *
+     * @return <code>Document</code> - created DOM Document.
+     * @throws JDOMException when errors occur in parsing.
+      */
+    public Document createDocument() 
+        throws JDOMException {
+
+        try {
+            // We need DOM Level 2 and thus JAXP 1.1.
+            // If JAXP 1.0 is all that's available then we error out.
+            Class.forName("javax.xml.transform.Transformer");
+
+            // Try JAXP 1.1 calls to build the document
+            Class factoryClass =
+                Class.forName("javax.xml.parsers.DocumentBuilderFactory");
+
+            // factory = DocumentBuilderFactory.newInstance();
+            Method newParserInstance =
+                factoryClass.getMethod("newInstance", null);
+            Object factory = newParserInstance.invoke(null, null);
+
+            // jaxpParser = factory.newDocumentBuilder();
+            Method newDocBuilder =
+                factoryClass.getMethod("newDocumentBuilder", null);
+            Object jaxpParser  = newDocBuilder.invoke(factory, null);
+
+            // domDoc = jaxpParser.newDocument();
+            Class parserClass = jaxpParser.getClass();
+            Method newDoc = parserClass.getMethod("newDocument", null);
+            org.w3c.dom.Document domDoc =
+                (org.w3c.dom.Document) newDoc.invoke(jaxpParser, null);
+
+            return domDoc;
+        } catch (Exception e) {
+            throw new JDOMException("Reflection failed while creating new JAXP document", e); 
+        }
+
+    }
+}

src/org/jdom/adapters/OracleV1DOMAdapter.java

@@ -0,0 +1,145 @@
+/*-- 
+
+ $Id: OracleV1DOMAdapter.java,v 1.20 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.adapters;
+
+import java.io.*;
+import java.lang.reflect.*;
+
+import org.jdom.*;
+import org.w3c.dom.Document;
+import org.xml.sax.*;
+
+/**
+ * An adapter for the Oracle Version 1 DOM parser.
+ * 
+ * @version $Revision: 1.20 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ */
+public class OracleV1DOMAdapter extends AbstractDOMAdapter {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: OracleV1DOMAdapter.java,v $ $Revision: 1.20 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /**
+     * This creates a new <code>{@link Document}</code> from an
+     * existing <code>InputStream</code> by letting a DOM
+     * parser handle parsing using the supplied stream.
+     *
+     * @param in <code>InputStream</code> to parse.
+     * @param validate <code>boolean</code> to indicate if validation should occur.
+     * @return <code>Document</code> - instance ready for use.
+     * @throws IOException when I/O error occurs.
+     * @throws JDOMException when errors occur in parsing.
+     */
+    public Document getDocument(InputStream in, boolean validate)
+        throws IOException, JDOMException  {
+
+        try {
+            // Load the parser class
+            Class parserClass = Class.forName("oracle.xml.parser.XMLParser");
+            Object parser = parserClass.newInstance();
+
+            // Parse the document
+            Method parse =
+                parserClass.getMethod("parse",
+                                      new Class[] {org.xml.sax.InputSource.class});
+            parse.invoke(parser, new Object[] {new InputSource(in)});
+
+            // Get the Document object
+            Method getDocument = parserClass.getMethod("getDocument", null);
+            Document doc = (Document)getDocument.invoke(parser, null);
+
+            return doc;
+        } catch (InvocationTargetException e) {
+            Throwable targetException = e.getTargetException();
+            if (targetException instanceof org.xml.sax.SAXParseException) {
+                SAXParseException parseException = (SAXParseException) targetException;
+                throw new JDOMException("Error on line " + parseException.getLineNumber() +
+                                      " of XML document: " + parseException.getMessage(), parseException);
+            } else if (targetException instanceof IOException) {
+                IOException ioException = (IOException) targetException;
+                throw ioException;
+            } else {
+                throw new JDOMException(targetException.getMessage(), targetException);
+            }
+        } catch (Exception e) {
+            throw new JDOMException(e.getClass().getName() + ": " +
+                                  e.getMessage(), e);
+        }
+    }
+
+    /**
+     * This creates an empty <code>Document</code> object based
+     * on a specific parser implementation.
+     *
+     * @return <code>Document</code> - created DOM Document.
+     * @throws JDOMException when errors occur.
+     */
+    public Document createDocument() throws JDOMException {
+        try {
+            return
+                (Document)Class.forName(
+                    "oracle.xml.parser.XMLDocument")
+                    .newInstance();
+
+        } catch (Exception e) {
+            throw new JDOMException(e.getClass().getName() + ": " +
+                                  e.getMessage() + " when creating document", e);
+        }
+    }
+}

src/org/jdom/adapters/OracleV2DOMAdapter.java

@@ -0,0 +1,145 @@
+/*-- 
+
+ $Id: OracleV2DOMAdapter.java,v 1.19 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.adapters;
+
+import java.io.*;
+import java.lang.reflect.*;
+
+import org.jdom.*;
+import org.w3c.dom.Document;
+import org.xml.sax.*;
+
+/**
+ * An adapter for the Oracle Version 2 DOM parser.
+ * 
+ * @version $Revision: 1.19 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ */
+public class OracleV2DOMAdapter extends AbstractDOMAdapter {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: OracleV2DOMAdapter.java,v $ $Revision: 1.19 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /**
+     * This creates a new <code>{@link Document}</code> from an
+     * existing <code>InputStream</code> by letting a DOM
+     * parser handle parsing using the supplied stream.
+     *
+     * @param in <code>InputStream</code> to parse.
+     * @param validate <code>boolean</code> to indicate if validation should occur.
+     * @return <code>Document</code> - instance ready for use.
+     * @throws IOException when I/O error occurs.
+     * @throws JDOMException when errors occur in parsing.
+     */
+    public Document getDocument(InputStream in, boolean validate)
+        throws IOException, JDOMException {
+
+        try {
+            // Load the parser class
+            Class parserClass = Class.forName("oracle.xml.parser.v2.DOMParser");
+            Object parser = parserClass.newInstance();
+
+            // Parse the document
+            Method parse =
+                parserClass.getMethod("parse",
+                                      new Class[] {org.xml.sax.InputSource.class});
+            parse.invoke(parser, new Object[] {new InputSource(in)});
+
+            // Get the Document object
+            Method getDocument = parserClass.getMethod("getDocument", null);
+            Document doc = (Document)getDocument.invoke(parser, null);
+
+            return doc;
+        } catch (InvocationTargetException e) {
+            Throwable targetException = e.getTargetException();
+            if (targetException instanceof org.xml.sax.SAXParseException) {
+                SAXParseException parseException = (SAXParseException)targetException;
+                throw new JDOMException("Error on line " + parseException.getLineNumber() +
+                                      " of XML document: " + parseException.getMessage(), parseException);
+            } else if (targetException instanceof IOException) {
+                IOException ioException = (IOException) targetException;
+                throw ioException;
+            } else {
+                throw new JDOMException(targetException.getMessage(), targetException);
+            }
+        } catch (Exception e) {
+            throw new JDOMException(e.getClass().getName() + ": " +
+                                  e.getMessage(), e);
+        }
+    }
+
+    /**
+     * This creates an empty <code>Document</code> object based
+     * on a specific parser implementation.
+     *
+     * @return <code>Document</code> - created DOM Document.
+     * @throws JDOMException when errors occur.
+     */
+    public Document createDocument() throws JDOMException {
+        try {
+            return
+                (Document)Class.forName(
+                    "oracle.xml.parser.v2.XMLDocument")
+                    .newInstance();
+
+        } catch (Exception e) {
+            throw new JDOMException(e.getClass().getName() + ": " +
+                                  e.getMessage() + " when creating document", e);
+        }
+    }
+}

src/org/jdom/adapters/XML4JDOMAdapter.java

@@ -0,0 +1,171 @@
+/*-- 
+
+ $Id: XML4JDOMAdapter.java,v 1.18 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.adapters;
+
+import java.io.*;
+import java.lang.reflect.*;
+
+import org.jdom.*;
+import org.jdom.input.*;
+import org.w3c.dom.Document;
+import org.xml.sax.*;
+
+/**
+ * An adapter for the IBM XML4J DOM parser.
+ * 
+ * @version $Revision: 1.18 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ */
+public class XML4JDOMAdapter extends AbstractDOMAdapter {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: XML4JDOMAdapter.java,v $ $Revision: 1.18 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /**
+     * This creates a new <code>{@link Document}</code> from an
+     * existing <code>InputStream</code> by letting a DOM
+     * parser handle parsing using the supplied stream.
+     *
+     * @param in <code>InputStream</code> to parse.
+     * @param validate <code>boolean</code> to indicate if validation should occur.
+     * @return <code>Document</code> - instance ready for use.
+     * @throws IOException when I/O error occurs.
+     * @throws JDOMException when errors occur in parsing.
+     */
+    public Document getDocument(InputStream in, boolean validate)
+        throws IOException, JDOMException  {
+
+        try {
+            /*
+             * IBM XML4J actually uses the Xerces parser, so this is
+             *   all Xerces specific code.
+             */
+
+            // Load the parser class
+            Class parserClass = Class.forName("org.apache.xerces.parsers.DOMParser");
+            Object parser = parserClass.newInstance();
+
+            // Set validation
+            Method setFeature =
+                parserClass.getMethod("setFeature",
+                                      new Class[] {java.lang.String.class,
+                                                   boolean.class});
+            setFeature.invoke(parser, new Object[] {"http://xml.org/sax/features/validation",
+                                                    new Boolean(validate)});
+
+            // Set namespaces
+            setFeature.invoke(parser, new Object[] {"http://xml.org/sax/features/namespaces",
+                                                    new Boolean(false)});
+
+            // Set the error handler
+            if (validate) {
+                Method setErrorHandler =
+                    parserClass.getMethod("setErrorHandler",
+                        new Class[] {ErrorHandler.class});
+                setErrorHandler.invoke(parser, new Object[] {new BuilderErrorHandler()});
+            }
+
+            // Parse the document
+            Method parse =
+                parserClass.getMethod("parse",
+                                      new Class[] {org.xml.sax.InputSource.class});
+            parse.invoke(parser, new Object[]{new InputSource(in)});
+
+            // Get the Document object
+            Method getDocument = parserClass.getMethod("getDocument", null);
+            Document doc = (Document)getDocument.invoke(parser, null);
+
+            return doc;
+        } catch (InvocationTargetException e) {
+            Throwable targetException = e.getTargetException();
+            if (targetException instanceof org.xml.sax.SAXParseException) {
+                SAXParseException parseException = (SAXParseException)targetException;
+                throw new JDOMException("Error on line " + parseException.getLineNumber() +
+                                      " of XML document: " + parseException.getMessage(), parseException);
+            } else if (targetException instanceof IOException) {
+                IOException ioException = (IOException) targetException;
+                throw ioException;
+            } else {
+                throw new JDOMException(targetException.getMessage(), targetException);
+            }
+        } catch (Exception e) {
+            throw new JDOMException(e.getClass().getName() + ": " +
+                                  e.getMessage(), e);
+        }
+    }
+
+    /**
+     * This creates an empty <code>Document</code> object based
+     * on a specific parser implementation.
+     *
+     * @return <code>Document</code> - created DOM Document.
+     * @throws JDOMException when errors occur.
+     */
+    public Document createDocument() throws JDOMException {
+        try {
+            return
+                (Document)Class.forName(
+                    "org.apache.xerces.dom.DocumentImpl")
+                    .newInstance();
+
+        } catch (Exception e) {
+            throw new JDOMException(e.getClass().getName() + ": " +
+                                  e.getMessage() + " while creating document", e);
+        }
+    }
+}

src/org/jdom/adapters/XercesDOMAdapter.java

@@ -0,0 +1,170 @@
+/*-- 
+
+ $Id: XercesDOMAdapter.java,v 1.19 2007/11/10 05:28:59 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.adapters;
+
+import java.io.*;
+import java.lang.reflect.*;
+
+import org.jdom.*;
+import org.jdom.input.*;
+import org.w3c.dom.Document;
+import org.xml.sax.*;
+
+/**
+ * An adapter for the Apache Xerces DOM parser.
+ * 
+ * @version $Revision: 1.19 $, $Date: 2007/11/10 05:28:59 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ */
+public class XercesDOMAdapter extends AbstractDOMAdapter {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: XercesDOMAdapter.java,v $ $Revision: 1.19 $ $Date: 2007/11/10 05:28:59 $ $Name: jdom_1_1 $";
+
+    /**
+     * This creates a new <code>{@link Document}</code> from an
+     * existing <code>InputStream</code> by letting a DOM
+     * parser handle parsing using the supplied stream.
+     *
+     * @param in <code>InputStream</code> to parse.
+     * @param validate <code>boolean</code> to indicate if validation 
+     * should occur.
+     * @return <code>Document</code> - instance ready for use.
+     * @throws IOException when I/O error occurs.
+     * @throws JDOMException when errors occur in parsing.
+     */
+    public Document getDocument(InputStream in, boolean validate)
+        throws IOException, JDOMException  {
+
+        try {
+            // Load the parser class
+            Class parserClass =
+                Class.forName("org.apache.xerces.parsers.DOMParser");
+            Object parser = parserClass.newInstance();
+
+            // Set validation
+            Method setFeature = parserClass.getMethod(
+                "setFeature",
+                new Class[] {java.lang.String.class, boolean.class});
+            setFeature.invoke(parser, 
+                new Object[] {"http://xml.org/sax/features/validation",
+                new Boolean(validate)});
+
+            // Set namespaces true
+            setFeature.invoke(parser,
+                new Object[] {"http://xml.org/sax/features/namespaces",
+                new Boolean(true)});
+
+            // Set the error handler
+            if (validate) {
+                Method setErrorHandler = parserClass.getMethod(
+                    "setErrorHandler",
+                    new Class[] {ErrorHandler.class});
+                setErrorHandler.invoke(parser,
+                    new Object[] {new BuilderErrorHandler()});
+            }
+
+            // Parse the document
+            Method parse = parserClass.getMethod(
+                "parse",
+                new Class[] {org.xml.sax.InputSource.class});
+            parse.invoke(parser, new Object[]{new InputSource(in)});
+
+            // Get the Document object
+            Method getDocument = parserClass.getMethod("getDocument", null);
+            Document doc = (Document)getDocument.invoke(parser, null);
+
+            return doc;
+        } catch (InvocationTargetException e) {
+            Throwable targetException = e.getTargetException();
+            if (targetException instanceof org.xml.sax.SAXParseException) {
+                SAXParseException parseException =
+                    (SAXParseException)targetException;
+                throw new JDOMException("Error on line " +
+                                      parseException.getLineNumber() +
+                                      " of XML document: " +
+                                      parseException.getMessage(), e);
+            } else if (targetException instanceof IOException) {
+                IOException ioException = (IOException) targetException;
+                throw ioException;
+            } else {
+                throw new JDOMException(targetException.getMessage(), e);
+            }
+        } catch (Exception e) {
+            throw new JDOMException(e.getClass().getName() + ": " +
+                                  e.getMessage(), e);
+        }
+    }
+
+    /**
+     * This creates an empty <code>Document</code> object based
+     * on a specific parser implementation.
+     *
+     * @return <code>Document</code> - created DOM Document.
+     * @throws JDOMException when errors occur.
+     */
+    public Document createDocument() throws JDOMException {
+        try {
+            return (Document)Class.forName(
+                "org.apache.xerces.dom.DocumentImpl").newInstance();
+        } catch (Exception e) {
+            throw new JDOMException(e.getClass().getName() + ": " +
+                                  e.getMessage() + " when creating document", e);
+        }
+    }
+}

src/org/jdom/adapters/package.html

@@ -0,0 +1,7 @@
+<body>
+
+Classes to interface with various DOM implementations.  Not generally
+needed except in truly advanced situations.  JAXPDOMAdapter is most commonly
+used.
+
+</body>

src/org/jdom/filter/AbstractFilter.java

@@ -0,0 +1,82 @@
+/*--
+
+ $Id: AbstractFilter.java,v 1.6 2007/11/10 05:29:00 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.filter;
+
+/**
+ * Partial implementation of {@link Filter}.
+ *
+ * @author Bradley S. Huffman
+ * @version $Revision: 1.6 $, $Date: 2007/11/10 05:29:00 $
+ */
+public abstract class AbstractFilter implements Filter {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: AbstractFilter.java,v $ $Revision: 1.6 $ $Date: 2007/11/10 05:29:00 $";
+
+    public Filter negate() {
+        return new NegateFilter(this);
+    }
+
+    public Filter or(Filter filter) {
+        return new OrFilter(this, filter);
+    }
+
+    public Filter and(Filter filter) {
+        return new AndFilter(this, filter);
+    }
+
+}

src/org/jdom/filter/AndFilter.java

@@ -0,0 +1,125 @@
+/*--
+
+ $Id: AndFilter.java,v 1.4 2007/11/10 05:29:00 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.filter;
+
+/**
+ * Allow two filters to be chained together with a logical
+ * <b>and</b> operation.
+ *
+ * @author Bradley S. Huffman
+ * @version $Revision: 1.4 $, $Date: 2007/11/10 05:29:00 $
+ */
+final class AndFilter extends AbstractFilter {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: AndFilter.java,v $ $Revision: 1.4 $ $Date: 2007/11/10 05:29:00 $";
+
+    // Filter for left side of logical <b>and</b>.
+    private Filter left;
+
+    // Filter for right side of logical <b>and</b>.
+    private Filter right;
+
+    /**
+     * Match if only both supplied filters match.
+     *
+     * @param left left side of logical <b>and</b>
+     * @param right right side of logical <b>and</b>
+     * @throws IllegalArgumentException if either supplied filter is null
+     */
+    public AndFilter(Filter left, Filter right) {
+        if ((left == null) || (right == null)) {
+            throw new IllegalArgumentException("null filter not allowed");
+        }
+        this.left = left;
+        this.right = right;
+    }
+
+    public boolean matches(Object obj) {
+        return left.matches(obj) && right.matches(obj);
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (obj instanceof AndFilter) {
+            AndFilter filter = (AndFilter) obj;
+            if ((left.equals(filter.left)  && right.equals(filter.right)) ||
+                (left.equals(filter.right) && right.equals(filter.left))) {
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    public int hashCode() {
+        return (31 * left.hashCode()) + right.hashCode();
+    }
+
+    public String toString() {
+        return new StringBuffer(64)
+                   .append("[AndFilter: ")
+                   .append(left.toString())
+                   .append(",\n")
+                   .append("            ")
+                   .append(right.toString())
+                   .append("]")
+                   .toString();
+    }
+}

src/org/jdom/filter/ContentFilter.java

@@ -0,0 +1,356 @@
+/*--
+
+ $Id: ContentFilter.java,v 1.15 2007/11/10 05:29:00 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.filter;
+
+import org.jdom.*;
+
+/**
+ * A general purpose Filter able to represent all legal JDOM objects or a
+ * specific subset. Filtering is accomplished by way of a filtering mask in
+ * which each bit represents whether a JDOM object is visible or not.
+ * For example to view all Text and CDATA nodes in the content of element x.
+ * <pre><code>
+ *      Filter filter = new ContentFilter(ContentFilter.TEXT |
+ *                                        ContentFilter.CDATA);
+ *      List content = x.getContent(filter);
+ * </code></pre>
+ * <p>
+ * For those who don't like bit-masking, set methods are provided as an
+ * alternative.  For example to allow everything except Comment nodes.
+ * <pre><code>
+ *      Filter filter =  new ContentFilter();
+ *      filter.setCommentVisible(false);
+ *      List content = x.getContent(filter);
+ * </code></pre>
+ * <p>
+ * The default is to allow all valid JDOM objects.
+ *
+ * @version $Revision: 1.15 $, $Date: 2007/11/10 05:29:00 $
+ * @author Bradley S. Huffman
+ */
+public class ContentFilter extends AbstractFilter {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: ContentFilter.java,v $ $Revision: 1.15 $ $Date: 2007/11/10 05:29:00 $ $Name: jdom_1_1 $";
+
+    /** Mask for JDOM {@link Element} objects */
+    public static final int ELEMENT   = 1;
+
+    /** Mask for JDOM {@link CDATA} objects */
+    public static final int CDATA     = 2;
+
+    /** Mask for JDOM {@link Text} objects */
+    public static final int TEXT      = 4;
+
+    /** Mask for JDOM {@link Comment} objects */
+    public static final int COMMENT   = 8;
+
+    /** Mask for JDOM {@link ProcessingInstruction} objects */
+    public static final int PI        = 16;
+
+    /** Mask for JDOM {@link EntityRef} objects */
+    public static final int ENTITYREF = 32;
+
+    /** Mask for JDOM {@link Document} object */
+    public static final int DOCUMENT  = 64;
+
+    /** Mask for JDOM {@link DocType} object */
+    public static final int DOCTYPE = 128;
+
+    /** The JDOM object mask */
+    private int filterMask;
+
+    /**
+     * Default constructor that allows any legal JDOM objects.
+     */
+    public ContentFilter() {
+        setDefaultMask();
+    }
+
+    /**
+     * Set whether all JDOM objects are visible or not.
+     *
+     * @param allVisible <code>true</code> all JDOM objects are visible,
+     *                   <code>false</code> all JDOM objects are hidden.
+     */
+    public ContentFilter(boolean allVisible) {
+        if (allVisible) {
+            setDefaultMask();
+        }
+        else {
+            filterMask &= ~filterMask;
+        }
+    }
+
+    /**
+     * Filter out JDOM objects according to a filtering mask.
+     *
+     * @param mask Mask of JDOM objects to allow.
+     */
+    public ContentFilter(int mask) {
+        setFilterMask(mask);
+    }
+
+    /**
+     * Return current filtering mask.
+     *
+     * @return the current filtering mask
+     */
+    public int getFilterMask() {
+        return filterMask;
+    }
+
+    /**
+     * Set filtering mask.
+     *
+     * @param mask the new filtering mask
+     */
+    public void setFilterMask(int mask) {
+        setDefaultMask();
+        filterMask &= mask;
+    }
+
+    /**
+     * Set this filter to allow all legal JDOM objects.
+     */
+    public void setDefaultMask() {
+        filterMask = ELEMENT | CDATA | TEXT | COMMENT |
+                     PI | ENTITYREF | DOCUMENT | DOCTYPE;
+    }
+
+    /**
+     * Set filter to match only JDOM objects that are legal
+     * document content.
+     */
+    public void setDocumentContent() {
+        filterMask = ELEMENT | COMMENT | PI | DOCTYPE;
+    }
+
+    /**
+     * Set filter to match only JDOM objects that are legal
+     * element content.
+     */
+    public void setElementContent() {
+        filterMask = ELEMENT | CDATA | TEXT |
+                     COMMENT | PI | ENTITYREF;
+    }
+
+    /**
+     * Set visiblity of <code>Element</code> objects.
+     *
+     * @param visible whether Elements are visible, <code>true</code>
+     *        if yes, <code>false</code> if not
+     */
+    public void setElementVisible(boolean visible) {
+        if (visible) {
+            filterMask |= ELEMENT;
+        }
+        else {
+            filterMask &= ~ELEMENT;
+        }
+    }
+
+    /**
+     * Set visiblity of <code>CDATA</code> objects.
+     *
+     * @param visible whether CDATA nodes are visible, <code>true</code>
+     *        if yes, <code>false</code> if not
+     */
+    public void setCDATAVisible(boolean visible) {
+        if (visible) {
+            filterMask |= CDATA;
+        }
+        else {
+            filterMask &= ~CDATA;
+        }
+    }
+
+    /**
+     * Set visiblity of <code>Text</code> objects.
+     *
+     * @param visible whether Text nodes are visible, <code>true</code>
+     *        if yes, <code>false</code> if not
+     */
+    public void setTextVisible(boolean visible) {
+        if (visible) {
+            filterMask |= TEXT;
+        }
+        else {
+            filterMask &= ~TEXT;
+        }
+    }
+
+    /**
+     * Set visiblity of <code>Comment</code> objects.
+     *
+     * @param visible whether Comments are visible, <code>true</code>
+     *        if yes, <code>false</code> if not
+     */
+    public void setCommentVisible(boolean visible) {
+        if (visible) {
+            filterMask |= COMMENT;
+        }
+        else {
+            filterMask &= ~COMMENT;
+        }
+    }
+
+    /**
+     * Set visiblity of <code>ProcessingInstruction</code> objects.
+     *
+     * @param visible whether ProcessingInstructions are visible,
+     *        <code>true</code> if yes, <code>false</code> if not
+     */
+    public void setPIVisible(boolean visible) {
+        if (visible) {
+            filterMask |= PI;
+        }
+        else {
+            filterMask &= ~PI;
+        }
+    }
+
+    /**
+     * Set visiblity of <code>EntityRef</code> objects.
+     *
+     * @param visible whether EntityRefs are visible, <code>true</code>
+     *        if yes, <code>false</code> if not
+     */
+    public void setEntityRefVisible(boolean visible) {
+        if (visible) {
+            filterMask |= ENTITYREF;
+        }
+        else {
+            filterMask &= ~ENTITYREF;
+        }
+    }
+
+    /**
+     * Set visiblity of <code>DocType</code> objects.
+     *
+     * @param visible whether the DocType is visible, <code>true</code>
+     *        if yes, <code>false</code> if not
+     */
+    public void setDocTypeVisible(boolean visible) {
+        if (visible) {
+            filterMask |= DOCTYPE;
+        }
+        else {
+            filterMask &= ~DOCTYPE;
+        }
+    }
+
+    /**
+     * Check to see if the object matches according to the filter mask.
+     *
+     * @param obj The object to verify.
+     * @return <code>true</code> if the objected matched a predfined
+     *           set of rules.
+     */
+    public boolean matches(Object obj) {
+        if (obj instanceof Element) {
+            return (filterMask & ELEMENT) != 0;
+        }
+        else if (obj instanceof CDATA) {  // must come before Text check
+            return (filterMask & CDATA) != 0;
+        }
+        else if (obj instanceof Text) {
+            return (filterMask & TEXT) != 0;
+        }
+        else if (obj instanceof Comment) {
+            return (filterMask & COMMENT) != 0;
+        }
+        else if (obj instanceof ProcessingInstruction) {
+            return (filterMask & PI) != 0;
+        }
+        else if (obj instanceof EntityRef) {
+            return (filterMask & ENTITYREF) != 0;
+        }
+        else if (obj instanceof Document) {
+            return (filterMask & DOCUMENT) != 0;
+        }
+        else if (obj instanceof DocType) {
+            return (filterMask & DOCTYPE) != 0;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns whether the two filters are equivalent (i&#46;e&#46; the
+     * matching mask values are identical).
+     *
+     * @param  obj                 the object to compare against
+     * @return                     whether the two filters are equal
+     */
+    public boolean equals(Object obj) {
+        // Generated by IntelliJ
+        if (this == obj) return true;
+        if (!(obj instanceof ContentFilter)) return false;
+
+        final ContentFilter filter = (ContentFilter) obj;
+
+        if (filterMask != filter.filterMask) return false;
+
+        return true;
+    }
+
+    public int hashCode() {
+        // Generated by IntelliJ
+        return filterMask;
+    }
+}

src/org/jdom/filter/ElementFilter.java

@@ -0,0 +1,189 @@
+/*--
+
+ $Id: ElementFilter.java,v 1.20 2007/11/10 05:29:00 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.filter;
+
+import java.io.*;
+import org.jdom.*;
+
+/**
+ * A Filter that only matches {@link org.jdom.Element} objects.
+ *
+ * @version $Revision: 1.20 $, $Date: 2007/11/10 05:29:00 $
+ * @author  Jools Enticknap
+ * @author  Bradley S. Huffman
+ */
+public class ElementFilter extends AbstractFilter {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: ElementFilter.java,v $ $Revision: 1.20 $ $Date: 2007/11/10 05:29:00 $ $Name: jdom_1_1 $";
+
+    /** The element name */
+    private String name;
+
+    /** The element namespace */
+    private transient Namespace namespace;
+
+    /**
+     * Select only the Elements.
+     */
+    public ElementFilter() {}
+
+    /**
+     * Select only the Elements with the supplied name in any Namespace.
+     *
+     * @param name   The name of the Element.
+     */
+    public ElementFilter(String name) {
+        this.name   = name;
+    }
+
+    /**
+     * Select only the Elements with the supplied Namespace.
+     *
+     * @param namespace The namespace the Element lives in.
+     */
+    public ElementFilter(Namespace namespace) {
+        this.namespace = namespace;
+    }
+
+    /**
+     * Select only the Elements with the supplied name and Namespace.
+     *
+     * @param name   The name of the Element.
+     * @param namespace The namespace the Element lives in.
+     */
+    public ElementFilter(String name, Namespace namespace) {
+        this.name   = name;
+        this.namespace = namespace;
+    }
+
+    /**
+     * Check to see if the object matches a predefined set of rules.
+     *
+     * @param obj The object to verify.
+     * @return <code>true</code> if the objected matched a predfined
+     *           set of rules.
+     */
+    public boolean matches(Object obj) {
+        if (obj instanceof Element) {
+            Element el = (Element) obj;
+            return
+              (this.name == null || this.name.equals(el.getName())) &&
+              (this.namespace == null || this.namespace.equals(el.getNamespace()));
+        }
+        return false;
+    }
+
+    /**
+     * Returns whether the two filters are equivalent (i&#46;e&#46; the
+     * matching names and namespace are equivalent).
+     *
+     * @param  obj                   the object to compare against
+     * @return                     whether the two filters are equal
+     */
+    public boolean equals(Object obj) {
+        // Generated by IntelliJ
+        if (this == obj) return true;
+        if (!(obj instanceof ElementFilter)) return false;
+
+        final ElementFilter filter = (ElementFilter) obj;
+
+        if (name != null ? !name.equals(filter.name) : filter.name != null) return false;
+        if (namespace != null ? !namespace.equals(filter.namespace) : filter.namespace != null) return false;
+
+        return true;
+    }
+
+    public int hashCode() {
+        // Generated by IntelliJ
+        int result;
+        result = (name != null ? name.hashCode() : 0);
+        result = 29 * result + (namespace != null ? namespace.hashCode() : 0);
+        return result;
+    }
+
+    // Support a custom Namespace serialization so no two namespace
+    // object instances may exist for the same prefix/uri pair
+    private void writeObject(ObjectOutputStream out) throws IOException {
+
+        out.defaultWriteObject();
+
+        // We use writeObject() and not writeUTF() to minimize space
+        // This allows for writing pointers to already written strings
+        if (namespace != null) {
+            out.writeObject(namespace.getPrefix());
+            out.writeObject(namespace.getURI());
+        }
+        else {
+            out.writeObject(null);
+            out.writeObject(null);
+        }
+    }
+
+    private void readObject(ObjectInputStream in)
+            throws IOException, ClassNotFoundException {
+
+        in.defaultReadObject();
+
+        Object prefix = in.readObject();
+        Object uri = in.readObject();
+
+        if (prefix != null) {  // else leave namespace null here
+            namespace = Namespace.getNamespace((String) prefix, (String) uri);
+        }
+    }
+}

src/org/jdom/filter/Filter.java

@@ -0,0 +1,76 @@
+/*-- 
+
+ $Id: Filter.java,v 1.10 2007/11/10 05:29:00 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.filter;
+
+
+/**
+ * A generalized filter to restrict visibility or mutability on a list.
+ *
+ * @version $Revision: 1.10 $, $Date: 2007/11/10 05:29:00 $
+ * @author  Jools Enticknap
+ * @author  Bradley S. Huffman
+ */
+public interface Filter extends java.io.Serializable {
+    /**
+     * Check to see if the object matches a predefined set of rules.
+     *
+     * @param obj The object to verify.
+     * @return <code>true</code> if the object matches a predfined 
+     *           set of rules.
+     */
+    public boolean matches(Object obj);
+}

src/org/jdom/filter/NegateFilter.java

@@ -0,0 +1,113 @@
+/*--
+
+ $Id: NegateFilter.java,v 1.4 2007/11/10 05:29:00 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.filter;
+
+/**
+ * Filter that is the logical <b>negation</b> operation of another filter.
+ *
+ *
+ * @author Bradley S. Huffman
+ * @version $Revision: 1.4 $, $Date: 2007/11/10 05:29:00 $
+ */
+final class NegateFilter extends AbstractFilter {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: NegateFilter.java,v $ $Revision: 1.4 $ $Date: 2007/11/10 05:29:00 $";
+
+    // Underlying filter.
+    private Filter filter;
+
+    /**
+     * Match if the supplied filter <b>does not</b> match.
+     *
+     * @param filter filter to use.
+     */
+    public NegateFilter(Filter filter) {
+        this.filter = filter;
+    }
+
+    public boolean matches(Object obj) {
+        return !filter.matches(obj);
+    }
+
+    public Filter negate() {
+        return filter;
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (obj instanceof NegateFilter) {
+            return filter.equals(((NegateFilter) obj).filter);
+        }
+        return false;
+    }
+
+    public int hashCode() {
+        return ~filter.hashCode();
+    }
+
+    public String toString() {
+        return new StringBuffer(64)
+                   .append("[NegateFilter: ")
+                   .append(filter.toString())
+                   .append("]")
+                   .toString();
+    }
+}

src/org/jdom/filter/OrFilter.java

@@ -0,0 +1,125 @@
+/*--
+
+ $Id: OrFilter.java,v 1.5 2007/11/10 05:29:00 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.filter;
+
+/**
+ * Allow two filters to be chained together with a logical
+ * <b>or</b> operation.
+ *
+ * @author Bradley S. Huffman
+ * @version $Revision: 1.5 $, $Date: 2007/11/10 05:29:00 $
+ */
+final class OrFilter extends AbstractFilter {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: OrFilter.java,v $ $Revision: 1.5 $ $Date: 2007/11/10 05:29:00 $";
+
+    /** Filter for left side of logical <b>or</b> */
+    private Filter left;
+
+    /** Filter for right side of logical <b>or</b> */
+    private Filter right;
+
+    /**
+     * Match if either of the supplied filters.
+     *
+     * @param left left side of logical <b>or</b>
+     * @param right right side of logical <b>or</b>
+     * @throws IllegalArgumentException if either supplied filter is null
+     */
+    public OrFilter(Filter left, Filter right) {
+        if ((left == null) || (right == null)) {
+            throw new IllegalArgumentException("null filter not allowed");
+        }
+        this.left = left;
+        this.right = right;
+    }
+
+    public boolean matches(Object obj) {
+        return left.matches(obj) || right.matches(obj);
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (obj instanceof OrFilter) {
+            OrFilter filter = (OrFilter) obj;
+            if ((left.equals(filter.left)  && right.equals(filter.right)) ||
+                (left.equals(filter.right) && right.equals(filter.left))) {
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    public int hashCode() {
+        return (31 * left.hashCode()) + right.hashCode();
+    }
+
+    public String toString() {
+        return new StringBuffer(64)
+                   .append("[OrFilter: ")
+                   .append(left.toString())
+                   .append(",\n")
+                   .append("           ")
+                   .append(right.toString())
+                   .append("]")
+                   .toString();
+    }
+}

src/org/jdom/filter/package.html

@@ -0,0 +1,9 @@
+<body>
+
+Classes to programmatically filter nodes of a document based on type, name,
+value, or other aspects and to boolean and/or/negate these rules.  Filters can
+be used in methods like getContent(Filter) and getDescendants(Filter).  A
+sampling of generally useful filters are provided here.  Alternate filters can
+be user defined.
+
+</body>

src/org/jdom/input/BuilderErrorHandler.java

@@ -0,0 +1,111 @@
+/*-- 
+
+ $Id: BuilderErrorHandler.java,v 1.13 2007/11/10 05:29:00 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.input;
+
+import org.xml.sax.*;
+
+/**
+ * The standard JDOM error handler implementation.
+ * 
+ * @author  Jason Hunter
+ * @version $Revision: 1.13 $, $Date: 2007/11/10 05:29:00 $
+ */
+
+public class BuilderErrorHandler implements ErrorHandler {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: BuilderErrorHandler.java,v $ $Revision: 1.13 $ $Date: 2007/11/10 05:29:00 $ $Name: jdom_1_1 $";
+
+    /**
+     * This method is called when a warning has occurred; this indicates
+     * that while no XML rules were broken, something appears to be
+     * incorrect or missing.
+     * The implementation of this method here is a "no op".
+     *
+     * @param exception <code>SAXParseException</code> that occurred.
+     * @throws SAXException when things go wrong
+     */
+    public void warning(SAXParseException exception) throws SAXException {
+        // nothing
+    }
+
+    /**
+     * This method is called in response to an error that has occurred; 
+     * this indicates that a rule was broken, typically in validation, but 
+     * that parsing could reasonably continue.
+     * The implementation of this method here is to rethrow the exception.
+     *
+     * @param exception <code>SAXParseException</code> that occurred.
+     * @throws SAXException when things go wrong
+     */
+    public void error(SAXParseException exception) throws SAXException {
+        throw exception;
+    }
+
+    /**
+     * This method is called in response to a fatal error; this indicates that
+     * a rule has been broken that makes continued parsing either impossible
+     * or an almost certain waste of time.
+     * The implementation of this method here is to rethrow the exception.
+     *
+     * @param exception <code>SAXParseException</code> that occurred.
+     * @throws SAXException when things go wrong
+     */
+    public void fatalError(SAXParseException exception) throws SAXException {
+        throw exception;
+    }
+}

src/org/jdom/input/DOMBuilder.java

@@ -0,0 +1,341 @@
+/*--
+
+ $Id: DOMBuilder.java,v 1.60 2007/11/10 05:29:00 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.input;
+
+import org.jdom.*;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.w3c.dom.*;
+
+/**
+ * Builds a JDOM {@link org.jdom.Document org.jdom.Document} from a pre-existing
+ * DOM {@link org.w3c.dom.Document org.w3c.dom.Document}. Also handy for testing
+ * builds from files to sanity check {@link SAXBuilder}.
+ *
+ * @version $Revision: 1.60 $, $Date: 2007/11/10 05:29:00 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ * @author  Philip Nelson
+ * @author  Kevin Regan
+ * @author  Yusuf Goolamabbas
+ * @author  Dan Schaffer
+ * @author  Bradley S. Huffman
+ */
+public class DOMBuilder {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: DOMBuilder.java,v $ $Revision: 1.60 $ $Date: 2007/11/10 05:29:00 $ $Name: jdom_1_1 $";
+
+    /** Adapter class to use */
+    private String adapterClass;
+
+    /** The factory for creating new JDOM objects */
+    private JDOMFactory factory = new DefaultJDOMFactory();
+
+    /**
+     * This creates a new DOMBuilder which will attempt to first locate
+     * a parser via JAXP, then will try to use a set of default parsers.
+     * The underlying parser will not validate.
+     */
+    public DOMBuilder() {
+    }
+
+    /**
+     * This creates a new DOMBuilder using the specified DOMAdapter
+     * implementation as a way to choose the underlying parser.
+     * The underlying parser will not validate.
+     *
+     * @param adapterClass <code>String</code> name of class
+     *                     to use for DOM building.
+     */
+    public DOMBuilder(String adapterClass) {
+        this.adapterClass = adapterClass;
+    }
+
+    /*
+     * This sets a custom JDOMFactory for the builder.  Use this to build
+     * the tree with your own subclasses of the JDOM classes.
+     *
+     * @param factory <code>JDOMFactory</code> to use
+     */
+    public void setFactory(JDOMFactory factory) {
+        this.factory = factory;
+    }
+
+    /**
+     * Returns the current {@link org.jdom.JDOMFactory} in use.
+     * @return the factory in use
+     */
+    public JDOMFactory getFactory() {
+        return factory;
+    }
+
+    /**
+     * This will build a JDOM tree from an existing DOM tree.
+     *
+     * @param domDocument <code>org.w3c.dom.Document</code> object
+     * @return <code>Document</code> - JDOM document object.
+     */
+    public Document build(org.w3c.dom.Document domDocument) {
+        Document doc = factory.document(null);
+        buildTree(domDocument, doc, null, true);
+        return doc;
+    }
+
+    /**
+     * This will build a JDOM Element from an existing DOM Element
+     *
+     * @param domElement <code> org.w3c.dom.Element</code> object
+     * @return <code>Element</code> - JDOM Element object
+     */
+    public org.jdom.Element build(org.w3c.dom.Element domElement) {
+        Document doc = factory.document(null);
+        buildTree(domElement, doc, null, true);
+        return doc.getRootElement();
+    }
+
+    /**
+     * This takes a DOM <code>Node</code> and builds up
+     * a JDOM tree, recursing until the DOM tree is exhausted
+     * and the JDOM tree results.
+     *
+     * @param node <code>Code</node> to examine.
+     * @param doc JDOM <code>Document</code> being built.
+     * @param current <code>Element</code> that is current parent.
+     * @param atRoot <code>boolean</code> indicating whether at root level.
+     */
+    private void buildTree(Node node,
+                           Document doc,
+                           Element current,
+                           boolean atRoot) {
+        // Recurse through the tree
+        switch (node.getNodeType()) {
+            case Node.DOCUMENT_NODE:
+                NodeList nodes = node.getChildNodes();
+                for (int i=0, size=nodes.getLength(); i<size; i++) {
+                    buildTree(nodes.item(i), doc, current, true);
+                }
+                break;
+
+            case Node.ELEMENT_NODE:
+                String nodeName = node.getNodeName();
+                String prefix = "";
+                String localName = nodeName;
+                int colon = nodeName.indexOf(':');
+                if (colon >= 0) {
+                    prefix = nodeName.substring(0, colon);
+                    localName = nodeName.substring(colon + 1);
+                }
+
+                // Get element's namespace
+                Namespace ns = null;
+                String uri = node.getNamespaceURI();
+                if (uri == null) {
+                    ns = (current == null) ? Namespace.NO_NAMESPACE
+                                           : current.getNamespace(prefix);
+                }
+                else {
+                    ns = Namespace.getNamespace(prefix, uri);
+                }
+
+                Element element = factory.element(localName, ns);
+
+                if (atRoot) {
+                    // If at root, set as document root
+                    doc.setRootElement(element);  // XXX should we use a factory call?
+                } else {
+                    // else add to parent element
+                    factory.addContent(current, element);
+                }
+
+                // Add namespaces
+                NamedNodeMap attributeList = node.getAttributes();
+                int attsize = attributeList.getLength();
+
+                for (int i = 0; i < attsize; i++) {
+                    Attr att = (Attr) attributeList.item(i);
+
+                    String attname = att.getName();
+                    if (attname.startsWith("xmlns")) {
+                        String attPrefix = "";
+                        colon = attname.indexOf(':');
+                        if (colon >= 0) {
+                            attPrefix = attname.substring(colon + 1);
+                        }
+
+                        String attvalue = att.getValue();
+
+                        Namespace declaredNS =
+                            Namespace.getNamespace(attPrefix, attvalue);
+
+                        // Add as additional namespaces if it's different
+                        // than this element's namespace (perhaps we should
+                        // also have logic not to mark them as additional if
+                        // it's been done already, but it probably doesn't
+                        // matter)
+                        if (prefix.equals(attPrefix)) {
+                            element.setNamespace(declaredNS);
+                        }
+                        else {
+                            factory.addNamespaceDeclaration(element, declaredNS);
+                        }
+                    }
+                }
+
+                // Add attributes
+                for (int i = 0; i < attsize; i++) {
+                    Attr att = (Attr) attributeList.item(i);
+
+                    String attname = att.getName();
+
+                    if ( !attname.startsWith("xmlns")) {
+                        String attPrefix = "";
+                        String attLocalName = attname;
+                        colon = attname.indexOf(':');
+                        if (colon >= 0) {
+                            attPrefix = attname.substring(0, colon);
+                            attLocalName = attname.substring(colon + 1);
+                        }
+
+                        String attvalue = att.getValue();
+
+                        // Get attribute's namespace
+                        Namespace attns = null;
+                        if ("".equals(attPrefix)) {
+                            attns = Namespace.NO_NAMESPACE;
+                        }
+                        else {
+                            attns = element.getNamespace(attPrefix);
+                        }
+
+                        Attribute attribute =
+                            factory.attribute(attLocalName, attvalue, attns);
+                        factory.setAttribute(element, attribute);
+                    }
+                }
+
+                // Recurse on child nodes
+                // The list should never be null nor should it ever contain
+                // null nodes, but some DOM impls are broken
+                NodeList children = node.getChildNodes();
+                if (children != null) {
+                    int size = children.getLength();
+                    for (int i = 0; i < size; i++) {
+                        Node item = children.item(i);
+                        if (item != null) {
+                            buildTree(item, doc, element, false);
+                        }
+                    }
+                }
+                break;
+
+            case Node.TEXT_NODE:
+                String data = node.getNodeValue();
+                factory.addContent(current, factory.text(data));
+                break;
+
+            case Node.CDATA_SECTION_NODE:
+                String cdata = node.getNodeValue();
+                factory.addContent(current, factory.cdata(cdata));
+                break;
+
+
+            case Node.PROCESSING_INSTRUCTION_NODE:
+                if (atRoot) {
+                    factory.addContent(doc,
+                        factory.processingInstruction(node.getNodeName(),
+                                                      node.getNodeValue()));
+                } else {
+                    factory.addContent(current,
+                        factory.processingInstruction(node.getNodeName(),
+                                                      node.getNodeValue()));
+                }
+                break;
+
+            case Node.COMMENT_NODE:
+                if (atRoot) {
+                    factory.addContent(doc, factory.comment(node.getNodeValue()));
+                } else {
+                    factory.addContent(current, factory.comment(node.getNodeValue()));
+                }
+                break;
+
+            case Node.ENTITY_REFERENCE_NODE:
+                EntityRef entity = factory.entityRef(node.getNodeName());
+                factory.addContent(current, entity);
+                break;
+
+            case Node.ENTITY_NODE:
+                // ??
+                break;
+
+            case Node.DOCUMENT_TYPE_NODE:
+                DocumentType domDocType = (DocumentType)node;
+                String publicID = domDocType.getPublicId();
+                String systemID = domDocType.getSystemId();
+                String internalDTD = domDocType.getInternalSubset();
+
+                DocType docType = factory.docType(domDocType.getName());
+                docType.setPublicID(publicID);
+                docType.setSystemID(systemID);
+                docType.setInternalSubset(internalDTD);
+
+                factory.addContent(doc, docType);
+                break;
+        }
+    }
+}

src/org/jdom/input/JAXPParserFactory.java

@@ -0,0 +1,179 @@
+/*--
+
+ $Id: JAXPParserFactory.java,v 1.6 2007/11/10 05:29:00 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.input;
+
+import java.util.*;
+
+import javax.xml.parsers.*;
+
+import org.jdom.*;
+import org.xml.sax.*;
+
+/**
+ * A non-public utility class to allocate JAXP SAX parsers.
+ *
+ * @version $Revision: 1.6 $, $Date: 2007/11/10 05:29:00 $
+ * @author  Laurent Bihanic
+ */
+class JAXPParserFactory {               // package protected
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: JAXPParserFactory.java,v $ $Revision: 1.6 $ $Date: 2007/11/10 05:29:00 $ $Name: jdom_1_1 $";
+
+    /** JAXP 1.2 schema language property id. */
+    private static final String JAXP_SCHEMA_LANGUAGE_PROPERTY =
+       "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+
+    /** JAXP 1.2 schema location property id. */
+    private static final String JAXP_SCHEMA_LOCATION_PROPERTY =
+       "http://java.sun.com/xml/jaxp/properties/schemaSource";
+
+    /**
+     * Private constructor to forbid allocating instances of this utility
+     * class.
+     */
+    private JAXPParserFactory() {
+        // Never called.
+    }
+
+    /* Implementor's note regarding createParser() design: The features and
+    properties are normally set in SAXBuilder, but we take them in
+    createParser() as well because some features or properties may need to be
+    applied during the JAXP parser construction. Today, for example, properties
+    is used as it's the only way to configure schema validation: JAXP defines
+    schema validation properties but SAX does not. This reflects in the Apache
+    Xerces implementation where the SAXParser implementation supports the JAXP
+    properties but the XMLReader does not. Hence, configuring schema validation
+    must be done on the SAXParser object which is only visible in
+    JAXParserFactory. Features is also passed in case some future JAXP release
+    defines JAXP-specific features.
+     */
+
+    /**
+     * Creates a SAX parser allocated through the configured JAXP SAX
+     * parser factory.
+     *
+     * @param  validating   whether a validating parser is requested.
+     * @param  features     the user-defined SAX features.
+     * @param  properties   the user-defined SAX properties.
+     *
+     * @return a configured XMLReader.
+     *
+     * @throws JDOMException if any error occurred when allocating or
+     *                       configuring the JAXP SAX parser.
+     */
+    public static XMLReader createParser(boolean validating,
+                          Map features, Map properties) throws JDOMException {
+        try {
+            SAXParser parser = null;
+
+            // Allocate and configure JAXP SAX parser factory.
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            factory.setValidating(validating);
+            factory.setNamespaceAware(true);
+
+            try {
+                // Allocate parser.
+                parser = factory.newSAXParser();
+            }
+            catch (ParserConfigurationException e) {
+                throw new JDOMException("Could not allocate JAXP SAX Parser", e);
+            }
+
+            // Set user-defined JAXP properties (if any)
+            setProperty(parser, properties, JAXP_SCHEMA_LANGUAGE_PROPERTY);
+            setProperty(parser, properties, JAXP_SCHEMA_LOCATION_PROPERTY);
+
+            // Return configured SAX XMLReader.
+            return parser.getXMLReader();
+        }
+        catch (SAXException e) {
+            throw new JDOMException("Could not allocate JAXP SAX Parser", e);
+        }
+    }
+
+    /**
+     * Sets a property on a JAXP SAX parser object if and only if it
+     * is declared in the user-defined properties.
+     *
+     * @param  parser       the JAXP SAX parser to configure.
+     * @param  properties   the user-defined SAX properties.
+     * @param  name         the name of the property to set.
+     *
+     * @throws JDOMException if any error occurred while configuring
+     *                       the property.
+     */
+    private static void setProperty(SAXParser parser,
+                        Map properties, String name) throws JDOMException {
+        try {
+            if (properties.containsKey(name)) {
+                parser.setProperty(name, properties.get(name));
+            }
+        }
+        catch (SAXNotSupportedException e) {
+            throw new JDOMException(
+                name + " property not supported for JAXP parser " +
+                parser.getClass().getName());
+        }
+        catch (SAXNotRecognizedException e) {
+            throw new JDOMException(
+                name + " property not recognized for JAXP parser " +
+                parser.getClass().getName());
+        }
+    }
+}
+

src/org/jdom/input/JDOMParseException.java

@@ -0,0 +1,175 @@
+/*--
+
+ $Id: JDOMParseException.java,v 1.8 2007/11/10 05:29:00 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.input;
+
+import org.jdom.*;
+import org.xml.sax.*;
+
+/**
+ * Thrown during parse errors, with information about where the parse error
+ * occurred as well as access to the partially built document.
+ *
+ * @version $Revision: 1.8 $, $Date: 2007/11/10 05:29:00 $
+ * @author  Laurent Bihanic
+ */
+public class JDOMParseException extends JDOMException {
+
+    private static final String CVS_ID =
+      "@(#) $RCSfile: JDOMParseException.java,v $ $Revision: 1.8 $ $Date: 2007/11/10 05:29:00 $ $Name: jdom_1_1 $";
+
+    /**
+     * The portion of the document that was successfully built before
+     * the parse error occurred.
+     */
+    private final Document partialDocument;
+
+    /**
+     * This will create a parse <code>Exception</code> with the given
+     * message and wrap the <code>Exception</code> that cause a document
+     * parse to fail.
+     *
+     * @param message <code>String</code> message indicating
+     *                the problem that occurred.
+     * @param cause <code>Throwable</code> that caused this
+     *              to be thrown.
+     */
+    public JDOMParseException(String message, Throwable cause)  {
+        this(message, cause, null);
+    }
+
+    /**
+     * This will create a parse <code>Exception</code> with the given
+     * message and the partial document and wrap the
+     * <code>Exception</code> that cause a document parse to fail.
+     *
+     * @param message <code>String</code> message indicating
+     *                the problem that occurred.
+     * @param cause <code>Throwable</code> that caused this
+     *              to be thrown.
+     * @param partialDocument <code>Document</code> the portion of
+     *                        the input XML document that was
+     *                        successfully built.
+     */
+    public JDOMParseException(String message, Throwable cause,
+                              Document partialDocument)  {
+        super(message, cause);
+        this.partialDocument = partialDocument;
+    }
+
+    /**
+     * Returns the partial document that was successfully built before
+     * the error occurred.
+     *
+     * @return the partial document or null if none.
+     */
+    public Document getPartialDocument() {
+        return partialDocument;
+    }
+
+    /**
+     * Returns the public identifier of the entity where the
+     * parse error occurred.
+     *
+     * @return a string containing the public identifier, or
+     *         <code>null</code> if the information is not available.
+     */
+    public String getPublicId() {
+        return (getCause() instanceof SAXParseException)?
+                        ((SAXParseException)getCause()).getPublicId(): null;
+    }
+
+    /**
+     * Returns the system identifier of the entity where the
+     * parse error occurred.
+     *
+     * @return a string containing the system identifier, or
+     *         <code>null</code> if the information is not available.
+     */
+    public String getSystemId() {
+        return (getCause() instanceof SAXParseException)?
+                        ((SAXParseException)getCause()).getSystemId(): null;
+    }
+
+    /**
+     * Returns the line number of the end of the text where the
+     * parse error occurred.
+     * <p>
+     * The first line in the document is line 1.</p>
+     *
+     * @return an integer representing the line number, or -1
+     *         if the information is not available.
+     */
+    public int getLineNumber() {
+        return (getCause() instanceof SAXParseException)?
+                        ((SAXParseException)getCause()).getLineNumber(): -1;
+    }
+
+    /**
+     * Returns the column number of the end of the text where the
+     * parse error occurred.
+     * <p>
+     * The first column in a line is position 1.</p>
+     *
+     * @return an integer representing the column number, or -1
+     *         if the information is not available.
+     */
+    public int getColumnNumber() {
+        return (getCause() instanceof SAXParseException)?
+                        ((SAXParseException)getCause()).getColumnNumber(): -1;
+    }
+}
+

src/org/jdom/input/TextBuffer.java

@@ -0,0 +1,186 @@
+/*--
+
+ $Id: TextBuffer.java,v 1.10 2007/11/10 05:29:00 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.input;
+
+import org.jdom.*;
+
+/**
+ * A non-public utility class similar to StringBuffer but optimized for XML
+ * parsing where the common case is that you get only one chunk of characters
+ * per text section. TextBuffer stores the first chunk of characters in a
+ * String, which can just be returned directly if no second chunk is received.
+ * Subsequent chunks are stored in a supplemental char array (like StringBuffer
+ * uses). In this case, the returned text will be the first String chunk,
+ * concatenated with the subsequent chunks stored in the char array. This
+ * provides optimal performance in the common case, while still providing very
+ * good performance in the uncommon case. Furthermore, avoiding StringBuffer
+ * means that no extra unused char array space will be kept around after parsing
+ * is through.
+ *
+ * @version $Revision: 1.10 $, $Date: 2007/11/10 05:29:00 $
+ * @author  Bradley S. Huffman
+ * @author  Alex Rosen
+ */
+class TextBuffer {
+
+    private static final String CVS_ID =
+    "@(#) $RCSfile: TextBuffer.java,v $ $Revision: 1.10 $ $Date: 2007/11/10 05:29:00 $ $Name: jdom_1_1 $";
+
+    /** The first part of the text value (the "prefix"). If null, the
+      * text value is the empty string. */
+    private String prefixString;
+
+    /** The rest of the text value (the "suffix"). Only the first 
+      * code>arraySize</code> characters are valid. */
+    private char[] array;
+
+    /** The size of the rest of the text value. If zero, then only 
+      * code>prefixString</code> contains the text value. */
+    private int arraySize;
+
+    /** Constructor */
+    TextBuffer() {
+        array = new char[4096]; // initial capacity
+        arraySize = 0;
+    }
+
+    /** Append the specified text to the text value of this buffer. */
+    void append(char[] source, int start, int count) {
+        if (prefixString == null) {
+            // This is the first chunk, so we'll store it in the prefix string
+            prefixString = new String(source, start, count);
+        }
+        else {
+            // This is a subsequent chunk, so we'll add it to the char array
+            ensureCapacity(arraySize + count);
+            System.arraycopy(source, start, array, arraySize, count);
+            arraySize += count;
+        }
+    }
+
+    /** Returns the size of the text value. */
+    int size() {
+        if (prefixString == null) {
+            return 0;
+        }
+        else {
+            return prefixString.length() + arraySize;
+        }
+    }
+
+    /** Clears the text value and prepares the TextBuffer for reuse. */
+    void clear() {
+        arraySize = 0;
+        prefixString = null;
+    }
+
+    boolean isAllWhitespace() {
+        if ((prefixString == null) || (prefixString.length() == 0)) {
+            return true;
+        }
+
+        int size = prefixString.length();
+        for(int i = 0; i < size; i++) {
+            if ( !Verifier.isXMLWhitespace(prefixString.charAt(i))) {
+                return false;
+            }
+        }
+
+        for(int i = 0; i < arraySize; i++) {
+            if ( !Verifier.isXMLWhitespace(array[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /** Returns the text value stored in the buffer. */
+    public String toString() {
+        if (prefixString == null) {
+            return "";
+        }
+
+        String str = "";
+        if (arraySize == 0) {
+            // Char array is empty, so the text value is just prefixString.
+            str = prefixString;
+        }
+        else {
+            // Char array is not empty, so the text value is prefixString
+            // plus the char array.
+            str = new StringBuffer(prefixString.length() + arraySize)
+                    .append(prefixString)
+                    .append(array, 0, arraySize)
+                    .toString();
+        }
+        return str;
+    }
+
+    // Ensure that the char array has room for at least "csize" characters.
+    private void ensureCapacity(int csize) {
+        int capacity = array.length;
+        if (csize > capacity) {
+            char[] old = array;
+            int nsize = capacity;
+            while (csize > nsize) {
+                nsize += (capacity/2);
+            }
+            array = new char[nsize];
+            System.arraycopy(old, 0, array, 0, arraySize);
+        }
+    }
+}

src/org/jdom/input/package.html

@@ -0,0 +1,10 @@
+<body>
+
+Classes to build JDOM documents from various sources.  The most common builder
+class is SAXBuilder which constructs a JDOM document using a SAX parser and
+can pull content from files, streams, sockets, readers, and so on.  It can use
+any underlying SAX parser to handle the parsing chores.  SAXHandler provides
+support for SAXBuilder.  DOMBuilder lets you build from a pre-existing DOM
+tree.
+
+</body>

src/org/jdom/output/DOMOutputter.java

@@ -0,0 +1,454 @@
+/*-- 
+
+ $Id: DOMOutputter.java,v 1.43 2007/11/10 05:29:01 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+
+package org.jdom.output;
+
+import java.util.*;
+
+import org.jdom.*;
+import org.jdom.adapters.*;
+
+
+/**
+ * Outputs a JDOM {@link org.jdom.Document org.jdom.Document} as a DOM {@link
+ * org.w3c.dom.Document org.w3c.dom.Document}.
+ *
+ * @version $Revision: 1.43 $, $Date: 2007/11/10 05:29:01 $
+ * @author  Brett McLaughlin
+ * @author  Jason Hunter
+ * @author  Matthew Merlo
+ * @author  Dan Schaffer
+ * @author  Yusuf Goolamabbas
+ * @author  Bradley S. Huffman
+ */
+public class DOMOutputter {
+
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: DOMOutputter.java,v $ $Revision: 1.43 $ $Date: 2007/11/10 05:29:01 $ $Name: jdom_1_1 $";
+
+    /** Default adapter class */
+    private static final String DEFAULT_ADAPTER_CLASS =
+        "org.jdom.adapters.XercesDOMAdapter";
+
+    /** Adapter to use for interfacing with the DOM implementation */
+    private String adapterClass;
+
+    /** Output a DOM with namespaces but just the empty namespace */
+    private boolean forceNamespaceAware;
+
+    /**
+     * This creates a new DOMOutputter which will attempt to first locate
+     * a DOM implementation to use via JAXP, and if JAXP does not exist or
+     * there's a problem, will fall back to the default parser.
+     */
+    public DOMOutputter() {
+        // nothing
+    }
+
+    /**
+     * This creates a new DOMOutputter using the specified DOMAdapter
+     * implementation as a way to choose the underlying parser.
+     *
+     * @param adapterClass <code>String</code> name of class
+     *                     to use for DOM output
+     */
+    public DOMOutputter(String adapterClass) {
+        this.adapterClass = adapterClass;
+    }
+
+    /**
+     * Controls how NO_NAMESPACE nodes are handeled. If true the outputter
+     * always creates a namespace aware DOM.
+     * @param flag
+     */
+    public void setForceNamespaceAware(boolean flag) {
+        this.forceNamespaceAware = flag;
+    }
+
+    /**
+     * Returns whether DOMs will be constructed with namespaces even when
+     * the source document has elements all in the empty namespace.
+     * @return the forceNamespaceAware flag value
+     */
+    public boolean getForceNamespaceAware() {
+        return forceNamespaceAware;
+    }
+
+    /**
+     * This converts the JDOM <code>Document</code> parameter to a 
+     * DOM Document, returning the DOM version.  The DOM implementation
+     * is the one chosen in the constructor.
+     *
+     * @param document <code>Document</code> to output.
+     * @return an <code>org.w3c.dom.Document</code> version
+     */
+    public org.w3c.dom.Document output(Document document)
+                                       throws JDOMException {
+        NamespaceStack namespaces = new NamespaceStack();
+
+        org.w3c.dom.Document domDoc = null;
+        try {
+            // Assign DOCTYPE during construction
+            DocType dt = document.getDocType();
+            domDoc = createDOMDocument(dt);
+
+            // Add content
+            Iterator itr = document.getContent().iterator();
+            while (itr.hasNext()) {
+                Object node = itr.next();
+
+                if (node instanceof Element) {
+                    Element element = (Element) node;
+                    org.w3c.dom.Element domElement =
+                        output(element, domDoc, namespaces);
+                        // Add the root element, first check for existing root
+                        org.w3c.dom.Element root = domDoc.getDocumentElement();
+                        if (root == null) {
+                            // Normal case
+                            domDoc.appendChild(domElement); // normal case
+                        }
+                        else {
+                            // Xerces 1.3 creates new docs with a <root />
+                            // XXX: Need to address DOCTYPE mismatch still
+                            domDoc.replaceChild(domElement, root);
+                        }
+                }
+                else if (node instanceof Comment) {
+                    Comment comment = (Comment) node;
+                    org.w3c.dom.Comment domComment =
+                        domDoc.createComment(comment.getText());
+                    domDoc.appendChild(domComment);
+                }
+                else if (node instanceof ProcessingInstruction) {
+                    ProcessingInstruction pi = 
+                        (ProcessingInstruction) node;
+                    org.w3c.dom.ProcessingInstruction domPI =
+                         domDoc.createProcessingInstruction(
+                         pi.getTarget(), pi.getData());
+                    domDoc.appendChild(domPI);
+                }
+                else if (node instanceof DocType) {
+                    // We already dealt with the DocType above
+                }
+                else {
+                    throw new JDOMException(
+                        "Document contained top-level content with type:" +
+                        node.getClass().getName());
+                }
+            }
+        }
+        catch (Throwable e) {
+            throw new JDOMException("Exception outputting Document", e);
+        }
+
+        return domDoc;
+    }
+
+    private org.w3c.dom.Document createDOMDocument(DocType dt)
+                                       throws JDOMException {
+        if (adapterClass != null) {
+            // The user knows that they want to use a particular impl
+            try {
+                DOMAdapter adapter =
+                    (DOMAdapter)Class.forName(adapterClass).newInstance();
+                // System.out.println("using specific " + adapterClass);
+                return adapter.createDocument(dt);
+            }
+            catch (ClassNotFoundException e) {
+                // e.printStackTrace();
+            }
+            catch (IllegalAccessException e) {
+                // e.printStackTrace();
+            }
+            catch (InstantiationException e) {
+                // e.printStackTrace();
+            }
+        }
+        else {
+            // Try using JAXP...
+            try {
+                DOMAdapter adapter =
+                    (DOMAdapter)Class.forName(
+                    "org.jdom.adapters.JAXPDOMAdapter").newInstance();
+                // System.out.println("using JAXP");
+                return adapter.createDocument(dt);
+            }
+            catch (ClassNotFoundException e) {
+                // e.printStackTrace();
+            }
+            catch (IllegalAccessException e) {
+                // e.printStackTrace();
+            }
+            catch (InstantiationException e) {
+                // e.printStackTrace();
+            }
+        }
+
+        // If no DOM doc yet, try to use a hard coded default
+        try {
+            DOMAdapter adapter = (DOMAdapter)
+                Class.forName(DEFAULT_ADAPTER_CLASS).newInstance();
+            return adapter.createDocument(dt);
+            // System.out.println("Using default " +
+            //   DEFAULT_ADAPTER_CLASS);
+        }
+        catch (ClassNotFoundException e) {
+            // e.printStackTrace();
+        }
+        catch (IllegalAccessException e) {
+            // e.printStackTrace();
+        }
+        catch (InstantiationException e) {
+            // e.printStackTrace();
+        }
+
+        throw new JDOMException("No JAXP or default parser available");
+        
+    }
+
+    private org.w3c.dom.Element output(Element element,
+                                         org.w3c.dom.Document domDoc,
+                                         NamespaceStack namespaces)
+                                         throws JDOMException {
+        try {
+            int previouslyDeclaredNamespaces = namespaces.size();
+
+            org.w3c.dom.Element domElement = null;
+            if (element.getNamespace() == Namespace.NO_NAMESPACE) {
+                // No namespace, use createElement
+                domElement = forceNamespaceAware ?
+                             domDoc.createElementNS(null, element.getQualifiedName())
+                             : domDoc.createElement(element.getQualifiedName());            }
+            else {
+                domElement = domDoc.createElementNS(
+                                          element.getNamespaceURI(),
+                                          element.getQualifiedName());
+            }
+
+            // Add namespace attributes, beginning with the element's own
+            // Do this only if it's not the XML namespace and it's
+            // not the NO_NAMESPACE with the prefix "" not yet mapped
+            // (we do output xmlns="" if the "" prefix was already used 
+            // and we need to reclaim it for the NO_NAMESPACE)
+            Namespace ns = element.getNamespace();
+            if (ns != Namespace.XML_NAMESPACE &&
+                           !(ns == Namespace.NO_NAMESPACE && 
+                             namespaces.getURI("") == null)) {
+                String prefix = ns.getPrefix();
+                String uri = namespaces.getURI(prefix);
+                if (!ns.getURI().equals(uri)) { // output a new namespace decl
+                    namespaces.push(ns);
+                    String attrName = getXmlnsTagFor(ns);
+                    domElement.setAttribute(attrName, ns.getURI());
+                }
+            }
+
+            // Add additional namespaces also
+            Iterator itr = element.getAdditionalNamespaces().iterator();
+            while (itr.hasNext()) {
+                Namespace additional = (Namespace)itr.next();
+                String prefix = additional.getPrefix();
+                String uri = namespaces.getURI(prefix);
+                if (!additional.getURI().equals(uri)) {
+                    String attrName = getXmlnsTagFor(additional);
+                    domElement.setAttribute(attrName, additional.getURI());
+                    namespaces.push(additional);
+                }
+            }
+
+            // Add attributes to the DOM element
+            itr = element.getAttributes().iterator();
+            while (itr.hasNext()) {
+                Attribute attribute = (Attribute) itr.next();
+                domElement.setAttributeNode(output(attribute, domDoc));
+                Namespace ns1 = attribute.getNamespace();
+                if ((ns1 != Namespace.NO_NAMESPACE) && 
+                    (ns1 != Namespace.XML_NAMESPACE)) {
+                    String prefix = ns1.getPrefix();
+                    String uri = namespaces.getURI(prefix);
+                    if (!ns1.getURI().equals(uri)) { // output a new decl
+                        String attrName = getXmlnsTagFor(ns1);
+                        domElement.setAttribute(attrName, ns1.getURI());
+                        namespaces.push(ns1);
+                    }
+                }
+                // Crimson doesn't like setAttributeNS() for non-NS attribs
+                if (attribute.getNamespace() == Namespace.NO_NAMESPACE) {
+                    // No namespace, use setAttribute
+                    if (forceNamespaceAware) {
+                        domElement.setAttributeNS(null,
+                                                  attribute.getQualifiedName(),
+                                                  attribute.getValue());
+                    } else {
+                        domElement.setAttribute(attribute.getQualifiedName(),
+                                                attribute.getValue());
+                    }
+                }
+                else {
+                    domElement.setAttributeNS(attribute.getNamespaceURI(),
+                                              attribute.getQualifiedName(),
+                                              attribute.getValue());
+                }
+            }
+
+            // Add content to the DOM element
+            itr = element.getContent().iterator();
+            while (itr.hasNext()) {
+                Object node = itr.next();
+
+                if (node instanceof Element) {
+                    Element e = (Element) node;
+                    org.w3c.dom.Element domElt = output(e, domDoc, namespaces);
+                    domElement.appendChild(domElt);
+                }
+                else if (node instanceof String) {
+                    String str = (String) node;
+                    org.w3c.dom.Text domText = domDoc.createTextNode(str);
+                    domElement.appendChild(domText);
+                }
+                else if (node instanceof CDATA) {
+                    CDATA cdata = (CDATA) node;
+                    org.w3c.dom.CDATASection domCdata =
+                        domDoc.createCDATASection(cdata.getText());
+                    domElement.appendChild(domCdata);
+                }
+                else if (node instanceof Text) {
+                    Text text = (Text) node;
+                    org.w3c.dom.Text domText =
+                        domDoc.createTextNode(text.getText());
+                    domElement.appendChild(domText);
+                }
+                else if (node instanceof Comment) {
+                    Comment comment = (Comment) node;
+                    org.w3c.dom.Comment domComment =
+                        domDoc.createComment(comment.getText());
+                    domElement.appendChild(domComment);
+                }
+                else if (node instanceof ProcessingInstruction) {
+                    ProcessingInstruction pi = 
+                        (ProcessingInstruction) node;
+                    org.w3c.dom.ProcessingInstruction domPI =
+                         domDoc.createProcessingInstruction(
+                         pi.getTarget(), pi.getData());
+                    domElement.appendChild(domPI);
+                }
+                else if (node instanceof EntityRef) {
+                    EntityRef entity = (EntityRef) node;
+                    org.w3c.dom.EntityReference domEntity =
+                        domDoc.createEntityReference(entity.getName());
+                    domElement.appendChild(domEntity);
+                }
+                else {
+                    throw new JDOMException(
+                        "Element contained content with type:" +
+                        node.getClass().getName());
+                }
+            }
+    
+            // Remove declared namespaces from stack
+            while (namespaces.size() > previouslyDeclaredNamespaces) {
+                namespaces.pop();
+            }
+
+            return domElement;
+        }
+        catch (Exception e) {
+            throw new JDOMException("Exception outputting Element " +
+                                    element.getQualifiedName(), e);
+        }
+    }
+
+    private org.w3c.dom.Attr output(Attribute attribute,
+                                      org.w3c.dom.Document domDoc)
+                                      throws JDOMException {
+         org.w3c.dom.Attr domAttr = null;
+         try {
+             if (attribute.getNamespace() == Namespace.NO_NAMESPACE) {
+                 // No namespace, use createAttribute
+                 if (forceNamespaceAware) {
+                     domAttr = domDoc.createAttributeNS(null, attribute.getQualifiedName());
+                 } else {
+                     domAttr = domDoc.createAttribute(attribute.getQualifiedName());
+                 }
+             }
+             else {
+                 domAttr = domDoc.createAttributeNS(attribute.getNamespaceURI(),
+                                                  attribute.getQualifiedName());
+             }
+             domAttr.setValue(attribute.getValue());
+         } catch (Exception e) {
+             throw new JDOMException("Exception outputting Attribute " +
+                                     attribute.getQualifiedName(), e);
+         }
+         return domAttr;
+    }
+
+    /**
+     * This will handle adding any <code>{@link Namespace}</code>
+     * attributes to the DOM tree.
+     *
+     * @param ns <code>Namespace</code> to add definition of
+     */
+    private static String getXmlnsTagFor(Namespace ns) {
+        String attrName = "xmlns";
+        if (!ns.getPrefix().equals("")) {
+            attrName += ":";
+            attrName += ns.getPrefix();
+        }
+        return attrName;
+    }
+}

src/org/jdom/output/EscapeStrategy.java

@@ -0,0 +1,76 @@
+/*--
+
+ $Id: EscapeStrategy.java,v 1.4 2007/11/10 05:29:01 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.output;
+
+/**
+ * Logic to determine which characters should be formatted as character
+ * entities.
+ *
+ * @version $Revision: 1.4 $, $Date: 2007/11/10 05:29:01 $
+ * @author Alex Rosen
+ * @author Bradley S. Huffman
+ * @author Jason Hunter
+ */
+public interface EscapeStrategy {
+
+    /**
+     * Test whether the supplied character should be formatted literally
+     * or as a character entity.
+     */
+    public boolean shouldEscape(char ch);
+}
+

src/org/jdom/output/Format.java

@@ -0,0 +1,608 @@
+/*--
+
+ $Id: Format.java,v 1.13 2007/11/10 05:29:01 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.output;
+
+import java.lang.reflect.Method;
+
+/**
+ * Class to encapsulate XMLOutputter format options.
+ * Typical users can use the standard format configurations obtained by
+ * {@link #getRawFormat} (no whitespace changes),
+ * {@link #getPrettyFormat} (whitespace beautification), and
+ * {@link #getCompactFormat} (whitespace normalization).
+ * <p>
+ * Several modes are available to effect the way textual content is printed.
+ * See the documentation for {@link TextMode} for details.
+ *
+ * @version $Revision: 1.13 $, $Date: 2007/11/10 05:29:01 $
+ * @author Jason Hunter
+ */
+public class Format implements Cloneable {
+
+    private static final String CVS_ID =
+            "@(#) $RCSfile: Format.java,v $ $Revision: 1.13 $ $Date: 2007/11/10 05:29:01 $ $Name: jdom_1_1 $";
+
+    /**
+     * Returns a new Format object that performs no whitespace changes, uses
+     * the UTF-8 encoding, doesn't expand empty elements, includes the
+     * declaration and encoding, and uses the default entity escape strategy.
+     * Tweaks can be made to the returned Format instance without affecting
+     * other instances.
+
+     * @return                     a Format with no whitespace changes
+     */
+    public static Format getRawFormat() {
+        return new Format();
+    }
+
+    /**
+     * Returns a new Format object that performs whitespace beautification with
+     * 2-space indents, uses the UTF-8 encoding, doesn't expand empty elements,
+     * includes the declaration and encoding, and uses the default entity
+     * escape strategy.
+     * Tweaks can be made to the returned Format instance without affecting
+     * other instances.
+     *
+     * @return                     a Format with whitespace beautification
+     */
+    public static Format getPrettyFormat() {
+        Format f = new Format();
+        f.setIndent(STANDARD_INDENT);
+        f.setTextMode(TextMode.TRIM);
+        return f;
+    }
+
+    /**
+     * Returns a new Format object that performs whitespace normalization, uses
+     * the UTF-8 encoding, doesn't expand empty elements, includes the
+     * declaration and encoding, and uses the default entity escape strategy.
+     * Tweaks can be made to the returned Format instance without affecting
+     * other instances.
+     *
+     * @return                     a Format with whitespace normalization
+     */
+    public static Format getCompactFormat() {
+        Format f = new Format();
+        f.setTextMode(TextMode.NORMALIZE);
+        return f;
+    }
+
+    /** standard value to indent by, if we are indenting */
+    private static final String STANDARD_INDENT = "  ";
+
+    /** standard string with which to end a line */
+    private static final String STANDARD_LINE_SEPARATOR = "\r\n";
+
+    /** standard encoding */
+    private static final String STANDARD_ENCODING = "UTF-8";
+
+
+    /** The default indent is no spaces (as original document) */
+    String indent = null;
+
+    /** New line separator */
+    String lineSeparator = STANDARD_LINE_SEPARATOR;
+
+    /** The encoding format */
+    String encoding = STANDARD_ENCODING;
+
+    /** Whether or not to output the XML declaration
+     * - default is <code>false</code> */
+    boolean omitDeclaration = false;
+
+    /** Whether or not to output the encoding in the XML declaration
+     * - default is <code>false</code> */
+    boolean omitEncoding = false;
+
+    /** Whether or not to expand empty elements to
+     * &lt;tagName&gt;&lt;/tagName&gt; - default is <code>false</code> */
+    boolean expandEmptyElements = false;
+
+    /** Whether TrAX output escaping disabling/enabling PIs are ignored
+      * or processed - default is <code>false</code> */
+    boolean ignoreTrAXEscapingPIs = false;
+
+    /** text handling mode */
+    TextMode mode = TextMode.PRESERVE;
+
+    /** entity escape logic */
+    EscapeStrategy escapeStrategy = new DefaultEscapeStrategy(encoding);
+
+    /**
+     * Creates a new Format instance with default (raw) behavior.
+     */
+    private Format() { }
+
+    /**
+     * Sets the {@link EscapeStrategy} to use for character escaping.
+     *
+     * @param strategy the EscapeStrategy to use
+     * @return a pointer to this Format for chaining
+     */
+    public Format setEscapeStrategy(EscapeStrategy strategy) {
+        escapeStrategy = strategy;
+        return this;
+    }
+
+    /**
+     * Returns the current escape strategy
+     *
+     * @return the current escape strategy
+     */
+    public EscapeStrategy getEscapeStrategy() {
+        return escapeStrategy;
+    }
+
+    /**
+     * This will set the newline separator (<code>lineSeparator</code>).
+     * The default is <code>\r\n</code>.  To make it output
+     * the system default line ending string, call
+     * <code>setLineSeparator(System.getProperty("line.separator"))</code>.
+     *
+     * <p>
+     * To output "UNIX-style" documents, call
+     * <code>setLineSeparator("\n")</code>.  To output "Mac-style"
+     * documents, call <code>setLineSeparator("\r")</code>.  DOS-style
+     * documents use CR-LF ("\r\n"), which is the default.
+     * </p>
+     *
+     * <p>
+     * Note that this only applies to newlines generated by the
+     * outputter.  If you parse an XML document that contains newlines
+     * embedded inside a text node, and you do not set TextMode.NORMALIZE,
+     * then the newlines will be output
+     * verbatim, as "\n" which is how parsers normalize them.
+     * </p>
+     *
+     * <p>
+     * If the format's "indent" property is null (as is the default
+     * for the Raw and Compact formats), then this value only effects the
+     * newlines written after the declaration and doctype.
+     * </p>
+     *
+     * @see #setTextMode
+     *
+     * @param separator <code>String</code> line separator to use.
+     * @return a pointer to this Format for chaining
+     */
+    public Format setLineSeparator(String separator) {
+        this.lineSeparator = separator;
+        return this;
+    }
+
+    /**
+     * Returns the current line separator.
+     *
+     * @return the current line separator
+     */
+    public String getLineSeparator() {
+        return lineSeparator;
+    }
+
+    /**
+     * This will set whether the XML declaration
+     * (<code>&lt;&#063;xml version="1&#046;0"
+     * encoding="UTF-8"&#063;&gt;</code>)
+     * includes the encoding of the document. It is common to omit
+     * this in uses such as WML and other wireless device protocols.
+     *
+     * @param omitEncoding <code>boolean</code> indicating whether or not
+     *        the XML declaration should indicate the document encoding.
+     * @return a pointer to this Format for chaining
+     */
+    public Format setOmitEncoding(boolean omitEncoding) {
+        this.omitEncoding = omitEncoding;
+        return this;
+    }
+
+    /**
+     * Returns whether the XML declaration encoding will be omitted.
+     *
+     * @return whether the XML declaration encoding will be omitted
+     */
+    public boolean getOmitEncoding() {
+        return omitEncoding;
+    }
+
+    /**
+     * This will set whether the XML declaration
+     * (<code>&lt;&#063;xml version="1&#046;0"&#063;gt;</code>)
+     * will be omitted or not. It is common to omit this in uses such
+     * as SOAP and XML-RPC calls.
+     *
+     * @param omitDeclaration <code>boolean</code> indicating whether or not
+     *        the XML declaration should be omitted.
+     * @return a pointer to this Format for chaining
+     */
+    public Format setOmitDeclaration(boolean omitDeclaration) {
+        this.omitDeclaration = omitDeclaration;
+        return this;
+    }
+
+    /**
+     * Returns whether the XML declaration will be omitted.
+     *
+     * @return whether the XML declaration will be omitted
+     */
+    public boolean getOmitDeclaration() {
+        return omitDeclaration;
+    }
+
+    /**
+     * This will set whether empty elements are expanded from
+     * <code>&lt;tagName/&gt;</code> to
+     * <code>&lt;tagName&gt;&lt;/tagName&gt;</code>.
+     *
+     * @param expandEmptyElements <code>boolean</code> indicating whether or not
+     *        empty elements should be expanded.
+     * @return a pointer to this Format for chaining
+     */
+    public Format setExpandEmptyElements(boolean expandEmptyElements) {
+        this.expandEmptyElements = expandEmptyElements;
+        return this;
+    }
+
+    /**
+     * Returns whether empty elements are expanded.
+     *
+     * @return whether empty elements are expanded
+     */
+    public boolean getExpandEmptyElements() {
+        return expandEmptyElements;
+    }
+
+    /**
+     * This will set whether JAXP TrAX processing instructions for
+     * disabling/enabling output escaping are ignored.  Disabling
+     * output escaping allows using XML text as element content and
+     * outputing it verbatim, i&#46;e&#46; as element children would be.
+     * <p>
+     * When processed, these processing instructions are removed from
+     * the generated XML text and control whether the element text
+     * content is output verbatim or with escaping of the pre-defined
+     * entities in XML 1.0.  The text to be output verbatim shall be
+     * surrounded by the
+     * <code>&lt;?javax.xml.transform.disable-output-escaping ?&gt;</code>
+     * and <code>&lt;?javax.xml.transform.enable-output-escaping ?&gt;</code>
+     * PIs.</p>
+     * <p>
+     * When ignored, the processing instructions are present in the
+     * generated XML text and the pre-defined entities in XML 1.0 are
+     * escaped.
+     * <p>
+     * Default: <code>false</code>.</p>
+     *
+     * @param ignoreTrAXEscapingPIs <code>boolean</code> indicating
+     *        whether or not TrAX ouput escaping PIs are ignored.
+     *
+     * @see javax.xml.transform.Result#PI_ENABLE_OUTPUT_ESCAPING
+     * @see javax.xml.transform.Result#PI_DISABLE_OUTPUT_ESCAPING
+     */
+    public void setIgnoreTrAXEscapingPIs(boolean ignoreTrAXEscapingPIs) {
+        this.ignoreTrAXEscapingPIs = ignoreTrAXEscapingPIs;
+    }
+
+    /**
+     * Returns whether JAXP TrAX processing instructions for
+     * disabling/enabling output escaping are ignored.
+     *
+     * @return whether or not TrAX ouput escaping PIs are ignored.
+     */
+    public boolean getIgnoreTrAXEscapingPIs() {
+        return ignoreTrAXEscapingPIs;
+    }
+
+    /**
+     * This sets the text output style.  Options are available as static
+     * {@link TextMode} instances.  The default is {@link TextMode#PRESERVE}.
+     *
+     * @return a pointer to this Format for chaining
+     */
+    public Format setTextMode(Format.TextMode mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    /**
+     * Returns the current text output style.
+     *
+     * @return the current text output style
+     */
+    public Format.TextMode getTextMode() {
+        return mode;
+    }
+
+    /**
+     * This will set the indent <code>String</code> to use; this
+     * is usually a <code>String</code> of empty spaces. If you pass
+     * the empty string (""), then no indentation will happen but newlines
+     * will still be generated.  Passing null will result in no indentation
+     * and no newlines generated.  Default: none (null)
+     *
+     * @param indent <code>String</code> to use for indentation.
+     * @return a pointer to this Format for chaining
+     */
+    public Format setIndent(String indent) {
+        this.indent = indent;
+        return this;
+    }
+
+    /**
+     * Returns the indent string in use.
+     *
+     * @return the indent string in use
+     */
+    public String getIndent() {
+        return indent;
+    }
+
+    /**
+     * Sets the output encoding.  The name should be an accepted XML
+     * encoding.
+     *
+     * @param encoding the encoding format.  Use XML-style names like
+     *                 "UTF-8" or "ISO-8859-1" or "US-ASCII"
+     * @return a pointer to this Format for chaining
+     */
+    public Format setEncoding(String encoding) {
+        this.encoding = encoding;
+        escapeStrategy = new DefaultEscapeStrategy(encoding);
+        return this;
+    }
+
+    /**
+     * Returns the configured output encoding.
+     *
+     * @return the output encoding
+     */
+    public String getEncoding() {
+        return encoding;
+    }
+
+    protected Object clone() {
+        Format format = null;
+
+        try {
+            format = (Format) super.clone();
+        }
+        catch (CloneNotSupportedException ce) {
+        }
+
+        return format;
+    }
+
+
+    /**
+     * Handle common charsets quickly and easily.  Use reflection
+     * to query the JDK 1.4 CharsetEncoder class for unknown charsets.
+     * If JDK 1.4 isn't around, default to no special encoding.
+     */
+    class DefaultEscapeStrategy implements EscapeStrategy {
+        private int bits;
+        Object encoder;
+        Method canEncode;
+
+        public DefaultEscapeStrategy(String encoding) {
+            if ("UTF-8".equalsIgnoreCase(encoding) ||
+                    "UTF-16".equalsIgnoreCase(encoding)) {
+                bits = 16;
+            }
+            else if ("ISO-8859-1".equalsIgnoreCase(encoding) ||
+                    "Latin1".equalsIgnoreCase(encoding)) {
+                bits = 8;
+            }
+            else if ("US-ASCII".equalsIgnoreCase(encoding) ||
+                    "ASCII".equalsIgnoreCase(encoding)) {
+                bits = 7;
+            }
+            else {
+                bits = 0;
+                //encoder = Charset.forName(encoding).newEncoder();
+                try {
+                    Class charsetClass = Class.forName("java.nio.charset.Charset");
+                    Class encoderClass = Class.forName("java.nio.charset.CharsetEncoder");
+                    Method forName = charsetClass.getMethod("forName", new Class[]{String.class});
+                    Object charsetObj = forName.invoke(null, new Object[]{encoding});
+                    Method newEncoder = charsetClass.getMethod("newEncoder", null);
+                    encoder = newEncoder.invoke(charsetObj, null);
+                    canEncode = encoderClass.getMethod("canEncode", new Class[]{char.class});
+                }
+                catch (Exception ignored) {
+                }
+            }
+        }
+
+        public boolean shouldEscape(char ch) {
+            if (bits == 16) {
+                return false;
+            }
+            if (bits == 8) {
+                if ((int) ch > 255)
+                    return true;
+                else
+                    return false;
+            }
+            if (bits == 7) {
+                if ((int) ch > 127)
+                    return true;
+                else
+                    return false;
+            }
+            else {
+                if (canEncode != null && encoder != null) {
+                    try {
+                        Boolean val = (Boolean) canEncode.invoke(encoder, new Object[]{new Character(ch)});
+                        return !val.booleanValue();
+                    }
+                    catch (Exception ignored) {
+                    }
+                }
+                // Return false if we don't know.  This risks not escaping
+                // things which should be escaped, but also means people won't
+                // start getting loads of unnecessary escapes.
+                return false;
+            }
+        }
+    }
+
+
+    /**
+     * Class to signify how text should be handled on output.  The following
+     * table provides details.
+     *
+     * <table>
+     *   <tr>
+     *     <th align="left">
+     *       Text Mode
+     *     </th>
+     *     <th>
+     *       Resulting behavior.
+     *     </th>
+     *   </tr>
+     *
+     *   <tr valign="top">
+     *     <td>
+     *       <i>PRESERVE (Default)</i>
+     *     </td>
+     *     <td>
+     *       All content is printed in the format it was created, no whitespace
+     *       or line separators are are added or removed.
+     *     </td>
+     *   </tr>
+     *
+     *   <tr valign="top">
+     *     <td>
+     *       TRIM_FULL_WHITE
+     *     </td>
+     *     <td>
+     *       Content between tags consisting of all whitespace is not printed.
+     *       If the content contains even one non-whitespace character, it is
+     *       printed verbatim, whitespace and all.
+     *     </td>
+     *   </tr>
+     *
+     *   <tr valign="top">
+     *     <td>
+     *       TRIM
+     *     </td>
+     *     <td>
+     *       Same as TrimAllWhite, plus leading/trailing whitespace are
+     *       trimmed.
+     *     </td>
+     *   </tr>
+     *
+     *   <tr valign="top">
+     *     <td>
+     *       NORMALIZE
+     *     </td>
+     *     <td>
+     *       Same as TextTrim, plus addition interior whitespace is compressed
+     *       to a single space.
+     *     </td>
+     *   </tr>
+     * </table>
+     *
+     * In most cases textual content is aligned with the surrounding tags
+     * (after the appropriate text mode is applied). In the case where the only
+     * content between the start and end tags is textual, the start tag, text,
+     * and end tag are all printed on the same line. If the document being
+     * output already has whitespace, it's wise to turn on TRIM mode so the
+     * pre-existing whitespace can be trimmed before adding new whitespace.
+     * <p>
+     * When a element has a xml:space attribute with the value of "preserve",
+     * all formating is turned off and reverts back to the default until the
+     * element and its contents have been printed. If a nested element contains
+     * another xml:space with the value "default" formatting is turned back on
+     * for the child element and then off for the remainder of the parent
+     * element.
+     */
+    public static class TextMode {
+        /**
+         * Mode for literal text preservation.
+         */
+        public static final TextMode PRESERVE = new TextMode("PRESERVE");
+
+        /**
+         * Mode for text trimming (left and right trim).
+         */
+        public static final TextMode TRIM = new TextMode("TRIM");
+
+        /**
+         * Mode for text normalization (left and right trim plus internal
+         * whitespace is normalized to a single space.
+         * @see org.jdom.Element#getTextNormalize
+         */
+        public static final TextMode NORMALIZE = new TextMode("NORMALIZE");
+
+        /**
+         * Mode for text trimming of content consisting of nothing but
+         * whitespace but otherwise not changing output.
+         */
+        public static final TextMode TRIM_FULL_WHITE =
+                new TextMode("TRIM_FULL_WHITE");
+
+        private final String name;
+
+        private TextMode(String name) {
+            this.name = name;
+        }
+
+        public String toString() {
+            return name;
+        }
+    }
+}

src/org/jdom/output/JDOMLocator.java

@@ -0,0 +1,118 @@
+/*-- 
+
+ $Id: JDOMLocator.java,v 1.4 2007/11/10 05:29:01 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.output;
+
+import org.xml.sax.*;
+import org.xml.sax.helpers.*;
+
+/**
+ * An implementation of the SAX {@link Locator} interface that
+ * exposes the JDOM node being processed by SAXOutputter.
+ *
+ * @author Laurent Bihanic
+ *
+ * @version $Revision: 1.4 $, $Date: 2007/11/10 05:29:01 $
+ */
+public class JDOMLocator extends LocatorImpl {
+   
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: JDOMLocator.java,v $ $Revision: 1.4 $ $Date: 2007/11/10 05:29:01 $ $Name: jdom_1_1 $";
+
+    /** The JDOM node being processed by SAXOutputter. */
+    private Object node;
+
+    /**
+     * Default no-arg constructor.
+     */
+    JDOMLocator() {                             // package protected
+        super();
+    }
+
+    /**
+     * Copy contructor.
+     *
+     * @param locator <code>Locator</code> to copy location
+     *                information from.
+     */
+    JDOMLocator(Locator locator) {              // package protected
+        super(locator);
+
+        if (locator instanceof JDOMLocator) {
+            this.setNode(((JDOMLocator)locator).getNode());
+        }
+    }
+
+    /**
+     * Returns the JDOM node being processed by SAXOutputter.
+     *
+     * @return the JDOM node being processed by SAXOutputter.
+     */
+    public Object getNode() {
+        return this.node;
+    }
+
+    /**
+     * Sets the being-processed node.
+     *
+     * @param node <code>Object</code> node currently processed
+     *             by SAXOutputter.
+     */
+    void setNode(Object node) {                 // package protected
+        this.node = node;
+    }
+}
+

src/org/jdom/output/NamespaceStack.java

@@ -0,0 +1,154 @@
+/*-- 
+
+ $Id: NamespaceStack.java,v 1.14 2007/11/10 05:29:01 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+package org.jdom.output;
+
+import java.util.*;
+
+import org.jdom.Namespace;
+
+/**
+ * A non-public utility class used by both <code>{@link XMLOutputter}</code> and
+ * <code>{@link SAXOutputter}</code> to manage namespaces in a JDOM Document
+ * during output.
+ *
+ * @version $Revision: 1.14 $, $Date: 2007/11/10 05:29:01 $
+ * @author  Elliotte Rusty Harolde
+ * @author  Fred Trimble
+ * @author  Brett McLaughlin
+ */
+class NamespaceStack {
+ 
+    private static final String CVS_ID = 
+      "@(#) $RCSfile: NamespaceStack.java,v $ $Revision: 1.14 $ $Date: 2007/11/10 05:29:01 $ $Name: jdom_1_1 $";
+
+    /** The prefixes available */
+    private Stack prefixes;
+
+    /** The URIs available */
+    private Stack uris;        
+
+    /**
+     * This creates the needed storage.
+     */
+    NamespaceStack() {
+        prefixes = new Stack();
+        uris = new Stack();
+    }
+  
+    /**
+     * This will add a new <code>{@link Namespace}</code>
+     * to those currently available.
+     * 
+     * @param ns <code>Namespace</code> to add.
+     */
+    public void push(Namespace ns) {
+        prefixes.push(ns.getPrefix());
+        uris.push(ns.getURI());
+    }      
+    
+    /**
+     * This will remove the topmost (most recently added)
+     * <code>{@link Namespace}</code>, and return its prefix.
+     *
+     * @return <code>String</code> - the popped namespace prefix.
+     */
+    public String pop() {
+        String prefix = (String)prefixes.pop();
+        uris.pop();
+
+        return prefix;
+    }
+    
+    /**
+     * This returns the number of available namespaces.
+     *
+     * @return <code>int</code> - size of the namespace stack.
+     */
+    public int size() {
+        return prefixes.size();     
+    }    
+  
+    /**
+     * Given a prefix, this will return the namespace URI most 
+     * rencently (topmost) associated with that prefix.
+     *
+     * @param prefix <code>String</code> namespace prefix.
+     * @return <code>String</code> - the namespace URI for that prefix.
+     */
+    public String getURI(String prefix) {
+        int index = prefixes.lastIndexOf(prefix);
+        if (index == -1) {
+            return null;
+        }
+        String uri = (String)uris.elementAt(index);
+        return uri;       
+    }
+    
+    /**
+     * This will print out the size and current stack, from the
+     * most recently added <code>{@link Namespace}</code> to
+     * the "oldest," all to <code>System.out</code>.
+     */
+    public String toString() {
+        StringBuffer buf = new StringBuffer();
+        String sep = System.getProperty("line.separator");
+        buf.append("Stack: " + prefixes.size() + sep);
+        for (int i = 0; i < prefixes.size(); i++) {
+            buf.append(prefixes.elementAt(i) + "&" + uris.elementAt(i) + sep);
+        }        
+        return buf.toString();
+    }
+}

src/org/jdom/output/package.html

@@ -0,0 +1,15 @@
+<body>
+
+Classes to output JDOM documents to various destinations.  The most common
+outputter class is XMLOutputter which outputs a document (or part of a
+document) as a stream of bytes.  Format and EscapeStrategy support the
+XMLOutputter in letting you choose how the output should be formatted and how
+special characters should be escaped.
+
+SAXOutputter lets you output as a stream of SAX events (handy especially in
+transformations).  JDOMLocator supports SAXOutputter and helps you observe the
+SAX output process.
+
+DOMOutputter lets you output a JDOM document as a DOM tree.
+
+</body>

src/org/jdom/package.html

@@ -0,0 +1,13 @@
+<body>
+
+Classes to represent the components of an XML document.  The Verifier is a
+special class useful in ensuring well-formedness of documents.  The Parent
+interface is implemented by Document and Element exposing their commonality.
+The Content abstract class is extended by all the node types of a document
+except Document itself.
+
+The JDOMFactory interface and DefaultJDOMFactory standard implementation
+provide advanced users with the ability to create subtypes of the org.jdom
+classes.
+
+</body>

src/org/jdom/transform/JDOMResult.java

@@ -0,0 +1,670 @@
+/*-- 
+
+ $Id: JDOMResult.java,v 1.24 2007/11/10 05:29:02 jhunter Exp $
+
+ Copyright (C) 2001-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.transform;
+
+import java.util.*;
+
+import javax.xml.transform.sax.*;
+
+import org.jdom.*;
+import org.jdom.input.*;
+import org.xml.sax.*;
+import org.xml.sax.ext.*;
+import org.xml.sax.helpers.*;
+
+/**
+ * A holder for an XSL Transformation result, generally a list of nodes
+ * although it can be a JDOM Document also. As stated by the XSLT 1.0
+ * specification, the result tree generated by an XSL transformation is not
+ * required to be a well-formed XML document. The result tree may have "any
+ * sequence of nodes as children that would be possible for an
+ * element node".
+ * <p>
+ * The following example shows how to apply an XSL Transformation
+ * to a JDOM document and get the transformation result in the form
+ * of a list of JDOM nodes:
+ * <pre><code>
+ *   public static List transform(Document doc, String stylesheet)
+ *                                        throws JDOMException {
+ *     try {
+ *       Transformer transformer = TransformerFactory.newInstance()
+ *                             .newTransformer(new StreamSource(stylesheet));
+ *       JDOMSource in = new JDOMSource(doc);
+ *       JDOMResult out = new JDOMResult();
+ *       transformer.transform(in, out);
+ *       return out.getResult();
+ *     }
+ *     catch (TransformerException e) {
+ *       throw new JDOMException("XSLT Transformation failed", e);
+ *     }
+ *   }
+ * </code></pre>
+ *
+ * @see      org.jdom.transform.JDOMSource
+ *
+ * @version $Revision: 1.24 $, $Date: 2007/11/10 05:29:02 $
+ * @author  Laurent Bihanic
+ * @author  Jason Hunter
+ */
+public class JDOMResult extends SAXResult {
+
+    private static final String CVS_ID =
+    "@(#) $RCSfile: JDOMResult.java,v $ $Revision: 1.24 $ $Date: 2007/11/10 05:29:02 $ $Name: jdom_1_1 $";
+
+  /**
+   * If {@link javax.xml.transform.TransformerFactory#getFeature}
+   * returns <code>true</code> when passed this value as an
+   * argument, the Transformer natively supports JDOM.
+   * <p>
+   * <strong>Note</strong>: This implementation does not override
+   * the {@link SAXResult#FEATURE} value defined by its superclass
+   * to be considered as a SAXResult by Transformer implementations
+   * not natively supporting JDOM.</p>
+   */
+  public final static String JDOM_FEATURE =
+                      "http://org.jdom.transform.JDOMResult/feature";
+
+  /**
+   * The result of a transformation, as set by Transformer
+   * implementations that natively support JDOM, as a JDOM document
+   * or a list of JDOM nodes.
+   */
+  private Object result = null;
+
+  /**
+   * Whether the application queried the result (as a list or a
+   * document) since it was last set.
+   */
+  private boolean queried = false;
+
+  /**
+   * The custom JDOM factory to use when building the transformation
+   * result or <code>null</code> to use the default JDOM classes.
+   */
+  private JDOMFactory factory = null;
+
+  /**
+   * Public default constructor.
+   */
+  public JDOMResult() {
+    // Allocate custom builder object...
+    DocumentBuilder builder = new DocumentBuilder();
+
+    // And use it as ContentHandler and LexicalHandler.
+    super.setHandler(builder);
+    super.setLexicalHandler(builder);
+  }
+
+  /**
+   * Sets the object(s) produced as result of an XSL Transformation.
+   * <p>
+   * <strong>Note</strong>: This method shall be used by the
+   * {@link javax.xml.transform.Transformer} implementations that
+   * natively support JDOM to directly set the transformation
+   * result rather than considering this object as a
+   * {@link SAXResult}.  Applications should <i>not</i> use this
+   * method.</p>
+   *
+   * @param  result   the result of a transformation as a
+   *                  {@link java.util.List list} of JDOM nodes
+   *                  (Elements, Texts, Comments, PIs...).
+   *
+   * @see    #getResult
+   */
+  public void setResult(List result) {
+    this.result  = result;
+    this.queried = false;
+  }
+
+  /**
+   * Returns the result of an XSL Transformation as a list of JDOM
+   * nodes.
+   * <p>
+   * If the result of the transformation is a JDOM document,
+   * this method converts it into a list of JDOM nodes; any
+   * subsequent call to {@link #getDocument} will return
+   * <code>null</code>.</p>
+   *
+   * @return the transformation result as a (possibly empty) list of
+   *         JDOM nodes (Elements, Texts, Comments, PIs...).
+   */
+  public List getResult() {
+    List nodes = Collections.EMPTY_LIST;
+
+    // Retrieve result from the document builder if not set.
+    this.retrieveResult();
+
+    if (result instanceof List) {
+      nodes = (List)result;
+    }
+    else {
+      if ((result instanceof Document) && (queried == false)) {
+        List content = ((Document)result).getContent();
+        nodes = new ArrayList(content.size());
+
+        while (content.size() != 0)
+        {
+          Object o = content.remove(0);
+          nodes.add(o);
+        }
+        result = nodes;
+      }
+    }
+    queried = true;
+
+    return (nodes);
+  }
+
+  /**
+   * Sets the document produced as result of an XSL Transformation.
+   * <p>
+   * <strong>Note</strong>: This method shall be used by the
+   * {@link javax.xml.transform.Transformer} implementations that
+   * natively support JDOM to directly set the transformation
+   * result rather than considering this object as a
+   * {@link SAXResult}.  Applications should <i>not</i> use this
+   * method.</p>
+   *
+   * @param  document   the JDOM document result of a transformation.
+   *
+   * @see    #setResult
+   * @see    #getDocument
+   */
+  public void setDocument(Document document) {
+    this.result  = document;
+    this.queried = false;
+  }
+
+  /**
+   * Returns the result of an XSL Transformation as a JDOM document.
+   * <p>
+   * If the result of the transformation is a list of nodes,
+   * this method attempts to convert it into a JDOM document. If
+   * successful, any subsequent call to {@link #getResult} will
+   * return an empty list.</p>
+   * <p>
+   * <strong>Warning</strong>: The XSLT 1.0 specification states that
+   * the output of an XSL transformation is not a well-formed XML
+   * document but a list of nodes. Applications should thus use
+   * {@link #getResult} instead of this method or at least expect
+   * <code>null</code> documents to be returned.
+   *
+   * @return the transformation result as a JDOM document or
+   *         <code>null</code> if the result of the transformation
+   *         can not be converted into a well-formed document.
+   *
+   * @see    #getResult
+   */
+  public Document getDocument() {
+    Document doc = null;
+
+    // Retrieve result from the document builder if not set.
+    this.retrieveResult();
+
+    if (result instanceof Document) {
+      doc = (Document)result;
+    }
+    else {
+      if ((result instanceof List) && (queried == false)) {
+        // Try to create a document from the result nodes
+        try {
+          JDOMFactory f = this.getFactory();
+          if (f == null) { f = new DefaultJDOMFactory(); }
+
+          doc = f.document(null);
+          doc.setContent((List)result);
+
+          result = doc;
+        }
+        catch (RuntimeException ex1) {
+          // Some of the result nodes are not valid children of a
+          // Document node. => return null.
+        }
+      }
+    }
+    queried = true;
+
+    return (doc);
+  }
+
+  /**
+   * Sets a custom JDOMFactory to use when building the
+   * transformation result. Use a custom factory to build the tree
+   * with your own subclasses of the JDOM classes.
+   *
+   * @param  factory   the custom <code>JDOMFactory</code> to use or
+   *                   <code>null</code> to use the default JDOM
+   *                   classes.
+   *
+   * @see    #getFactory
+   */
+  public void setFactory(JDOMFactory factory) {
+    this.factory = factory;
+  }
+
+  /**
+   * Returns the custom JDOMFactory used to build the transformation
+   * result.
+   *
+   * @return the custom <code>JDOMFactory</code> used to build the
+   *         transformation result or <code>null</code> if the
+   *         default JDOM classes are being used.
+   *
+   * @see    #setFactory
+   */
+  public JDOMFactory getFactory() {
+    return this.factory;
+  }
+
+  /**
+   * Checks whether a transformation result has been set and, if not,
+   * retrieves the result tree being built by the document builder.
+   */
+  private void retrieveResult() {
+    if (result == null) {
+      this.setResult(((DocumentBuilder)this.getHandler()).getResult());
+    }
+  }
+
+  //-------------------------------------------------------------------------
+  // SAXResult overwritten methods
+  //-------------------------------------------------------------------------
+
+  /**
+   * Sets the target to be a SAX2 ContentHandler.
+   *
+   * @param handler Must be a non-null ContentHandler reference.
+   */
+  public void setHandler(ContentHandler handler) { }
+
+  /**
+   * Sets the SAX2 LexicalHandler for the output.
+   * <p>
+   * This is needed to handle XML comments and the like.  If the
+   * lexical handler is not set, an attempt should be made by the
+   * transformer to cast the ContentHandler to a LexicalHandler.</p>
+   *
+   * @param handler A non-null LexicalHandler for
+   *                handling lexical parse events.
+   */
+  public void setLexicalHandler(LexicalHandler handler) { }
+
+
+  //=========================================================================
+  // FragmentHandler nested class
+  //=========================================================================
+
+  private static class FragmentHandler extends SAXHandler {
+    /**
+     * A dummy root element required by SAXHandler that can only
+     * cope with well-formed documents.
+     */
+    private Element dummyRoot = new Element("root", null, null);
+
+    /**
+     * Public constructor.
+     */
+    public FragmentHandler(JDOMFactory factory) {
+      super(factory);
+
+      // Add a dummy root element to the being-built document as XSL
+      // transformation can output node lists instead of well-formed
+      // documents.
+      this.pushElement(dummyRoot);
+    }
+
+    /**
+     * Returns the result of an XSL Transformation.
+     *
+     * @return the transformation result as a (possibly empty) list of
+     *         JDOM nodes (Elements, Texts, Comments, PIs...).
+     */
+    public List getResult() {
+      // Flush remaining text content in case the last text segment is
+      // outside an element.
+      try {
+        this.flushCharacters();
+      }
+      catch (SAXException e) { /* Ignore... */  }
+      return this.getDetachedContent(dummyRoot);
+    }
+
+    /**
+     * Returns the content of a JDOM Element detached from it.
+     *
+     * @param  elt   the element to get the content from.
+     *
+     * @return a (possibly empty) list of JDOM nodes, detached from
+     *         their parent.
+     */
+    private List getDetachedContent(Element elt) {
+      List content = elt.getContent();
+      List nodes   = new ArrayList(content.size());
+
+      while (content.size() != 0)
+      {
+        Object o = content.remove(0);
+        nodes.add(o);
+      }
+      return (nodes);
+    }
+  }
+
+  //=========================================================================
+  // DocumentBuilder inner class
+  //=========================================================================
+
+  private class DocumentBuilder extends XMLFilterImpl
+                                implements LexicalHandler {
+    /**
+     * The actual JDOM document builder.
+     */
+    private FragmentHandler saxHandler = null;
+
+    /**
+     * Whether the startDocument event was received. Some XSLT
+     * processors such as Oracle's do not fire this event.
+     */
+    private boolean startDocumentReceived = false;
+
+    /**
+     * Public default constructor.
+     */
+    public DocumentBuilder() { }
+
+    /**
+     * Returns the result of an XSL Transformation.
+     *
+     * @return the transformation result as a (possibly empty) list of
+     *         JDOM nodes (Elements, Texts, Comments, PIs...) or
+     *         <code>null</code> if no new transformation occurred
+     *         since the result of the previous one was returned.
+     */
+    public List getResult() {
+      List result = null;
+
+      if (this.saxHandler != null) {
+        // Retrieve result from SAX content handler.
+        result = this.saxHandler.getResult();
+
+        // Detach the (non-reusable) SAXHandler instance.
+        this.saxHandler = null;
+
+        // And get ready for the next transformation.
+        this.startDocumentReceived = false;
+      }
+      return result;
+    }
+
+    private void ensureInitialization() throws SAXException {
+      // Trigger document initialization if XSLT processor failed to
+      // fire the startDocument event.
+      if (this.startDocumentReceived == false) {
+        this.startDocument();
+      }
+    }
+
+    //-----------------------------------------------------------------------
+    // XMLFilterImpl overwritten methods
+    //-----------------------------------------------------------------------
+
+    /**
+     * <i>[SAX ContentHandler interface support]</i> Processes a
+     * start of document event.
+     * <p>
+     * This implementation creates a new JDOM document builder and
+     * marks the current result as "under construction".</p>
+     *
+     * @throws SAXException   if any error occurred while creating
+     *                        the document builder.
+     */
+    public void startDocument() throws SAXException {
+      this.startDocumentReceived = true;
+
+      // Reset any previously set result.
+      setResult(null);
+
+      // Create the actual JDOM document builder and register it as
+      // ContentHandler on the superclass (XMLFilterImpl): this
+      // implementation will take care of propagating the LexicalHandler
+      // events.
+      this.saxHandler = new FragmentHandler(getFactory());
+      super.setContentHandler(this.saxHandler);
+
+      // And propagate event.
+      super.startDocument();
+    }
+
+    /**
+     * <i>[SAX ContentHandler interface support]</i> Receives
+     * notification of the beginning of an element.
+     * <p>
+     * This implementation ensures that startDocument() has been
+     * called prior processing an element.
+     *
+     * @param  nsURI       the Namespace URI, or the empty string if
+     *                     the element has no Namespace URI or if
+     *                     Namespace processing is not being performed.
+     * @param  localName   the local name (without prefix), or the
+     *                     empty string if Namespace processing is
+     *                     not being performed.
+     * @param  qName       the qualified name (with prefix), or the
+     *                     empty string if qualified names are not
+     *                     available.
+     * @param  atts        The attributes attached to the element.  If
+     *                     there are no attributes, it shall be an
+     *                     empty Attributes object.
+     *
+     * @throws SAXException   if any error occurred while creating
+     *                        the document builder.
+     */
+    public void startElement(String nsURI, String localName, String qName,
+                                           Attributes atts) throws SAXException
+    {
+      this.ensureInitialization();
+      super.startElement(nsURI, localName, qName, atts);
+    }
+
+    /**
+     * <i>[SAX ContentHandler interface support]</i> Begins the
+     * scope of a prefix-URI Namespace mapping.
+     */
+    public void startPrefixMapping(String prefix, String uri)
+                                                        throws SAXException {
+      this.ensureInitialization();
+      super.startPrefixMapping(prefix, uri);
+    }
+
+    /**
+     * <i>[SAX ContentHandler interface support]</i> Receives
+     * notification of character data.
+     */
+    public void characters(char ch[], int start, int length)
+                                                        throws SAXException {
+      this.ensureInitialization();
+      super.characters(ch, start, length);
+    }
+
+    /**
+     * <i>[SAX ContentHandler interface support]</i> Receives
+     * notification of ignorable whitespace in element content.
+     */
+    public void ignorableWhitespace(char ch[], int start, int length)
+                                                        throws SAXException {
+      this.ensureInitialization();
+      super.ignorableWhitespace(ch, start, length);
+    }
+
+    /**
+     * <i>[SAX ContentHandler interface support]</i> Receives
+     * notification of a processing instruction.
+     */
+    public void processingInstruction(String target, String data)
+                                                        throws SAXException {
+      this.ensureInitialization();
+      super.processingInstruction(target, data);
+    }
+
+    /**
+     * <i>[SAX ContentHandler interface support]</i> Receives
+     * notification of a skipped entity.
+     */
+    public void skippedEntity(String name) throws SAXException {
+      this.ensureInitialization();
+      super.skippedEntity(name);
+    }
+
+    //-----------------------------------------------------------------------
+    // LexicalHandler interface support
+    //-----------------------------------------------------------------------
+
+    /**
+     * <i>[SAX LexicalHandler interface support]</i> Reports the
+     * start of DTD declarations, if any.
+     *
+     * @param  name       the document type name.
+     * @param  publicId   the declared public identifier for the
+     *                    external DTD subset, or <code>null</code>
+     *                    if none was declared.
+     * @param  systemId   the declared system identifier for the
+     *                    external DTD subset, or <code>null</code>
+     *                    if none was declared.
+     *
+     * @throws SAXException   The application may raise an exception.
+     */
+    public void startDTD(String name, String publicId, String systemId)
+                                        throws SAXException {
+      this.ensureInitialization();
+      this.saxHandler.startDTD(name, publicId, systemId);
+    }
+
+    /**
+     * <i>[SAX LexicalHandler interface support]</i> Reports the end
+     * of DTD declarations.
+     *
+     * @throws SAXException   The application may raise an exception.
+     */
+    public void endDTD() throws SAXException {
+      this.saxHandler.endDTD();
+    }
+
+    /**
+     * <i>[SAX LexicalHandler interface support]</i> Reports the
+     * beginning of some internal and external XML entities.
+     *
+     * @param  name   the name of the entity.  If it is a parameter
+     *                entity, the name will begin with '%', and if it
+     *                is the external DTD subset, it will be "[dtd]".
+     *
+     * @throws SAXException   The application may raise an exception.
+     */
+    public void startEntity(String name) throws SAXException {
+      this.ensureInitialization();
+      this.saxHandler.startEntity(name);
+    }
+
+    /**
+     * <i>[SAX LexicalHandler interface support]</i> Reports the end
+     * of an entity.
+     *
+     * @param  name   the name of the entity that is ending.
+     *
+     * @throws SAXException   The application may raise an exception.
+     */
+    public void endEntity(String name) throws SAXException {
+      this.saxHandler.endEntity(name);
+    }
+
+    /**
+     * <i>[SAX LexicalHandler interface support]</i> Reports the
+     * start of a CDATA section.
+     *
+     * @throws SAXException   The application may raise an exception.
+     */
+    public void startCDATA() throws SAXException {
+      this.ensureInitialization();
+      this.saxHandler.startCDATA();
+    }
+
+    /**
+     * <i>[SAX LexicalHandler interface support]</i> Reports the end
+     * of a CDATA section.
+     *
+     * @throws SAXException   The application may raise an exception.
+     */
+    public void endCDATA() throws SAXException {
+      this.saxHandler.endCDATA();
+    }
+
+    /**
+     * <i>[SAX LexicalHandler interface support]</i> Reports an XML
+     * comment anywhere in the document.
+     *
+     * @param  ch     an array holding the characters in the comment.
+     * @param  start  the starting position in the array.
+     * @param  length the number of characters to use from the array.
+     *
+     * @throws SAXException   The application may raise an exception.
+     */
+    public void comment(char ch[], int start, int length)
+                                  throws SAXException {
+      this.ensureInitialization();
+      this.saxHandler.comment(ch, start, length);
+    }
+  }
+}
+

src/org/jdom/transform/JDOMSource.java

@@ -0,0 +1,535 @@
+/*-- 
+
+ $Id: JDOMSource.java,v 1.20 2007/11/10 05:29:02 jhunter Exp $
+
+ Copyright (C) 2001-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+ 
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows 
+    these conditions in the documentation and/or other materials 
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+ 
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+ 
+ In addition, we request (but do not require) that you include in the 
+ end-user documentation provided with the redistribution and/or in the 
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos 
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many 
+ individuals on behalf of the JDOM Project and was originally 
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+ 
+ */
+
+package org.jdom.transform;
+
+import java.io.*;
+import java.util.*;
+
+import javax.xml.transform.sax.*;
+
+import org.jdom.*;
+import org.jdom.output.*;
+import org.xml.sax.*;
+
+/**
+ * A holder for an XML Transformation source: a Document, Element, or list of
+ * nodes.
+ * <p>
+ * The is provides input to a
+ * {@link javax.xml.transform.Transformer JAXP TrAX Transformer}.
+ * <p>
+ * The following example shows how to apply an XSL Transformation
+ * to a JDOM document and get the transformation result in the form
+ * of a list of JDOM nodes:
+ * <pre><code>
+ *   public static List transform(Document doc, String stylesheet)
+ *                                        throws JDOMException {
+ *     try {
+ *       Transformer transformer = TransformerFactory.newInstance()
+ *                             .newTransformer(new StreamSource(stylesheet));
+ *       JDOMSource in = new JDOMSource(doc);
+ *       JDOMResult out = new JDOMResult();
+ *       transformer.transform(in, out);
+ *       return out.getResult();
+ *     }
+ *     catch (TransformerException e) {
+ *       throw new JDOMException("XSLT Transformation failed", e);
+ *     }
+ *   }
+ * </code></pre>
+ *
+ * @see org.jdom.transform.JDOMResult
+ *
+ * @version $Revision: 1.20 $, $Date: 2007/11/10 05:29:02 $
+ * @author Laurent Bihanic
+ * @author Jason Hunter
+ */
+public class JDOMSource extends SAXSource {
+
+    private static final String CVS_ID =
+    "@(#) $RCSfile: JDOMSource.java,v $ $Revision: 1.20 $ $Date: 2007/11/10 05:29:02 $ $Name: jdom_1_1 $";
+
+  /**
+   * If {@link javax.xml.transform.TransformerFactory#getFeature}
+   * returns <code>true</code> when passed this value as an
+   * argument, the Transformer natively supports JDOM.
+   * <p>
+   * <strong>Note</strong>: This implementation does not override
+   * the {@link SAXSource#FEATURE} value defined by its superclass
+   * to be considered as a SAXSource by Transformer implementations
+   * not natively supporting JDOM.
+   * </p>
+   */
+  public final static String JDOM_FEATURE =
+                      "http://org.jdom.transform.JDOMSource/feature";
+
+  /**
+   * The XMLReader object associated to this source or
+   * <code>null</code> if no XMLReader has yet been requested.
+   *
+   * @see    #getXMLReader
+   */
+  private XMLReader xmlReader = null;
+  
+  /**
+   * Optional entity resolver associated to the source of
+   * this document or <code>null</code> if no EntityResolver
+   * was supplied with this JDOMSource. 
+   * 
+   * @see #buildDocumentReader()
+   */
+  private EntityResolver resolver = null;
+
+  /**
+   * Creates a JDOM TrAX source wrapping a JDOM document.
+   *
+   * @param  source   the JDOM document to use as source for the
+   *                  transformations
+   *
+   * @throws IllegalArgumentException   if <code>source</code> is
+   *                                    <code>null</code>.
+   */
+  public JDOMSource(Document source) {
+    setDocument(source);
+  }
+
+  /**
+   * Creates a JDOM TrAX source wrapping a list of JDOM nodes.
+   *
+   * @param  source   the JDOM nodes to use as source for the
+   *                  transformations
+   *
+   * @throws IllegalArgumentException   if <code>source</code> is
+   *                                    <code>null</code>.
+   */
+  public JDOMSource(List source) {
+    setNodes(source);
+  }
+
+  /**
+   * Creates a JDOM TrAX source wrapping a JDOM element.
+   *
+   * @param  source   the JDOM element to use as source for the
+   *                  transformations
+   *
+   * @throws IllegalArgumentException   if <code>source</code> is
+   *                                    <code>null</code>.
+   */
+  public JDOMSource(Element source) {
+    List nodes = new ArrayList();
+    nodes.add(source);
+
+    setNodes(nodes);
+  }
+
+  /**
+   * Creates a JDOM TrAX source wrapping a JDOM element with an
+   * associated EntityResolver to resolve external entities.
+   * 
+   * @param source 		The JDOM Element to use as source for the 
+   * 					transformations
+   * 
+   * @param resolver 	Entity resolver to use for the source 
+   * 					transformation
+   * 
+   * @throws IllegalArgumentException	if<code>source</code> is
+   * <code>null</code>
+   */
+  public JDOMSource(Document source, EntityResolver resolver) {
+	setDocument(source);
+	this.resolver = resolver;
+  }
+
+/**
+   * Sets the source document used by this TrAX source.
+   *
+   * @param  source   the JDOM document to use as source for the
+   *                  transformations
+   *
+   * @throws IllegalArgumentException   if <code>source</code> is
+   *                                    <code>null</code>.
+   *
+   * @see    #getDocument
+   */
+  public void setDocument(Document source) {
+    super.setInputSource(new JDOMInputSource(source));
+  }
+
+  /**
+   * Returns the source document used by this TrAX source.
+   *
+   * @return the source document used by this TrAX source or
+   *         <code>null</code> if the source is a node list.
+   *
+   * @see    #setDocument
+   */
+  public Document getDocument() {
+    Object   src = ((JDOMInputSource)getInputSource()).getSource();
+    Document doc = null;
+
+    if (src instanceof Document) {
+      doc = (Document)src;
+    }
+    return doc;
+  }
+
+  /**
+   * Sets the source node list used by this TrAX source.
+   *
+   * @param  source   the JDOM nodes to use as source for the
+   *                  transformations
+   *
+   * @throws IllegalArgumentException   if <code>source</code> is
+   *                                    <code>null</code>.
+   *
+   * @see    #getNodes
+   */
+  public void setNodes(List source) {
+    super.setInputSource(new JDOMInputSource(source));
+  }
+
+  /**
+   * Returns the source node list used by this TrAX source.
+   *
+   * @return the source node list used by this TrAX source or
+   *         <code>null</code> if the source is a JDOM document.
+   *
+   * @see    #setDocument
+   */
+  public List getNodes() {
+    Object   src   = ((JDOMInputSource)getInputSource()).getSource();
+    List     nodes = null;
+
+    if (src instanceof List) {
+      nodes = (List)src;
+    }
+    return nodes;
+  }
+
+
+  //-------------------------------------------------------------------------
+  // SAXSource overwritten methods
+  //-------------------------------------------------------------------------
+
+  /**
+   * Sets the SAX InputSource to be used for the Source.
+   * <p>
+   * As this implementation only supports JDOM document as data
+   * source, this method always throws an
+   * {@link UnsupportedOperationException}.
+   * </p>
+   *
+   * @param  inputSource   a valid InputSource reference.
+   *
+   * @throws UnsupportedOperationException   always!
+   */
+  public void setInputSource(InputSource inputSource)
+                                  throws UnsupportedOperationException {
+    throw new UnsupportedOperationException();
+  }
+
+  /**
+   * Set the XMLReader to be used for the Source.
+   * <p>
+   * As this implementation only supports JDOM document as data
+   * source, this method throws an
+   * {@link UnsupportedOperationException} if the provided reader
+   * object does not implement the SAX {@link XMLFilter}
+   * interface.  Otherwise, the JDOM document reader will be
+   * attached as parent of the filter chain.</p>
+   *
+   * @param  reader   a valid XMLReader or XMLFilter reference.
+   *
+   * @throws UnsupportedOperationException   if <code>reader</code>
+   *                                         is not a SAX
+   *                                         {@link XMLFilter}.
+   * @see    #getXMLReader
+   */
+  public void setXMLReader(XMLReader reader)
+                              throws UnsupportedOperationException {
+    if (reader instanceof XMLFilter) {
+      // Connect the filter chain to a document reader.
+      XMLFilter filter = (XMLFilter)reader;
+      while (filter.getParent() instanceof XMLFilter) {
+        filter = (XMLFilter)(filter.getParent());
+      }
+      filter.setParent(buildDocumentReader());
+
+      // Read XML data from filter chain.
+      this.xmlReader = reader;
+    }
+    else {
+      throw new UnsupportedOperationException();
+    }
+  }
+
+  /**
+   * Returns the XMLReader to be used for the Source.
+   * <p>
+   * This implementation returns a specific XMLReader reading
+   * the XML data from the source JDOM document.
+   * </p>
+   *
+   * @return an XMLReader reading the XML data from the source
+   *         JDOM document.
+   */
+  public XMLReader getXMLReader() {
+    if (this.xmlReader == null) {
+      this.xmlReader = buildDocumentReader();
+    }
+    return this.xmlReader;
+  }
+  
+  /**
+   * Build an XMLReader to be used for the source. This will
+   * create a new instance of DocumentReader with an 
+   * EntityResolver instance if available.
+   * 
+   * @return XMLReader reading the XML data from the source
+   * 		JDOM document with an optional EntityResolver
+   */
+  private XMLReader buildDocumentReader() {
+	  DocumentReader reader = new DocumentReader();
+	  if (resolver != null)
+		  reader.setEntityResolver(resolver);
+	  return reader;
+  }
+
+  //=========================================================================
+  // JDOMInputSource nested class
+  //=========================================================================
+
+  /**
+   * A subclass of the SAX InputSource interface that wraps a JDOM
+   * Document.
+   * <p>
+   * This class is nested in JDOMSource as it is not intented to
+   * be used independently of its friend: DocumentReader.
+   * </p>
+   *
+   * @see    org.jdom.Document
+   */
+  private static class JDOMInputSource extends InputSource {
+    /**
+     * The source as a JDOM document or a list of JDOM nodes.
+     */
+    private Object source = null;
+
+    /**
+     * Builds a InputSource wrapping the specified JDOM Document.
+     *
+     * @param  document   the source document.
+     */
+    public JDOMInputSource(Document document) {
+      this.source = document;
+    }
+
+    /**
+     * Builds a InputSource wrapping a list of JDOM nodes.
+     *
+     * @param  nodes   the source JDOM nodes.
+     */
+    public JDOMInputSource(List nodes) {
+      this.source = nodes;
+    }
+
+    /**
+     * Returns the source.
+     *
+     * @return the source as a JDOM document or a list of JDOM nodes.
+     */
+    public Object getSource() {
+      return source;
+    }
+
+    //-------------------------------------------------------------------------
+    // InputSource overwritten methods
+    //-------------------------------------------------------------------------
+
+    /**
+     * Sets the character stream for this input source.
+     * <p>
+     * This implementation always throws an
+     * {@link UnsupportedOperationException} as the only source
+     * stream supported is the source JDOM document.
+     * </p>
+     *
+     * @param  characterStream   a character stream containing
+     *                           an XML document.
+     *
+     * @throws UnsupportedOperationException  always!
+     */
+    public void setCharacterStream(Reader characterStream)
+                                      throws UnsupportedOperationException {
+      throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Gets the character stream for this input source.
+     * <p>
+     * Note that this method is only provided to make this
+     * InputSource implementation acceptable by any XML
+     * parser.  As it generates an in-memory string representation
+     * of the JDOM document, it is quite inefficient from both
+     * speed and memory consumption points of view.
+     * </p>
+     *
+     * @return a Reader to a string representation of the
+     *         source JDOM document.
+     */
+    public Reader getCharacterStream() {
+      Object src    = this.getSource();
+      Reader reader = null;
+
+      if (src instanceof Document) {
+        // Get an in-memory string representation of the document
+        // and return a reader on it.
+        reader = new StringReader(
+                            new XMLOutputter().outputString((Document)src));
+      }
+      else {
+        if (src instanceof List) {
+          reader = new StringReader(
+                            new XMLOutputter().outputString((List)src));
+        }
+        // Else: No source, no reader!
+      }
+      return reader;
+    }
+  }
+
+  //=========================================================================
+  // DocumentReader nested class
+  //=========================================================================
+
+  /**
+   * An implementation of the SAX2 XMLReader interface that presents
+   * a SAX view of a JDOM Document.  The actual generation of the
+   * SAX events is delegated to JDOM's SAXOutputter.
+   *
+   * @see    org.jdom.Document
+   * @see    org.jdom.output.SAXOutputter
+   */
+  private static class DocumentReader   extends    SAXOutputter
+                                        implements XMLReader    {
+    /**
+     * Public default constructor.
+     */
+    public DocumentReader() {
+      super();
+    }
+
+    //----------------------------------------------------------------------
+    // SAX XMLReader interface support
+    //----------------------------------------------------------------------
+
+    /**
+     * Parses an XML document from a system identifier (URI).
+     * <p>
+     * This implementation does not support reading XML data from
+     * system identifiers, only from JDOM documents.  Hence,
+     * this method always throws a {@link SAXNotSupportedException}.
+     * </p>
+     *
+     * @param  systemId   the system identifier (URI).
+     *
+     * @throws SAXNotSupportedException   always!
+     */
+    public void parse(String systemId) throws SAXNotSupportedException {
+      throw new SAXNotSupportedException(
+                       "Only JDOM Documents are supported as input");
+    }
+
+    /**
+     * Parses an XML document.
+     * <p>
+     * The methods accepts only <code>JDOMInputSource</code>s
+     * instances as input sources.
+     * </p>
+     *
+     * @param  input   the input source for the top-level of the
+     *                  XML document.
+     *
+     * @throws SAXException               any SAX exception,
+     *                                    possibly wrapping
+     *                                    another exception.
+     * @throws SAXNotSupportedException   if the input source does
+     *                                    not wrap a JDOM document.
+     */
+    public void parse(InputSource input) throws SAXException {
+      if (input instanceof JDOMInputSource) {
+        try {
+          Object source = ((JDOMInputSource)input).getSource();
+          if (source instanceof Document) {
+            this.output((Document)source);
+          }
+          else {
+            this.output((List)source);
+          }
+        }
+        catch (JDOMException e) {
+          throw new SAXException(e.getMessage(), e);
+        }
+      }
+      else {
+        throw new SAXNotSupportedException(
+                         "Only JDOM Documents are supported as input");
+      }
+    }
+  }
+}
+

src/org/jdom/transform/XSLTransformException.java

@@ -0,0 +1,82 @@
+/*--
+
+ $Id: XSLTransformException.java,v 1.4 2007/11/10 05:29:02 jhunter Exp $
+
+ Copyright (C) 2003-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.transform;
+
+import org.jdom.JDOMException;
+
+/**
+ * Thrown when an XSL stylesheet fails to compile or an XSL transform fails
+ *
+ * @version $Revision: 1.4 $, $Date: 2007/11/10 05:29:02 $
+ * @author  Jason Hunter
+ */
+public class XSLTransformException extends JDOMException {
+
+    private static final String CVS_ID =
+            "@(#) $RCSfile: XSLTransformException.java,v $ $Revision: 1.4 $ $Date: 2007/11/10 05:29:02 $ $Name: jdom_1_1 $";
+
+    public XSLTransformException() {
+    }
+
+    public XSLTransformException(String message) {
+        super(message);
+    }
+
+    public XSLTransformException(String message, Exception cause) {
+        super(message, cause);
+    }
+}

src/org/jdom/transform/XSLTransformer.java

@@ -0,0 +1,291 @@
+/*--
+
+ $Id: XSLTransformer.java,v 1.5 2007/11/14 04:36:54 jhunter Exp $
+
+ Copyright (C) 2001-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.transform;
+
+import java.util.*;
+import java.io.*;
+import javax.xml.transform.*;
+import javax.xml.transform.stream.StreamSource;
+import org.jdom.*;
+import org.xml.sax.EntityResolver;
+
+/**
+ * A convenience class to handle simple transformations. The JAXP TrAX classes
+ * have more bells and whistles and can be used with {@link JDOMSource} and
+ * {@link JDOMResult} for advanced uses. This class handles the common case and
+ * presents a simple interface.  XSLTransformer is thread safe and may be
+ * used from multiple threads.
+ *
+ * <pre><code>
+ * XSLTransformer transformer = new XSLTransformer("file.xsl");
+ *
+ * Document x2 = transformer.transform(x);  // x is a Document
+ * Document y2 = transformer.transform(y);  // y is a Document
+ * </code></pre>
+ *
+ *  JDOM relies on TrAX to perform the transformation.
+ *  The <code>javax.xml.transform.TransformerFactory</code> Java system property
+ *  determines which XSLT engine TrAX uses. Its value should be
+ *  the fully qualified name of the implementation of the abstract
+ *  <code>javax.xml.transform.TransformerFactory</code> class.
+ *  Values of this property for popular XSLT processors include:
+ *  </p>
+ *  <ul><li>Saxon 6.x: <code>com.icl.saxon.TransformerFactoryImpl</code></li>
+ *  <li>Saxon 7.x: <code>net.sf.saxon.TransformerFactoryImpl</code></li>
+ *  <li>Xalan: <code>org.apache.xalan.processor.TransformerFactoryImpl</code></li>
+ *  <li>jd.xslt: <code>jd.xml.xslt.trax.TransformerFactoryImpl</code></li>
+ *  <li>Oracle: <code>oracle.xml.jaxp.JXSAXTransformerFactory</code></li>
+ *  </ul>
+ *  <p>
+ *   This property can be set in all the usual ways a Java system property
+ *   can be set. TrAX picks from them in this order:</p>
+ *   <ol>
+ *   <li> Invoking <code>System.setProperty( "javax.xml.transform.TransformerFactory",
+ *     "<i><code>classname</code></i>")</code></li>
+ *   <li>The value specified at the command line using the
+ *      <tt>-Djavax.xml.transform.TransformerFactory=<i><code>classname</code></i></tt>
+ *      option to the <b>java</b> interpreter</li>
+ *    <li>The class named in the  <code>lib/jaxp.properties</code> properties file
+ *         in the JRE directory, in a line like this one:
+ *      <pre>javax.xml.parsers.DocumentBuilderFactory=<i><code>classname</code></i></pre></li>
+ *    <li>The class named in the
+ *   <code>META-INF/services/javax.xml.transform.TransformerFactory</code> file
+ *   in the JAR archives available to the runtime</li>
+ *   <li>Finally, if all of the above options fail,
+ *    a default implementation is chosen. In Sun's JDK 1.4, this is
+ *       Xalan 2.2d10. </li>
+ *    </ol>
+
+ * @version $Revision: 1.5 $, $Date: 2007/11/14 04:36:54 $
+ * @author  Jason Hunter
+ * @author  Elliotte Rusty Harold
+ */
+public class XSLTransformer {
+
+    private static final String CVS_ID =
+            "@(#) $RCSfile: XSLTransformer.java,v $ $Revision: 1.5 $ $Date: 2007/11/14 04:36:54 $ $Name: jdom_1_1 $";
+
+    private Templates templates;
+
+    /**
+     * The custom JDOM factory to use when building the transformation
+     * result or <code>null</code> to use the default JDOM classes.
+     */
+    private JDOMFactory factory = null;
+
+    // Internal constructor to support the other constructors
+    private XSLTransformer(Source stylesheet) throws XSLTransformException {
+        try {
+            templates = TransformerFactory.newInstance()
+                    .newTemplates(stylesheet);
+        }
+        catch (TransformerException e) {
+            throw new XSLTransformException("Could not construct XSLTransformer", e);
+        }
+    }
+
+    /**
+     * Creates a transformer for a given stylesheet system id.
+     *
+     * @param  stylesheetSystemId  source stylesheet as a Source object
+     * @throws XSLTransformException       if there's a problem in the TrAX back-end
+     */
+    public XSLTransformer(String stylesheetSystemId) throws XSLTransformException {
+        this(new StreamSource(stylesheetSystemId));
+    }
+
+    /**
+     * <p>
+     * This will create a new <code>XSLTransformer</code> by
+     *  reading the stylesheet from the specified
+     *   <code>InputStream</code>.
+     * </p>
+     *
+     * @param stylesheet <code>InputStream</code> from which the stylesheet is read.
+     * @throws XSLTransformException when an IOException, format error, or
+     * something else prevents the stylesheet from being compiled
+     */
+    public XSLTransformer(InputStream stylesheet) throws XSLTransformException {
+        this(new StreamSource(stylesheet));
+    }
+
+    /**
+     * <p>
+     * This will create a new <code>XSLTransformer</code> by
+     *  reading the stylesheet from the specified
+     *   <code>Reader</code>.
+     * </p>
+     *
+     * @param stylesheet <code>Reader</code> from which the stylesheet is read.
+     * @throws XSLTransformException when an IOException, format error, or
+     * something else prevents the stylesheet from being compiled
+     */
+    public XSLTransformer(Reader stylesheet) throws XSLTransformException {
+        this(new StreamSource(stylesheet));
+    }
+
+    /**
+     * <p>
+     * This will create a new <code>XSLTransformer</code> by
+     *  reading the stylesheet from the specified
+     *   <code>File</code>.
+     * </p>
+     *
+     * @param stylesheet <code>File</code> from which the stylesheet is read.
+     * @throws XSLTransformException when an IOException, format error, or
+     * something else prevents the stylesheet from being compiled
+     */
+    public XSLTransformer(File stylesheet) throws XSLTransformException {
+        this(new StreamSource(stylesheet));
+    }
+
+    /**
+     * <p>
+     * This will create a new <code>XSLTransformer</code> by
+     *  reading the stylesheet from the specified
+     *   <code>Document</code>.
+     * </p>
+     *
+     * @param stylesheet <code>Document</code> containing the stylesheet.
+     * @throws XSLTransformException when the supplied <code>Document</code>
+     *  is not syntactically correct XSLT
+     */
+    public XSLTransformer(Document stylesheet) throws XSLTransformException {
+        this(new JDOMSource(stylesheet));
+    }
+
+    /**
+     * Transforms the given input nodes to a list of output nodes.
+     *
+     * @param  inputNodes          input nodes
+     * @return                     transformed output nodes
+     * @throws XSLTransformException       if there's a problem in the transformation
+     */
+    public List transform(List inputNodes) throws XSLTransformException {
+        JDOMSource source = new JDOMSource(inputNodes);
+        JDOMResult result = new JDOMResult();
+        result.setFactory(factory);  // null ok
+        try {
+            templates.newTransformer().transform(source, result);
+            return result.getResult();
+        }
+        catch (TransformerException e) {
+            throw new XSLTransformException("Could not perform transformation", e);
+        }
+    }
+    
+    /**
+     * Transforms the given document to an output document.
+     *
+     * @param  inputDoc            input document
+     * @return                     transformed output document
+     * @throws XSLTransformException       if there's a problem in the transformation
+     */
+    public Document transform(Document inputDoc) throws XSLTransformException {
+    	return transform(inputDoc, null);
+    }
+
+    /**
+     * Transforms the given document to an output document.
+     *
+     * @param  inputDoc            input document
+     * @param  resolver			   entity resolver for the input document
+     * @return                     transformed output document
+     * @throws XSLTransformException       if there's a problem in the transformation
+     */
+    public Document transform(Document inputDoc, EntityResolver resolver) throws XSLTransformException {
+        JDOMSource source = new JDOMSource(inputDoc, resolver);
+        JDOMResult result = new JDOMResult();
+        result.setFactory(factory);  // null ok
+        try {
+            templates.newTransformer().transform(source, result);
+            return result.getDocument();
+        }
+        catch (TransformerException e) {
+            throw new XSLTransformException("Could not perform transformation", e);
+        }
+    }
+
+    /**
+     * Sets a custom JDOMFactory to use when building the
+     * transformation result. Use a custom factory to build the tree
+     * with your own subclasses of the JDOM classes.
+     *
+     * @param  factory   the custom <code>JDOMFactory</code> to use or
+     *                   <code>null</code> to use the default JDOM
+     *                   classes.
+     *
+     * @see    #getFactory
+     */
+    public void setFactory(JDOMFactory factory) {
+      this.factory = factory;
+    }
+
+    /**
+     * Returns the custom JDOMFactory used to build the transformation
+     * result.
+     *
+     * @return the custom <code>JDOMFactory</code> used to build the
+     *         transformation result or <code>null</code> if the
+     *         default JDOM classes are being used.
+     *
+     * @see    #setFactory
+     */
+    public JDOMFactory getFactory() {
+      return this.factory;
+    }
+}

src/org/jdom/transform/package.html

@@ -0,0 +1,8 @@
+<body>
+
+Classes to help with transformations, based on the JAXP TrAX classes.
+JDOMTransformer supports simple transformations with one line of code.
+Advanced features are available with the JDOMSource and JDOMResult classes
+that interface with TrAX.
+
+</body>

src/org/jdom/xpath/JaxenXPath.java

@@ -0,0 +1,356 @@
+/*--
+
+ $Id: JaxenXPath.java,v 1.20 2007/11/10 05:29:02 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.xpath;
+
+
+import java.util.*;
+
+import org.jaxen.*;
+import org.jaxen.jdom.*;
+import org.jdom.*;
+
+
+/**
+ * A non-public concrete XPath implementation for Jaxen.
+ *
+ * @version $Revision: 1.20 $, $Date: 2007/11/10 05:29:02 $
+ * @author  Laurent Bihanic
+ */
+class JaxenXPath extends    XPath {             // package protected
+
+    private static final String CVS_ID =
+    "@(#) $RCSfile: JaxenXPath.java,v $ $Revision: 1.20 $ $Date: 2007/11/10 05:29:02 $ $Name: jdom_1_1 $";
+
+   /**
+    * The compiled XPath object to select nodes.  This attribute can
+    * not be made final as it needs to be set upon object
+    * deserialization.
+    */
+   private transient JDOMXPath xPath;
+
+   /**
+    * The current context for XPath expression evaluation.
+    */
+   private           Object    currentContext;
+
+   /**
+    * Creates a new XPath wrapper object, compiling the specified
+    * XPath expression.
+    *
+    * @param  expr   the XPath expression to wrap.
+    *
+    * @throws JDOMException   if the XPath expression is invalid.
+    */
+   public JaxenXPath(String expr) throws JDOMException {
+      setXPath(expr);
+   }
+
+   /**
+    * Evaluates the wrapped XPath expression and returns the list
+    * of selected items.
+    *
+    * @param  context   the node to use as context for evaluating
+    *                   the XPath expression.
+    *
+    * @return the list of selected items, which may be of types: {@link Element},
+    *         {@link Attribute}, {@link Text}, {@link CDATA},
+    *         {@link Comment}, {@link ProcessingInstruction}, Boolean,
+    *         Double, or String.
+    *
+    * @throws JDOMException   if the evaluation of the XPath
+    *                         expression on the specified context
+    *                         failed.
+    */
+   public List selectNodes(Object context) throws JDOMException {
+      try {
+         currentContext = context;
+
+         return xPath.selectNodes(context);
+      }
+      catch (JaxenException ex1) {
+         throw new JDOMException("XPath error while evaluating \"" +
+                        xPath.toString() + "\": " + ex1.getMessage(), ex1);
+      }
+      finally {
+         currentContext = null;
+      }
+   }
+
+   /**
+    * Evaluates the wrapped XPath expression and returns the first
+    * entry in the list of selected nodes (or atomics).
+    *
+    * @param  context   the node to use as context for evaluating
+    *                   the XPath expression.
+    *
+    * @return the first selected item, which may be of types: {@link Element},
+    *         {@link Attribute}, {@link Text}, {@link CDATA},
+    *         {@link Comment}, {@link ProcessingInstruction}, Boolean,
+    *         Double, String, or <code>null</code> if no item was selected.
+    *
+    * @throws JDOMException   if the evaluation of the XPath
+    *                         expression on the specified context
+    *                         failed.
+    */
+   public Object selectSingleNode(Object context) throws JDOMException {
+      try {
+         currentContext = context;
+
+         return xPath.selectSingleNode(context);
+      }
+      catch (JaxenException ex1) {
+         throw new JDOMException("XPath error while evaluating \"" +
+                        xPath.toString() + "\": " + ex1.getMessage(), ex1);
+      }
+      finally {
+         currentContext = null;
+      }
+   }
+
+   /**
+    * Returns the string value of the first node selected by applying
+    * the wrapped XPath expression to the given context.
+    *
+    * @param  context   the element to use as context for evaluating
+    *                   the XPath expression.
+    *
+    * @return the string value of the first node selected by applying
+    *         the wrapped XPath expression to the given context.
+    *
+    * @throws JDOMException   if the XPath expression is invalid or
+    *                         its evaluation on the specified context
+    *                         failed.
+    */
+   public String valueOf(Object context) throws JDOMException {
+      try {
+         currentContext = context;
+
+         return xPath.stringValueOf(context);
+      }
+      catch (JaxenException ex1) {
+         throw new JDOMException("XPath error while evaluating \"" +
+                        xPath.toString() + "\": " + ex1.getMessage(), ex1);
+      }
+      finally {
+         currentContext = null;
+      }
+   }
+
+   /**
+    * Returns the number value of the first item selected by applying
+    * the wrapped XPath expression to the given context.
+    *
+    * @param  context   the element to use as context for evaluating
+    *                   the XPath expression.
+    *
+    * @return the number value of the first item selected by applying
+    *         the wrapped XPath expression to the given context,
+    *         <code>null</code> if no node was selected or the
+    *         special value {@link java.lang.Double#NaN}
+    *         (Not-a-Number) if the selected value can not be
+    *         converted into a number value.
+    *
+    * @throws JDOMException   if the XPath expression is invalid or
+    *                         its evaluation on the specified context
+    *                         failed.
+    */
+   public Number numberValueOf(Object context) throws JDOMException {
+      try {
+         currentContext = context;
+
+         return xPath.numberValueOf(context);
+      }
+      catch (JaxenException ex1) {
+         throw new JDOMException("XPath error while evaluating \"" +
+                        xPath.toString() + "\": " + ex1.getMessage(), ex1);
+      }
+      finally {
+         currentContext = null;
+      }
+   }
+
+   /**
+    * Defines an XPath variable and sets its value.
+    *
+    * @param  name    the variable name.
+    * @param  value   the variable value.
+    *
+    * @throws IllegalArgumentException   if <code>name</code> is not
+    *                                    a valid XPath variable name
+    *                                    or if the value type is not
+    *                                    supported by the underlying
+    *                                    implementation
+    */
+   public void setVariable(String name, Object value)
+                                        throws IllegalArgumentException {
+      Object o = xPath.getVariableContext();
+      if (o instanceof SimpleVariableContext) {
+           ((SimpleVariableContext)o).setVariableValue(null, name, value);
+      }
+   }
+
+   /**
+    * Adds a namespace definition to the list of namespaces known of
+    * this XPath expression.
+    * <p>
+    * <strong>Note</strong>: In XPath, there is no such thing as a
+    * 'default namespace'.  The empty prefix <b>always</b> resolves
+    * to the empty namespace URI.</p>
+    *
+    * @param  namespace   the namespace.
+    */
+   public void addNamespace(Namespace namespace) {
+      try {
+         xPath.addNamespace(namespace.getPrefix(), namespace.getURI());
+      }
+      catch (JaxenException ex1) { /* Can't happen here. */ }
+   }
+
+   /**
+    * Returns the wrapped XPath expression as a string.
+    *
+    * @return the wrapped XPath expression as a string.
+    */
+   public String getXPath() {
+      return (xPath.toString());
+   }
+
+   /**
+    * Compiles and sets the XPath expression wrapped by this object.
+    *
+    * @param  expr   the XPath expression to wrap.
+    *
+    * @throws JDOMException   if the XPath expression is invalid.
+    */
+   private void setXPath(String expr) throws JDOMException {
+      try {
+         xPath = new JDOMXPath(expr);
+         xPath.setNamespaceContext(new NSContext());
+      }
+      catch (Exception ex1) {
+         throw new JDOMException(
+                        "Invalid XPath expression: \"" + expr + "\"", ex1);
+      }
+   }
+
+   public String toString() {
+      return (xPath.toString());
+   }
+
+   public boolean equals(Object o) {
+      if (o instanceof JaxenXPath) {
+         JaxenXPath x = (JaxenXPath)o;
+
+         return (super.equals(o) &&
+                 xPath.toString().equals(x.xPath.toString()));
+      }
+      return false;
+   }
+
+   public int hashCode() {
+      return xPath.hashCode();
+   }
+
+   private class NSContext extends SimpleNamespaceContext {
+      public NSContext() {
+         super();
+      }
+
+      /**
+       * <i>[Jaxen NamespaceContext interface support]</i> Translates
+       * the provided namespace prefix into the matching bound
+       * namespace URI.
+       *
+       * @param  prefix   the namespace prefix to resolve.
+       *
+       * @return the namespace URI matching the prefix.
+       */
+      public String translateNamespacePrefixToUri(String prefix) {
+         if ((prefix == null) || (prefix.length() == 0)) {
+            return null;
+         }
+
+         String uri = super.translateNamespacePrefixToUri(prefix);
+         if (uri == null) {
+            Object ctx = currentContext;
+            if (ctx != null) {
+               Element elt = null;
+
+               // Get closer element node
+               if (ctx instanceof Element) {
+                  elt = (Element)ctx;
+               } else if (ctx instanceof Attribute) {
+                  elt = ((Attribute)ctx).getParent();
+               } else if (ctx instanceof Content) {
+                  elt = ((Content) ctx).getParentElement();
+               } else if (ctx instanceof Document) {
+                  elt = ((Document)ctx).getRootElement();
+               }
+
+               if (elt != null) {
+                  Namespace ns = elt.getNamespace(prefix);
+                  if (ns != null) {
+                     uri = ns.getURI();
+                  }
+               }
+            }
+         }
+         return uri;
+      }
+   }
+}
+

src/org/jdom/xpath/XPath.java

@@ -0,0 +1,453 @@
+/*--
+
+ $Id: XPath.java,v 1.17 2007/11/10 05:29:02 jhunter Exp $
+
+ Copyright (C) 2000-2007 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+ */
+
+package org.jdom.xpath;
+
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+import org.jdom.*;
+
+
+/**
+ * A utility class for performing XPath calls on JDOM nodes, with a factory
+ * interface for obtaining a first XPath instance. Users operate against this
+ * class while XPath vendors can plug-in implementations underneath.  Users
+ * can choose an implementation using either {@link #setXPathClass} or
+ * the system property "org.jdom.xpath.class".
+ *
+ * @version $Revision: 1.17 $, $Date: 2007/11/10 05:29:02 $
+ * @author  Laurent Bihanic
+ */
+public abstract class XPath implements Serializable {
+
+    private static final String CVS_ID =
+    "@(#) $RCSfile: XPath.java,v $ $Revision: 1.17 $ $Date: 2007/11/10 05:29:02 $ $Name: jdom_1_1 $";
+
+   /**
+    * The name of the system property from which to retrieve the
+    * name of the implementation class to use.
+    * <p>
+    * The property name is:
+    * "<code>org.jdom.xpath.class</code>".</p>
+    */
+   private final static String  XPATH_CLASS_PROPERTY = "org.jdom.xpath.class";
+
+   /**
+    * The default implementation class to use if none was configured.
+    */
+   private final static String  DEFAULT_XPATH_CLASS  =
+                                                "org.jdom.xpath.JaxenXPath";
+
+   /**
+    * The string passable to the JAXP 1.3 XPathFactory isObjectModelSupported()
+    * method to query an XPath engine regarding its support for JDOM.  Defined
+    * to be the well-known URI "http://jdom.org/jaxp/xpath/jdom".
+    */
+   public final static String JDOM_OBJECT_MODEL_URI =
+     "http://jdom.org/jaxp/xpath/jdom";
+
+   /**
+    * The constructor to instanciate a new XPath concrete
+    * implementation.
+    *
+    * @see    #newInstance
+    */
+   private static Constructor constructor = null;
+
+   /**
+    * Creates a new XPath wrapper object, compiling the specified
+    * XPath expression.
+    *
+    * @param  path   the XPath expression to wrap.
+    *
+    * @throws JDOMException   if the XPath expression is invalid.
+    */
+   public static XPath newInstance(String path) throws JDOMException {
+      try {
+         if (constructor == null) {
+            // First call => Determine implementation.
+            String className;
+            try {
+               className = System.getProperty(XPATH_CLASS_PROPERTY,
+                                              DEFAULT_XPATH_CLASS);
+            }
+            catch (SecurityException ex1) {
+               // Access to system property denied. => Use default impl.
+               className = DEFAULT_XPATH_CLASS;
+            }
+            setXPathClass(Class.forName(className));
+         }
+         // Allocate and return new implementation instance.
+         return (XPath)constructor.newInstance(new Object[] { path });
+      }
+      catch (JDOMException ex1) {
+         throw ex1;
+      }
+      catch (InvocationTargetException ex2) {
+         // Constructor threw an error on invocation.
+         Throwable t = ex2.getTargetException();
+
+         throw (t instanceof JDOMException)? (JDOMException)t:
+                                        new JDOMException(t.toString(), t);
+      }
+      catch (Exception ex3) {
+         // Any reflection error (probably due to a configuration mistake).
+         throw new JDOMException(ex3.toString(), ex3);
+      }
+   }
+
+   /**
+    * Sets the concrete XPath subclass to use when allocating XPath
+    * instances.
+    *
+    * @param  aClass   the concrete subclass of XPath.
+    *
+    * @throws IllegalArgumentException   if <code>aClass</code> is
+    *                                    <code>null</code>.
+    * @throws JDOMException              if <code>aClass</code> is
+    *                                    not a concrete subclass
+    *                                    of XPath.
+    */
+   public static void setXPathClass(Class aClass) throws JDOMException {
+      if (aClass == null) {
+         throw new IllegalArgumentException("aClass");
+      }
+
+      try {
+         if ((XPath.class.isAssignableFrom(aClass)) &&
+             (Modifier.isAbstract(aClass.getModifiers()) == false)) {
+            // Concrete subclass of XPath => Get constructor
+            constructor = aClass.getConstructor(new Class[] { String.class });
+         }
+         else {
+            throw new JDOMException(aClass.getName() +
+                        " is not a concrete JDOM XPath implementation");
+         }
+      }
+      catch (JDOMException ex1) {
+         throw ex1;
+      }
+      catch (Exception ex2) {
+         // Any reflection error (probably due to a configuration mistake).
+         throw new JDOMException(ex2.toString(), ex2);
+      }
+   }
+
+    /**
+     * Evaluates the wrapped XPath expression and returns the list
+     * of selected items.
+     *
+     * @param  context   the node to use as context for evaluating
+     *                   the XPath expression.
+     *
+     * @return the list of selected items, which may be of types: {@link Element},
+     *         {@link Attribute}, {@link Text}, {@link CDATA},
+     *         {@link Comment}, {@link ProcessingInstruction}, Boolean,
+     *         Double, or String.
+     *
+     * @throws JDOMException   if the evaluation of the XPath
+     *                         expression on the specified context
+     *                         failed.
+     */
+   abstract public List selectNodes(Object context) throws JDOMException;
+
+    /**
+     * Evaluates the wrapped XPath expression and returns the first
+     * entry in the list of selected nodes (or atomics).
+     *
+     * @param  context   the node to use as context for evaluating
+     *                   the XPath expression.
+     *
+     * @return the first selected item, which may be of types: {@link Element},
+     *         {@link Attribute}, {@link Text}, {@link CDATA},
+     *         {@link Comment}, {@link ProcessingInstruction}, Boolean,
+     *         Double, String, or <code>null</code> if no item was selected.
+     *
+     * @throws JDOMException   if the evaluation of the XPath
+     *                         expression on the specified context
+     *                         failed.
+     */
+   abstract public Object selectSingleNode(Object context) throws JDOMException;
+
+   /**
+    * Returns the string value of the first node selected by applying
+    * the wrapped XPath expression to the given context.
+    *
+    * @param  context   the element to use as context for evaluating
+    *                   the XPath expression.
+    *
+    * @return the string value of the first node selected by applying
+    *         the wrapped XPath expression to the given context.
+    *
+    * @throws JDOMException   if the XPath expression is invalid or
+    *                         its evaluation on the specified context
+    *                         failed.
+    */
+   abstract public String valueOf(Object context) throws JDOMException;
+
+   /**
+    * Returns the number value of the first node selected by applying
+    * the wrapped XPath expression to the given context.
+    *
+    * @param  context   the element to use as context for evaluating
+    *                   the XPath expression.
+    *
+    * @return the number value of the first node selected by applying
+    *         the wrapped XPath expression to the given context,
+    *         <code>null</code> if no node was selected or the
+    *         special value {@link java.lang.Double#NaN}
+    *         (Not-a-Number) if the selected value can not be
+    *         converted into a number value.
+    *
+    * @throws JDOMException   if the XPath expression is invalid or
+    *                         its evaluation on the specified context
+    *                         failed.
+    */
+   abstract public Number numberValueOf(Object context) throws JDOMException;
+
+   /**
+    * Defines an XPath variable and sets its value.
+    *
+    * @param  name    the variable name.
+    * @param  value   the variable value.
+    *
+    * @throws IllegalArgumentException   if <code>name</code> is not
+    *                                    a valid XPath variable name
+    *                                    or if the value type is not
+    *                                    supported by the underlying
+    *                                    implementation
+    */
+   abstract public void setVariable(String name, Object value);
+
+   /**
+    * Adds a namespace definition to the list of namespaces known of
+    * this XPath expression.
+    * <p>
+    * <strong>Note</strong>: In XPath, there is no such thing as a
+    * 'default namespace'.  The empty prefix <b>always</b> resolves
+    * to the empty namespace URI.</p>
+    *
+    * @param  namespace   the namespace.
+    */
+   abstract public void addNamespace(Namespace namespace);
+
+   /**
+    * Adds a namespace definition (prefix and URI) to the list of
+    * namespaces known of this XPath expression.
+    * <p>
+    * <strong>Note</strong>: In XPath, there is no such thing as a
+    * 'default namespace'.  The empty prefix <b>always</b> resolves
+    * to the empty namespace URI.</p>
+    *
+    * @param  prefix   the namespace prefix.
+    * @param  uri      the namespace URI.
+    *
+    * @throws IllegalNameException   if the prefix or uri are null or
+    *                                empty strings or if they contain
+    *                                illegal characters.
+    */
+   public void addNamespace(String prefix, String uri) {
+      addNamespace(Namespace.getNamespace(prefix, uri));
+   }
+
+   /**
+    * Returns the wrapped XPath expression as a string.
+    *
+    * @return the wrapped XPath expression as a string.
+    */
+   abstract public String getXPath();
+
+
+   /**
+    * Evaluates an XPath expression and returns the list of selected
+    * items.
+    * <p>
+    * <strong>Note</strong>: This method should not be used when the
+    * same XPath expression needs to be applied several times (on the
+    * same or different contexts) as it requires the expression to be
+    * compiled before being evaluated.  In such cases,
+    * {@link #newInstance allocating} an XPath wrapper instance and
+    * {@link #selectNodes(java.lang.Object) evaluating} it several
+    * times is way more efficient.
+    * </p>
+    *
+    * @param  context   the node to use as context for evaluating
+    *                   the XPath expression.
+    * @param  path      the XPath expression to evaluate.
+    *
+    * @return the list of selected items, which may be of types: {@link Element},
+    *         {@link Attribute}, {@link Text}, {@link CDATA},
+    *         {@link Comment}, {@link ProcessingInstruction}, Boolean,
+    *         Double, or String.
+    *
+    * @throws JDOMException   if the XPath expression is invalid or
+    *                         its evaluation on the specified context
+    *                         failed.
+    */
+   public static List selectNodes(Object context, String path)
+                                                        throws JDOMException {
+      return newInstance(path).selectNodes(context);
+   }
+
+   /**
+    * Evaluates the wrapped XPath expression and returns the first
+    * entry in the list of selected nodes (or atomics).
+    * <p>
+    * <strong>Note</strong>: This method should not be used when the
+    * same XPath expression needs to be applied several times (on the
+    * same or different contexts) as it requires the expression to be
+    * compiled before being evaluated.  In such cases,
+    * {@link #newInstance allocating} an XPath wrapper instance and
+    * {@link #selectSingleNode(java.lang.Object) evaluating} it
+    * several times is way more efficient.
+    * </p>
+    *
+    * @param  context   the element to use as context for evaluating
+    *                   the XPath expression.
+    * @param  path      the XPath expression to evaluate.
+    *
+    * @return the first selected item, which may be of types: {@link Element},
+    *         {@link Attribute}, {@link Text}, {@link CDATA},
+    *         {@link Comment}, {@link ProcessingInstruction}, Boolean,
+    *         Double, String, or <code>null</code> if no item was selected.
+    *
+    * @throws JDOMException   if the XPath expression is invalid or
+    *                         its evaluation on the specified context
+    *                         failed.
+    */
+   public static Object selectSingleNode(Object context, String path)
+                                                        throws JDOMException {
+      return newInstance(path).selectSingleNode(context);
+   }
+
+
+   //-------------------------------------------------------------------------
+   // Serialization support
+   //-------------------------------------------------------------------------
+
+   /**
+    * <i>[Serialization support]</i> Returns the alternative object
+    * to write to the stream when serializing this object.  This
+    * method returns an instance of a dedicated nested class to
+    * serialize XPath expressions independently of the concrete
+    * implementation being used.
+    * <p>
+    * <strong>Note</strong>: Subclasses are not allowed to override
+    * this method to ensure valid serialization of all
+    * implementations.</p>
+    *
+    * @return an XPathString instance configured with the wrapped
+    *         XPath expression.
+    *
+    * @throws ObjectStreamException   never.
+    */
+   protected final Object writeReplace() throws ObjectStreamException {
+      return new XPathString(this.getXPath());
+   }
+
+   /**
+    * The XPathString is dedicated to serialize instances of
+    * XPath subclasses in a implementation-independent manner.
+    * <p>
+    * XPathString ensures that only string data are serialized.  Upon
+    * deserialization, XPathString relies on XPath factory method to
+    * to create instances of the concrete XPath wrapper currently
+    * configured.</p>
+    */
+   private final static class XPathString implements Serializable {
+      /**
+       * The XPath expression as a string.
+       */
+      private String xPath = null;
+
+      /**
+       * Creates a new XPathString instance from the specified
+       * XPath expression.
+       *
+       * @param  xpath   the XPath expression.
+       */
+      public XPathString(String xpath) {
+         super();
+
+         this.xPath = xpath;
+      }
+
+      /**
+       * <i>[Serialization support]</i> Resolves the read XPathString
+       * objects into XPath implementations.
+       *
+       * @return an instance of a concrete implementation of
+       *         XPath.
+       *
+       * @throws ObjectStreamException   if no XPath could be built
+       *                                 from the read object.
+       */
+      private Object readResolve() throws ObjectStreamException {
+         try {
+            return XPath.newInstance(this.xPath);
+         }
+         catch (JDOMException ex1) {
+            throw new InvalidObjectException(
+                        "Can't create XPath object for expression \"" +
+                        this.xPath + "\": " + ex1.toString());
+         }
+      }
+   }
+}
+

src/org/jdom/xpath/package.html

@@ -0,0 +1,6 @@
+<body>
+
+Support for XPath from within JDOM.  XPath provides a common interface with a
+pluggable back-end.  The default back end is Jaxen.
+
+</body>

src/uk/co/md87/evetool/ApiFactory.java

@@ -0,0 +1,35 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.evetool;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+import uk.co.md87.evetool.api.EveApi;
+
+/**
+ *
+ * @author chris
+ */
+public class ApiFactory {
+
+    private static String dbURL = "jdbc:derby:db/eveApi;create=true;user=eveApi;password=api881";
+
+    private static Connection createConnection() {
+        try {
+            return DriverManager.getConnection(dbURL);
+        } catch (SQLException ex) {
+            ex.printStackTrace();
+            return null;
+        }
+    }
+
+    public static EveApi getApi() {
+        return new EveApi(createConnection());
+    }
+
+}

src/uk/co/md87/evetool/Main.java

@@ -0,0 +1,21 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.evetool;
+
+/**
+ *
+ * @author chris
+ */
+public class Main {
+
+    /**
+     * @param args the command line arguments
+     */
+    public static void main(String[] args) {
+        ApiFactory.getApi();
+    }
+
+}

src/uk/co/md87/evetool/api/EveApi.java

@@ -0,0 +1,22 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.evetool.api;
+
+import java.sql.Connection;
+
+/**
+ *
+ * @author chris
+ */
+public class EveApi {
+
+    private final Connection sqlConnection;
+
+    public EveApi(Connection sqlConnection) {
+        this.sqlConnection = sqlConnection;
+    }
+
+}

src/uk/co/md87/evetool/api/io/ApiDownloader.java

@@ -0,0 +1,62 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.evetool.api.io;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @author chris
+ */
+public class ApiDownloader {
+    
+    private String userID = null;
+    private String charID = null;
+    private String apiKey = null;
+
+    public ApiDownloader() {
+    }
+
+    public ApiDownloader(final String userID, final String apiKey) {
+        this.userID = userID;
+        this.apiKey = apiKey;
+    }
+
+    public ApiDownloader(final String userID, final String apiKey, final String charID) {
+        this.userID = userID;
+        this.apiKey = apiKey;
+        this.charID = charID;
+    }
+
+    public String getPage(final String method, final Map<String, String> args)
+            throws IOException {
+        final Map<String, String> ourArgs = new HashMap<String, String>(args);
+        // TODO: Caching
+
+        if (userID != null) {
+            ourArgs.put("userID", userID);
+        }
+
+        if (apiKey != null) {
+            ourArgs.put("apiKey", apiKey);
+        }
+
+        if (charID != null) {
+            ourArgs.put("characterID", charID);
+        }
+
+        final StringBuilder builder = new StringBuilder();
+        for (String line : Downloader.getPage(method, ourArgs)) {
+            builder.append(line);
+        }
+
+        return builder.toString();
+    }
+
+}

src/uk/co/md87/evetool/api/io/DownloadListener.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.co.md87.evetool.api.io;
+
+/**
+ * Defines the method that objects interested in receiving download progress
+ * updates should implement.
+ * 
+ * @author chris
+ */
+public interface DownloadListener {
+
+    /**
+     * Called when the progress of the download has changed.
+     * 
+     * @param percent The percentage of the file that has been downloaded
+     */
+    void downloadProgress(float percent);
+    
+    /**
+     * Called to notify the listener if this download has an indeterminate length.
+     * 
+     * @param indeterminate true or false
+     * 
+     * @since 0.6
+     */
+    void setIndeterminate(final boolean indeterminate);
+}

src/uk/co/md87/evetool/api/io/Downloader.java

@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.co.md87.evetool.api.io;
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Allows easy downloading of files from HTTP sites.
+ *
+ * @author Chris
+ */
+public final class Downloader {
+    
+    /** Creates a new instance of Downloader. */
+    private Downloader() {
+        // Shouldn't be used
+    }
+    
+    /**
+     * Retrieves the specified page.
+     * 
+     * @param url The URL to retrieve
+     * @return A list of lines received from the server
+     * @throws java.net.MalformedURLException If the URL is malformed
+     * @throws java.io.IOException If there's an I/O error while downloading
+     */
+    public static List<String> getPage(final String url)
+            throws MalformedURLException, IOException {
+        
+        return getPage(url, "");
+    }
+
+    /**
+     * Retrieves the specified page, sending the specified post data.
+     * 
+     * @param url The URL to retrieve
+     * @param postData The raw POST data to send
+     * @return A list of lines received from the server
+     * @throws java.net.MalformedURLException If the URL is malformed
+     * @throws java.io.IOException If there's an I/O error while downloading
+     */    
+    public static List<String> getPage(final String url, final String postData)
+            throws MalformedURLException, IOException {
+        
+        final List<String> res = new ArrayList<String>();
+        
+        final URLConnection urlConn = getConnection(url, postData);
+        
+        final BufferedReader in = new BufferedReader(
+                new InputStreamReader(urlConn.getInputStream()));
+        
+        String line;
+        
+        do {
+            line = in.readLine();
+            
+            if (line != null) {
+                res.add(line);
+            }
+        } while (line != null);
+        
+        in.close();
+        
+        return res;
+    }
+    
+    /**
+     * Retrieves the specified page, sending the specified post data.
+     * 
+     * @param url The URL to retrieve
+     * @param postData A map of post data that should be sent
+     * @return A list of lines received from the server
+     * @throws java.net.MalformedURLException If the URL is malformed
+     * @throws java.io.IOException If there's an I/O error while downloading
+     */    
+    public static List<String> getPage(final String url, final Map<String, String> postData)
+            throws MalformedURLException, IOException {
+        
+        final StringBuilder data = new StringBuilder();
+        
+        try {
+            for (Map.Entry<String, String> entry : postData.entrySet()) {
+                data.append('&');
+                data.append(URLEncoder.encode(entry.getKey(), "UTF-8"));
+                data.append('=');
+                data.append(URLEncoder.encode(entry.getValue(), "UTF-8"));
+            }
+        } catch (UnsupportedEncodingException ex) {
+            // Do nothing
+        }
+        
+        return getPage(url, data.length() == 0 ? "" : data.substring(1));
+    }
+    
+    /**
+     * Downloads the specified page to disk.
+     * 
+     * @param url The URL to retrieve
+     * @param file The file to save the page to
+     * @throws java.io.IOException If there's an I/O error while downloading
+     */    
+    public static void downloadPage(final String url, final String file)
+            throws IOException {    
+        downloadPage(url, file, null);
+    }
+    
+    /**
+     * Downloads the specified page to disk.
+     * 
+     * @param url The URL to retrieve
+     * @param file The file to save the page to
+     * @param listener The progress listener for this download
+     * @throws java.io.IOException If there's an I/O error while downloading
+     */    
+    public static void downloadPage(final String url, final String file,
+            final DownloadListener listener) throws IOException {
+                
+        final URLConnection urlConn = getConnection(url, "");
+        final File myFile = new File(file);
+        
+        final FileOutputStream output = new FileOutputStream(myFile);
+        final InputStream input = urlConn.getInputStream();
+        final int length = urlConn.getContentLength();
+        int current = 0;
+
+        if (listener != null) {
+            listener.setIndeterminate(length == -1);
+        }
+        
+        final byte[] buffer = new byte[512];
+        int count;
+        
+        do {
+            count = input.read(buffer);
+            
+            if (count > 0) {
+                current += count;
+                output.write(buffer, 0, count);
+                
+                if (listener != null && length != -1) {
+                    listener.downloadProgress(100 * (float) current / length);
+                }
+            }
+        } while (count > 0);
+
+        input.close();
+        output.close();
+    }    
+    
+    /**
+     * Creates an URL connection for the specified URL and data.
+     * 
+     * @param url The URL to connect to
+     * @param postData The POST data to pass to the URL
+     * @return An URLConnection for the specified URL/data
+     * @throws java.net.MalformedURLException If the specified URL is malformed
+     * @throws java.io.IOException If an I/O exception occurs while connecting
+     */
+    private static URLConnection getConnection(final String url, final String postData)
+            throws MalformedURLException, IOException {
+        final URL myUrl = new URL(url);
+        final URLConnection urlConn = myUrl.openConnection();
+        
+        urlConn.setUseCaches(false);
+        urlConn.setDoInput(true);
+        urlConn.setDoOutput(postData.length() > 0);
+        urlConn.setConnectTimeout(10000);
+        
+        if (postData.length() > 0) {
+            urlConn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            
+            final DataOutputStream out = new DataOutputStream(urlConn.getOutputStream());
+            out.writeBytes(postData);
+            out.flush();
+            out.close();
+        }
+        
+        return urlConn;
+    }
+    
+}

src/uk/co/md87/evetool/api/parser/ApiElement.java

@@ -0,0 +1,27 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.evetool.api.parser;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author chris
+ */
+public class ApiElement {
+
+    private List<ApiElement> children = new ArrayList<ApiElement>();
+
+    public void addChild(final ApiElement e) {
+        children.add(e);
+    }
+
+    public List<ApiElement> getChildren() {
+        return children;
+    }
+
+}

src/uk/co/md87/evetool/api/parser/ApiParser.java

@@ -0,0 +1,53 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.evetool.api.parser;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.List;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.input.SAXBuilder;
+
+/**
+ *
+ * @author chris
+ */
+public class ApiParser {
+
+    public ApiResult parseResult(final String data) throws IOException, JDOMException,
+            ParserException {
+        return parseResult(new SAXBuilder().build(new StringReader(data)));
+    }
+
+    public ApiResult parseResult(final Document doc) throws IOException, JDOMException,
+            ParserException {
+        final Element root = doc.getRootElement();
+
+        if (!"eveapi".equals(root.getName())) {
+            throw new ParserException("Unexpected response; root element is not <eveapi/>");
+        }
+
+        final ApiResult result = new ApiResult();
+        addElements(result, root);
+
+        return result;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected void addElements(final ApiElement result, final Element element) {
+        for (Element child : (List<Element>) element.getChildren()) {
+            final ApiElement apiElement = new NamedApiElement(child.getName());
+            // TODO: Parse rowsets correctly
+            // TODO: Include content and attributes
+            result.addChild(apiElement);
+
+            addElements(apiElement, child);
+        }
+    }
+
+}

src/uk/co/md87/evetool/api/parser/ApiResult.java

@@ -0,0 +1,21 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.evetool.api.parser;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * @author chris
+ */
+public class ApiResult extends ApiElement {
+
+    private boolean cacheHit;
+    private Date cachedSince;
+    private Date cachedUntil;
+
+}

src/uk/co/md87/evetool/api/parser/NamedApiElement.java

@@ -0,0 +1,24 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.evetool.api.parser;
+
+/**
+ *
+ * @author chris
+ */
+public class NamedApiElement extends ApiElement {
+
+    private final String name;
+
+    public NamedApiElement(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+}

src/uk/co/md87/evetool/api/parser/ParserException.java

@@ -0,0 +1,22 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.evetool.api.parser;
+
+/**
+ *
+ * @author chris
+ */
+public class ParserException extends Exception {
+
+    public ParserException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ParserException(String message) {
+        super(message);
+    }
+
+}

test/uk/co/md87/evetool/api/data/sample-charsheet.xml

@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<eveapi version="1">
+    <currentTime>2007-06-18 22:49:01</currentTime>
+    <result>
+        <characterID>150337897</characterID>
+        <name>corpslave</name>
+        <race>Minmatar</race>
+        <bloodLine>Brutor</bloodLine>
+        <gender>Female</gender>
+        <corporationName>corpexport Corp</corporationName>
+        <corporationID>150337746</corporationID>
+        <balance>190210393.87</balance>
+        <attributeEnhancers>
+            <intelligenceBonus>
+                <augmentatorName>Snake Delta</augmentatorName>
+                 <augmentatorValue>3</augmentatorValue>
+             </intelligenceBonus>
+             <memoryBonus>
+                 <augmentatorName>Halo Beta</augmentatorName>
+                 <augmentatorValue>3</augmentatorValue>
+             </memoryBonus>
+         </attributeEnhancers>
+        <attributes>
+            <intelligence>6</intelligence>
+            <memory>4</memory>
+            <charisma>7</charisma>
+            <perception>12</perception>
+            <willpower>10</willpower>
+        </attributes>
+        <rowset name="skills" key="typeID">
+            <row typeID="3431" level="3" skillpoints="8000"/>
+            <row typeID="3413" level="3" skillpoints="8000"/>
+            <row typeID="21059" level="1" skillpoints="500"/>
+            <row typeID="3416" level="3" skillpoints="8000"/>
+        </rowset>
+    </result>
+    <cachedUntil>2007-06-18 23:49:01</cachedUntil>
+</eveapi>

test/uk/co/md87/evetool/api/parser/ApiParserTest.java

@@ -0,0 +1,38 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.evetool.api.parser;
+
+import org.jdom.input.SAXBuilder;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author chris
+ */
+public class ApiParserTest {
+
+    /**
+     * Test of parseResult method, of class ApiParser.
+     */
+    @Test
+    public void testParseResult() throws Exception {
+        final ApiParser parser = new ApiParser();
+        final ApiResult result = parser.parseResult(new SAXBuilder().build(getClass()
+                .getResourceAsStream("/uk/co/md87/evetool/api/data/sample-charsheet.xml")));
+
+        assertEquals(3, result.getChildren().size());
+
+        assertEquals("currentTime", ((NamedApiElement) result.getChildren().get(0)).getName());
+        assertEquals("result", ((NamedApiElement) result.getChildren().get(1)).getName());
+        assertEquals("cachedUntil", ((NamedApiElement) result.getChildren().get(2)).getName());
+
+        assertTrue(result.getChildren().get(0).getChildren().isEmpty());
+        assertEquals(11, result.getChildren().get(1).getChildren().size());
+        assertTrue(result.getChildren().get(2).getChildren().isEmpty());
+    }
+
+}