You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by jk...@apache.org on 2023/10/22 23:01:50 UTC

[xalan-java] branch xalan-java-mvn-refactored created (now beb73389)

This is an automated email from the ASF dual-hosted git repository.

jkesselm pushed a change to branch xalan-java-mvn-refactored
in repository https://gitbox.apache.org/repos/asf/xalan-java.git


      at beb73389 Deletions, additions, and modifications to complete Maven cut-over.

This branch includes the following new commits:

     new 604ecd7d Phase 1: Move unchanged files to conform to Maven conventions
     new beb73389 Deletions, additions, and modifications to complete Maven cut-over.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org


[xalan-java] 01/02: Phase 1: Move unchanged files to conform to Maven conventions

Posted by jk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jkesselm pushed a commit to branch xalan-java-mvn-refactored
in repository https://gitbox.apache.org/repos/asf/xalan-java.git

commit 604ecd7d041112745292586bd6eec4a816f582eb
Author: kubycsolutions <ke...@kubyc.solutions>
AuthorDate: Sun Oct 22 18:54:07 2023 -0400

    Phase 1: Move unchanged files to conform to Maven conventions
---
 commits.xml => ancient_history.commits.xml                  |   0
 {lib => samples/lib}/brazil-2.1.jar                         | Bin
 .../org/apache/xalan/samples}/AppletXMLtoHTML/foo-s1.xml    |   0
 .../apache/xalan/samples}/AppletXMLtoHTML/lts3611beac.jpg   |   0
 .../apache/xalan/samples}/AppletXMLtoHTML/rabbitwhorn.jpg   | Bin
 .../org/apache/xalan/samples}/AppletXMLtoHTML/s1ToHTML.xsl  |   0
 .../java/org/apache/xalan/samples}/AppletXMLtoHTML/trax.xml |   0
 .../apache/xalan/samples}/AppletXMLtoHTML/xalanApplets.xml  |   0
 .../org/apache/xalan/samples}/ApplyXPath/ApplyXPath.java    |   0
 .../main/java/org/apache/xalan/samples}/ApplyXPath/foo.xml  |   0
 .../apache/xalan/samples}/ApplyXPathDOM/ApplyXPathDOM.java  |   0
 .../java/org/apache/xalan/samples}/ApplyXPathDOM/foo.xml    |   0
 .../org/apache/xalan/samples}/CompiledApplet/README.applet  |   0
 .../xalan/samples}/CompiledApplet/TransformApplet.java      |   0
 .../org/apache/xalan/samples}/CompiledBrazil/README.brazil  |   0
 .../xalan/samples}/CompiledBrazil/TransformHandler.java     |   0
 .../java/org/apache/xalan/samples}/CompiledEJB/README.ejb   |   0
 .../apache/xalan/samples}/CompiledEJB/TransformBean.java    |   0
 .../apache/xalan/samples}/CompiledEJB/TransformHome.java    |   0
 .../apache/xalan/samples}/CompiledEJB/TransformRemote.java  |   0
 .../apache/xalan/samples}/CompiledEJB/TransformServlet.java |   0
 .../org/apache/xalan/samples}/CompiledJAXP/Compile.java     |   0
 .../org/apache/xalan/samples}/CompiledJAXP/README.cjaxp     |   0
 .../org/apache/xalan/samples}/CompiledJAXP/Transform.java   |   0
 .../xalan/samples}/CompiledServlet/CompileServlet.java      |   0
 .../apache/xalan/samples}/CompiledServlet/README.servlet    |   0
 .../samples/CompiledServlet/TransformationServlet.java}     |   0
 .../java/org/apache/xalan/samples}/DOM2DOM/DOM2DOM.java     |   0
 .../main/java/org/apache/xalan/samples}/DOM2DOM/birds.xml   |   0
 .../main/java/org/apache/xalan/samples}/DOM2DOM/birds.xsl   |   0
 .../main/java/org/apache/xalan/samples}/Pipe/Pipe.java      |   0
 .../main/java/org/apache/xalan/samples}/Pipe/foo.xml        |   0
 .../main/java/org/apache/xalan/samples}/Pipe/foo1.xsl       |   0
 .../main/java/org/apache/xalan/samples}/Pipe/foo2.xsl       |   0
 .../main/java/org/apache/xalan/samples}/Pipe/foo3.xsl       |   0
 .../java/org/apache/xalan/samples}/SAX2SAX/SAX2SAX.java     |   0
 .../main/java/org/apache/xalan/samples}/SAX2SAX/birds.xml   |   0
 .../main/java/org/apache/xalan/samples}/SAX2SAX/birds.xsl   |   0
 .../main/java/org/apache/xalan/samples}/SAX2SAX/foo.xml     |   0
 .../main/java/org/apache/xalan/samples}/SAX2SAX/foo.xsl     |   0
 .../xalan/samples}/SimpleTransform/SimpleTransform.java     |   0
 .../org/apache/xalan/samples}/SimpleTransform/birds.xml     |   0
 .../org/apache/xalan/samples}/SimpleTransform/birds.xsl     |   0
 .../java/org/apache/xalan/samples}/SimpleTransform/foo.xml  |   0
 .../java/org/apache/xalan/samples}/SimpleTransform/foo.xsl  |   0
 .../main/java/org/apache/xalan/samples}/Trace/Trace.java    |   0
 .../main/java/org/apache/xalan/samples}/Trace/foo.xml       |   0
 .../main/java/org/apache/xalan/samples}/Trace/foo.xsl       |   0
 .../xalan/samples}/TransformThread/TransformThread.java     |   0
 .../java/org/apache/xalan/samples}/TransformThread/foo0.xml |   0
 .../java/org/apache/xalan/samples}/TransformThread/foo0.xsl |   0
 .../java/org/apache/xalan/samples}/TransformThread/foo1.xml |   0
 .../java/org/apache/xalan/samples}/TransformThread/foo1.xsl |   0
 .../xalan/samples}/UseStylesheetPI/UseStylesheetPI.java     |   0
 .../java/org/apache/xalan/samples}/UseStylesheetPI/foo.xsl  |   0
 .../java/org/apache/xalan/samples}/UseStylesheetPI/fooX.xml |   0
 .../samples}/UseStylesheetParam/UseStylesheetParam.java     |   0
 .../org/apache/xalan/samples}/UseStylesheetParam/foo.xml    |   0
 .../org/apache/xalan/samples}/UseStylesheetParam/foo.xsl    |   0
 .../apache/xalan/samples}/UseXMLFilters/UseXMLFilters.java  |   0
 .../java/org/apache/xalan/samples}/UseXMLFilters/foo.xml    |   0
 .../java/org/apache/xalan/samples}/UseXMLFilters/foo1.xsl   |   0
 .../java/org/apache/xalan/samples}/UseXMLFilters/foo2.xsl   |   0
 .../java/org/apache/xalan/samples}/UseXMLFilters/foo3.xsl   |   0
 .../java/org/apache/xalan/samples}/Validate/Validate.java   |   0
 .../apache/xalan/samples}/Validate/ValidateXMLInput.java    |   0
 .../main/java/org/apache/xalan/samples}/Validate/birds.xml  |   0
 .../main/java/org/apache/xalan/samples}/Validate/birds.xsl  |   0
 .../org/apache/xalan/samples}/XPathAPI/ApplyXPathJAXP.java  |   0
 .../xalan/samples}/XPathAPI/ExtensionFunctionResolver.java  |   0
 .../org/apache/xalan/samples}/XPathAPI/ExtensionTest.java   |   0
 .../org/apache/xalan/samples}/XPathAPI/XPathResolver.java   |   0
 .../main/java/org/apache/xalan/samples}/XPathAPI/foo.xml    |   0
 .../java/org/apache/xalan/samples}/XPathAPI/numlist.xml     |   0
 .../java/org/apache/xalan/samples}/extensions/1-redir.xml   |   0
 .../java/org/apache/xalan/samples}/extensions/1-redir.xsl   |   0
 .../org/apache/xalan/samples}/extensions/2-basicJscript.xml |   0
 .../org/apache/xalan/samples}/extensions/2-basicJscript.xsl |   0
 .../apache/xalan/samples}/extensions/3-java-namespace.xml   |   0
 .../apache/xalan/samples}/extensions/3-java-namespace.xsl   |   0
 .../org/apache/xalan/samples}/extensions/4-numlistJava.xsl  |   0
 .../apache/xalan/samples}/extensions/5-numlistJscript.xsl   |   0
 .../java/org/apache/xalan/samples}/extensions/IntDate.java  |   0
 .../org/apache/xalan/samples}/extensions/MyCounter.java     |   0
 .../java/org/apache/xalan/samples}/extensions/numlist.xml   |   0
 .../xalan/samples}/extensions/sql/GETTING_STARTED.txt       |   0
 .../samples}/extensions/sql/basic-connection/DumpSQL.xsl    |   0
 .../samples}/extensions/sql/basic-connection/dbinfo.xml     |   0
 .../extensions/sql/basic-connection/dbtest-cinfo.xsl        |   0
 .../samples}/extensions/sql/basic-connection/dbtest.xsl     |   0
 .../org/apache/xalan/samples}/extensions/sql/createdb.sql   |   0
 .../extensions/sql/extConnection}/ExternalConnection.java   |   0
 .../xalan/samples/extensions/sql/extConnection}/dbtest.xsl  |   0
 .../apache/xalan/samples}/extensions/sql/pquery/dbinfo.xml  |   0
 .../apache/xalan/samples}/extensions/sql/pquery/dbtest.xsl  |   0
 .../org/apache/xalan/samples}/extensions/sql/runDerby.bat   |   0
 .../org/apache/xalan/samples}/extensions/sql/runDerby.sh    |   0
 .../xalan/samples}/extensions/sql/runExtConnection.bat      |   0
 .../xalan/samples}/extensions/sql/runExtConnection.sh       |   0
 .../org/apache/xalan/samples}/extensions/sql/runXalan.bat   |   0
 .../org/apache/xalan/samples}/extensions/sql/runXalan.sh    |   0
 .../xalan/samples}/extensions/sql/show-error/dbinfo.xml     |   0
 .../samples}/extensions/sql/show-error/invalidConn.xsl      |   0
 .../samples}/extensions/sql/show-error/invalidPQuery.xsl    |   0
 .../samples}/extensions/sql/show-error/invalidQuery.xsl     |   0
 .../samples}/extensions/sql/streamable/cachedNodes.xsl      |   0
 .../xalan/samples}/extensions/sql/streamable/dbinfo.xml     |   0
 .../xalan/samples}/extensions/sql/streamable/pivot.xsl      |   0
 .../samples}/extensions/sql/streamable/streamNodes.xsl      |   0
 .../java/org/apache/xalan/samples}/servlet/ApplyXSLT.java   |   0
 .../apache/xalan/samples}/servlet/ApplyXSLTException.java   |   0
 .../apache/xalan/samples}/servlet/ApplyXSLTListener.java    |   0
 .../apache/xalan/samples}/servlet/ApplyXSLTProperties.java  |   0
 .../xalan/samples}/servlet/DefaultApplyXSLTProperties.java  |   0
 .../apache/xalan/samples}/servlet/SimpleXSLTServlet.java    |   0
 .../xalan/samples}/servlet/UseStylesheetParamServlet.java   |   0
 .../xalan/samples}/servlet/XSLTServletWithParams.java       |   0
 .../main/java/org/apache/xalan/samples}/servlet/birds.xml   |   0
 .../main/java/org/apache/xalan/samples}/servlet/birds.xsl   |   0
 .../java/org/apache/xalan/samples}/servlet/booklist1.xsl    |   0
 .../java/org/apache/xalan/samples}/servlet/booklist2.xsl    |   0
 .../main/java/org/apache/xalan/samples}/servlet/catalog.xml |   0
 .../main/java/org/apache/xalan/samples}/servlet/default.xsl |   0
 .../java/org/apache/xalan/samples}/servlet/default2.xsl     |   0
 .../java/org/apache/xalan/samples}/servlet/fooparam.xml     |   0
 .../java/org/apache/xalan/samples}/servlet/fooparam.xsl     |   0
 .../java/org/apache/xalan/samples}/servlet/jspSample.jsp    |   0
 .../java/org/apache/xalan/samples}/servlet/media.properties |   0
 .../main/java/org/apache/xalan/samples}/servlet/web.xml     |   0
 .../translets/JAXPTransletMultipleTransformations.java      |   0
 .../samples}/translets/JAXPTransletOneTransformation.java   |   0
 .../main/java/org/apache/xalan/samples}/translets/todo.xml  |   0
 .../main/java/org/apache/xalan/samples}/translets/todo.xsl  |   0
 .../java/org/apache/xalan/samples}/translets/todotoo.xml    |   0
 .../apache/xalan/samples}/trax/ExampleContentHandler.java   |   0
 .../main/java/org/apache/xalan/samples}/trax/Examples.java  |   0
 .../main/java/org/apache/xalan/samples}/trax/xml/baz.xml    |   0
 .../main/java/org/apache/xalan/samples}/trax/xml/foo.xml    |   0
 .../org/apache/xalan/samples}/trax/xml/subdir1/foo2.xml     |   0
 .../apache/xalan/samples}/trax/xml/subdir1/subdir2/foo3.xml |   0
 .../main/java/org/apache/xalan/samples}/trax/xsl/baz.xsl    |   0
 .../main/java/org/apache/xalan/samples}/trax/xsl/foo.xsl    |   0
 .../main/java/org/apache/xalan/samples}/trax/xsl/foo2.xsl   |   0
 .../main/java/org/apache/xalan/samples}/trax/xsl/foo3.xsl   |   0
 .../java/org/apache/xalan/samples}/trax/xsl/inc1/inc1.xsl   |   0
 .../org/apache/xalan/samples}/trax/xsl/inc1/inc2/inc2.xsl   |   0
 .../site/xhtml/AppletXMLtoHTML/README.xhtml}                |   0
 .../site/xhtml/AppletXMLtoHTML/appletXMLtoHTML.xhtml}       |   0
 .../site/xhtml/AppletXMLtoHTML/client.xhtml}                |   0
 .../site/xhtml/AppletXMLtoHTML/target.xhtml}                |   0
 .../readme.html => src/site/xhtml/ApplyXPath/readme.xhtml}  |   0
 .../site/xhtml/ApplyXPathDOM/readme.xhtml}                  |   0
 .../site/xhtml/CompiledApplet/index.xhtml}                  |   0
 .../menu.html => src/site/xhtml/CompiledApplet/menu.xhtml}  |   0
 .../site/xhtml/CompiledApplet/singleTransform.xhtml}        |   0
 .../site/xhtml/CompiledEJB/bottom_frame.xhtml}              |   0
 .../index.html => src/site/xhtml/CompiledEJB/index.xhtml}   |   0
 .../site/xhtml/CompiledEJB/top_frame.xhtml}                 |   0
 .../readme.html => src/site/xhtml/DOM2DOM/readme.xhtml}     |   0
 .../{Pipe/readme.html => src/site/xhtml/Pipe/readme.xhtml}  |   0
 .../site/xhtml/SimpleTransform/readme.xhtml}                |   0
 .../site/xhtml/UseStylesheetParam/readme.xhtml}             |   0
 .../site/xhtml/UseXMLFilters/readme.xhtml}                  |   0
 .../readme.html => src/site/xhtml/Validate/readme.xhtml}    |   0
 .../readme.html => src/site/xhtml/extensions/readme.xhtml}  |   0
 .../xhtml/extensions/sql/basic-connection/readme.xhtml}     |   0
 .../site/xhtml/extensions/sql/extConnection/readme.xhtml}   |   0
 .../site/xhtml/extensions/sql/pquery/readme.xhtml}          |   0
 .../site/xhtml/extensions/sql/readme.xhtml}                 |   0
 .../site/xhtml/extensions/sql/show-error/readme.xhtml}      |   0
 .../site/xhtml/extensions/sql/streamable/readme.xhtml}      |   0
 .../readme.html => src/site/xhtml/servlet/readme.xhtml}     |   0
 .../readme.html => src/site/xhtml/translets/readme.xhtml}   |   0
 {tools => samples/tools}/xalan2jtaglet.jar                  | Bin
 {src => serializer/src/main/java}/MANIFEST.SERIALIZER       |   0
 .../org/apache/xml/serializer/AttributesImplSerializer.java |   0
 .../src/main/java}/org/apache/xml/serializer/CharInfo.java  |   0
 .../java}/org/apache/xml/serializer/DOM3Serializer.java     |   0
 .../main/java}/org/apache/xml/serializer/DOMSerializer.java |   0
 .../main/java}/org/apache/xml/serializer/ElemContext.java   |   0
 .../src/main/java}/org/apache/xml/serializer/ElemDesc.java  |   0
 .../java}/org/apache/xml/serializer/EmptySerializer.java    |   0
 .../main/java}/org/apache/xml/serializer/EncodingInfo.java  |   0
 .../src/main/java}/org/apache/xml/serializer/Encodings.java |   0
 .../org/apache/xml/serializer/ExtendedContentHandler.java   |   0
 .../org/apache/xml/serializer/ExtendedLexicalHandler.java   |   0
 .../src/main/java}/org/apache/xml/serializer/Method.java    |   0
 .../java}/org/apache/xml/serializer/NamespaceMappings.java  |   0
 .../main/java}/org/apache/xml/serializer/ObjectFactory.java |   0
 .../org/apache/xml/serializer/OutputPropertiesFactory.java  |   0
 .../org/apache/xml/serializer/OutputPropertyUtils.java      |   0
 .../java}/org/apache/xml/serializer/SecuritySupport.java    |   0
 .../org/apache/xml/serializer/SerializationHandler.java     |   0
 .../main/java}/org/apache/xml/serializer/Serializer.java    |   0
 .../java}/org/apache/xml/serializer/SerializerBase.java     |   0
 .../org/apache/xml/serializer/SerializerConstants.java      |   0
 .../java}/org/apache/xml/serializer/SerializerFactory.java  |   0
 .../java}/org/apache/xml/serializer/SerializerTrace.java    |   0
 .../org/apache/xml/serializer/SerializerTraceWriter.java    |   0
 .../java}/org/apache/xml/serializer/ToHTMLSAXHandler.java   |   0
 .../main/java}/org/apache/xml/serializer/ToHTMLStream.java  |   0
 .../main/java}/org/apache/xml/serializer/ToSAXHandler.java  |   0
 .../src/main/java}/org/apache/xml/serializer/ToStream.java  |   0
 .../java}/org/apache/xml/serializer/ToTextSAXHandler.java   |   0
 .../main/java}/org/apache/xml/serializer/ToTextStream.java  |   0
 .../java}/org/apache/xml/serializer/ToUnknownStream.java    |   0
 .../java}/org/apache/xml/serializer/ToXMLSAXHandler.java    |   0
 .../main/java}/org/apache/xml/serializer/ToXMLStream.java   |   0
 .../org/apache/xml/serializer/TransformStateSetter.java     |   0
 .../main/java}/org/apache/xml/serializer/TreeWalker.java    |   0
 .../main/java}/org/apache/xml/serializer/WriterChain.java   |   0
 .../main/java}/org/apache/xml/serializer/WriterToASCI.java  |   0
 .../org/apache/xml/serializer/WriterToUTF8Buffered.java     |   0
 .../org/apache/xml/serializer/XSLOutputAttributes.java      |   0
 .../org/apache/xml/serializer/dom3/DOM3SerializerImpl.java  |   0
 .../org/apache/xml/serializer/dom3/DOM3TreeWalker.java      |   0
 .../java}/org/apache/xml/serializer/dom3/DOMConstants.java  |   0
 .../org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java |   0
 .../java}/org/apache/xml/serializer/dom3/DOMErrorImpl.java  |   0
 .../org/apache/xml/serializer/dom3/DOMLocatorImpl.java      |   0
 .../java}/org/apache/xml/serializer/dom3/DOMOutputImpl.java |   0
 .../org/apache/xml/serializer/dom3/DOMStringListImpl.java   |   0
 .../org/apache/xml/serializer/dom3/LSSerializerImpl.java    |   0
 .../org/apache/xml/serializer/dom3/NamespaceSupport.java    |   0
 .../main/java}/org/apache/xml/serializer/utils/AttList.java |   0
 .../java}/org/apache/xml/serializer/utils/BoolStack.java    |   0
 .../java}/org/apache/xml/serializer/utils/DOM2Helper.java   |   0
 .../java}/org/apache/xml/serializer/utils/Messages.java     |   0
 .../main/java}/org/apache/xml/serializer/utils/MsgKey.java  |   0
 .../org/apache/xml/serializer/utils/SerializerMessages.java |   0
 .../apache/xml/serializer/utils/SerializerMessages_ca.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_cs.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_de.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_en.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_es.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_fr.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_hu.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_it.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_ja.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_ko.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_pl.java  |   0
 .../xml/serializer/utils/SerializerMessages_pt_BR.java      |   0
 .../apache/xml/serializer/utils/SerializerMessages_ru.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_sk.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_sl.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_sv.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_tr.java  |   0
 .../apache/xml/serializer/utils/SerializerMessages_zh.java  |   0
 .../xml/serializer/utils/SerializerMessages_zh_CN.java      |   0
 .../xml/serializer/utils/SerializerMessages_zh_TW.java      |   0
 .../org/apache/xml/serializer/utils/StringToIntTable.java   |   0
 .../org/apache/xml/serializer/utils/SystemIDResolver.java   |   0
 .../src/main/java}/org/apache/xml/serializer/utils/URI.java |   0
 .../main/java}/org/apache/xml/serializer/utils/Utils.java   |   0
 .../xml/serializer/utils/WrappedRuntimeException.java       |   0
 .../java}/org/apache/xml/serializer/utils/XML11Char.java    |   0
 .../main/java}/org/apache/xml/serializer/utils/XMLChar.java |   0
 .../org/apache/xml/serializer/Encodings.properties          |   0
 .../org/apache/xml/serializer/HTMLEntities.properties       |   0
 .../main/resources}/org/apache/xml/serializer/Version.src   |   0
 .../org/apache/xml/serializer/XMLEntities.properties        |   0
 .../org/apache/xml/serializer/output_html.properties        |   0
 .../org/apache/xml/serializer/output_text.properties        |   0
 .../org/apache/xml/serializer/output_unknown.properties     |   0
 .../org/apache/xml/serializer/output_xml.properties         |   0
 .../main/resources}/org/apache/xml/serializer/package.html  |   0
 {xdocs => stylebook}/sources/design/compilation.gif         | Bin
 {xdocs => stylebook}/sources/design/conceptual.gif          | Bin
 {xdocs => stylebook}/sources/design/data.gif                | Bin
 {xdocs => stylebook}/sources/design/design2_0_0.xml         |   0
 {xdocs => stylebook}/sources/design/org_apache.gif          | Bin
 {xdocs => stylebook}/sources/design/process.gif             | Bin
 {xdocs => stylebook}/sources/design/trax.gif                | Bin
 {xdocs => stylebook}/sources/design/xalan.gif               | Bin
 {xdocs => stylebook}/sources/design/xalan1_1x1.gif          | Bin
 {xdocs => stylebook}/sources/design/xmllogo.gif             | Bin
 {xdocs => stylebook}/sources/design/xpath.gif               | Bin
 {xdocs => stylebook}/sources/design/xslt_abstract.gif       | Bin
 .../sources/entities.src => stylebook/sources/entities.ent  |   0
 {xdocs => stylebook}/sources/xalan-apache-org-site.xml      |   0
 {xdocs => stylebook}/sources/xalan-apache-org/index.xml     |   0
 {xdocs => stylebook}/sources/xalan-collate.xsl              |   0
 {xdocs => stylebook}/sources/xalan-jlocal.xml               |   0
 {xdocs => stylebook}/sources/xalan-jsite.xml                |   0
 {xdocs => stylebook}/sources/xalan/bugreporting.xml         |   0
 {xdocs => stylebook}/sources/xalan/builds.xml               |   0
 {xdocs => stylebook}/sources/xalan/charter.xml              |   0
 {xdocs => stylebook}/sources/xalan/commandline.xml          |   0
 {xdocs => stylebook}/sources/xalan/commandline_xsltc.xml    |   0
 {xdocs => stylebook}/sources/xalan/contact_us.xml           |   0
 {xdocs => stylebook}/sources/xalan/downloads.xml            |   0
 {xdocs => stylebook}/sources/xalan/dtm.xml                  |   0
 {xdocs => stylebook}/sources/xalan/extensions.xml           |   0
 {xdocs => stylebook}/sources/xalan/extensions_xsltc.xml     |   0
 {xdocs => stylebook}/sources/xalan/extensionslib.xml        |   0
 {xdocs => stylebook}/sources/xalan/faq.xml                  |   0
 {xdocs => stylebook}/sources/xalan/features.xml             |   0
 {xdocs => stylebook}/sources/xalan/getstarted.xml           |   0
 {xdocs => stylebook}/sources/xalan/history.xml              |   0
 {xdocs => stylebook}/sources/xalan/index.xml                |   0
 {xdocs => stylebook}/sources/xalan/overview.xml             |   0
 {xdocs => stylebook}/sources/xalan/public_apis.xml          |   0
 {xdocs => stylebook}/sources/xalan/readme.xml               |   0
 {xdocs => stylebook}/sources/xalan/resources.xml            |   0
 {xdocs => stylebook}/sources/xalan/samples.xml              |   0
 {xdocs => stylebook}/sources/xalan/trax.xml                 |   0
 {xdocs => stylebook}/sources/xalan/usagepatterns.xml        |   0
 {xdocs => stylebook}/sources/xalan/whatsnew.xml             |   0
 {xdocs => stylebook}/sources/xalan/xmlfilters.gif           | Bin
 {xdocs => stylebook}/sources/xalan/xpath_apis.xml           |   0
 {xdocs => stylebook}/sources/xalan/xsltc_history.xml        |   0
 {xdocs => stylebook}/sources/xalan/xsltc_usage.xml          |   0
 {xdocs => stylebook}/sources/xalandesign.xml                |   0
 {xdocs => stylebook}/sources/xsltc.xml                      |   0
 {xdocs => stylebook}/sources/xsltc/DOMInterface.gif         | Bin
 {xdocs => stylebook}/sources/xsltc/DOMLocking.gif           | Bin
 {xdocs => stylebook}/sources/xsltc/README                   |   0
 {xdocs => stylebook}/sources/xsltc/README.APACHE            |   0
 {xdocs => stylebook}/sources/xsltc/README.api               |   0
 {xdocs => stylebook}/sources/xsltc/README.xslt              |   0
 {xdocs => stylebook}/sources/xsltc/README.xsltc             |   0
 {xdocs => stylebook}/sources/xsltc/README2                  |   0
 {xdocs => stylebook}/sources/xsltc/all_namespaces.gif       | Bin
 {xdocs => stylebook}/sources/xsltc/ast_stage1.gif           | Bin
 {xdocs => stylebook}/sources/xsltc/ast_stage2.gif           | Bin
 {xdocs => stylebook}/sources/xsltc/ast_stage3.gif           | Bin
 {xdocs => stylebook}/sources/xsltc/cast_expression.gif      | Bin
 {xdocs => stylebook}/sources/xsltc/class_loader.gif         | Bin
 {xdocs => stylebook}/sources/xsltc/compiler_AST.gif         | Bin
 {xdocs => stylebook}/sources/xsltc/compiler_DOM.gif         | Bin
 .../sources/xsltc/compiler_architecture.gif                 | Bin
 {xdocs => stylebook}/sources/xsltc/compiler_design.gif      | Bin
 {xdocs => stylebook}/sources/xsltc/dom_namespace1.gif       | Bin
 {xdocs => stylebook}/sources/xsltc/dom_namespace2.gif       | Bin
 {xdocs => stylebook}/sources/xsltc/dom_namespace3.gif       | Bin
 {xdocs => stylebook}/sources/xsltc/index.xml                |   0
 {xdocs => stylebook}/sources/xsltc/iterator_stack.gif       | Bin
 {xdocs => stylebook}/sources/xsltc/key_relations.gif        | Bin
 {xdocs => stylebook}/sources/xsltc/match_namespace1.gif     | Bin
 {xdocs => stylebook}/sources/xsltc/match_namespace2.gif     | Bin
 {xdocs => stylebook}/sources/xsltc/namespace_stack.gif      | Bin
 {xdocs => stylebook}/sources/xsltc/output_namespaces1.gif   | Bin
 {xdocs => stylebook}/sources/xsltc/output_namespaces2.gif   | Bin
 {xdocs => stylebook}/sources/xsltc/output_settings.gif      | Bin
 {xdocs => stylebook}/sources/xsltc/overall_design.gif       | Bin
 {xdocs => stylebook}/sources/xsltc/pattern_objects.gif      | Bin
 {xdocs => stylebook}/sources/xsltc/runtime_architecture.gif | Bin
 {xdocs => stylebook}/sources/xsltc/runtime_design.gif       | Bin
 {xdocs => stylebook}/sources/xsltc/runtime_type_mapping.gif | Bin
 {xdocs => stylebook}/sources/xsltc/sort_objects.gif         | Bin
 {xdocs => stylebook}/sources/xsltc/translet_wrapping.gif    | Bin
 {xdocs => stylebook}/sources/xsltc/trax_output_settings.gif | Bin
 .../sources/xsltc/trax_translet_wrapping.gif                | Bin
 {xdocs => stylebook}/sources/xsltc/type_mapping.gif         | Bin
 {xdocs => stylebook}/sources/xsltc/type_mappings.gif        | Bin
 {xdocs => stylebook}/sources/xsltc/typecast.gif             | Bin
 {xdocs => stylebook}/sources/xsltc/uri_resolver.gif         | Bin
 {xdocs => stylebook}/sources/xsltc/xsl_choose_design.xml    |   0
 {xdocs => stylebook}/sources/xsltc/xsl_comment_design.xml   |   0
 {xdocs => stylebook}/sources/xsltc/xsl_if_design.xml        |   0
 {xdocs => stylebook}/sources/xsltc/xsl_include_design.xml   |   0
 {xdocs => stylebook}/sources/xsltc/xsl_key_design.xml       |   0
 {xdocs => stylebook}/sources/xsltc/xsl_lang_design.xml      |   0
 {xdocs => stylebook}/sources/xsltc/xsl_sort_design.xml      |   0
 {xdocs => stylebook}/sources/xsltc/xsl_unparsed_design.xml  |   0
 {xdocs => stylebook}/sources/xsltc/xsl_variable_design.xml  |   0
 .../sources/xsltc/xsl_whitespace_design.xml                 |   0
 {xdocs => stylebook}/sources/xsltc/xsltc_compiler.xml       |   0
 {xdocs => stylebook}/sources/xsltc/xsltc_dom.xml            |   0
 {xdocs => stylebook}/sources/xsltc/xsltc_iterators.xml      |   0
 {xdocs => stylebook}/sources/xsltc/xsltc_namespace.xml      |   0
 {xdocs => stylebook}/sources/xsltc/xsltc_native_api.xml     |   0
 {xdocs => stylebook}/sources/xsltc/xsltc_overview.xml       |   0
 {xdocs => stylebook}/sources/xsltc/xsltc_performance.xml    |   0
 {xdocs => stylebook}/sources/xsltc/xsltc_predicates.xml     |   0
 {xdocs => stylebook}/sources/xsltc/xsltc_runtime.xml        |   0
 {xdocs => stylebook}/sources/xsltc/xsltc_trax.xml           |   0
 {xdocs => stylebook}/sources/xsltc/xsltc_trax_api.xml       |   0
 {xdocs => stylebook}/style/dtd/spec.dtd                     |   0
 {xdocs => stylebook}/style/dtd/xsl-html40s.dtd              |   0
 {xdocs => stylebook}/style/loaderdesign.xml                 |   0
 {xdocs => stylebook}/style/stylesheets/design2project.xsl   |   0
 {xdocs => stylebook}/style/stylesheets/designdoc2html.xsl   |   0
 {xdocs => stylebook}/style/stylesheets/done.xsl             |   0
 {xdocs => stylebook}/style/stylesheets/spec.xsl             |   0
 {xdocs => stylebook}/style/stylesheets/xml2fo.xsl           |   0
 {tools => stylebook}/stylebook-1.0-b3_xalan-2.jar           | Bin
 {xdocs => stylebook}/xml-site-style.tar.gz                  | Bin
 {src => xalan/src/main/java}/MANIFEST.MF                    |   0
 .../services/javax.xml.transform.TransformerFactory         |   0
 .../java}/META-INF/services/javax.xml.xpath.XPathFactory    |   0
 .../services/org.apache.xalan.extensions.bsf.BSFManager     |   0
 .../java}/META-INF/services/org.apache.xml.dtm.DTMManager   |   0
 {src => xalan/src/main/java}/manifest.xalan-interpretive    |   0
 {src => xalan/src/main/java}/manifest.xsltc                 |   0
 {src => xalan/src/main/java}/org/apache/xalan/Version.src   |   0
 .../java}/org/apache/xalan/client/XSLTProcessorApplet.java  |   0
 .../src/main/java}/org/apache/xalan/client/package.html     |   0
 .../org/apache/xalan/extensions/ExpressionContext.java      |   0
 .../org/apache/xalan/extensions/ExpressionVisitor.java      |   0
 .../java}/org/apache/xalan/extensions/ExtensionHandler.java |   0
 .../xalan/extensions/ExtensionHandlerExsltFunction.java     |   0
 .../apache/xalan/extensions/ExtensionHandlerGeneral.java    |   0
 .../org/apache/xalan/extensions/ExtensionHandlerJava.java   |   0
 .../apache/xalan/extensions/ExtensionHandlerJavaClass.java  |   0
 .../xalan/extensions/ExtensionHandlerJavaPackage.java       |   0
 .../apache/xalan/extensions/ExtensionNamespaceContext.java  |   0
 .../apache/xalan/extensions/ExtensionNamespaceSupport.java  |   0
 .../apache/xalan/extensions/ExtensionNamespacesManager.java |   0
 .../java}/org/apache/xalan/extensions/ExtensionsTable.java  |   0
 .../java}/org/apache/xalan/extensions/MethodResolver.java   |   0
 .../java}/org/apache/xalan/extensions/ObjectFactory.java    |   0
 .../java}/org/apache/xalan/extensions/SecuritySupport.java  |   0
 .../org/apache/xalan/extensions/XPathFunctionImpl.java      |   0
 .../apache/xalan/extensions/XPathFunctionResolverImpl.java  |   0
 .../org/apache/xalan/extensions/XSLProcessorContext.java    |   0
 .../src/main/java}/org/apache/xalan/extensions/package.html |   0
 .../src/main/java}/org/apache/xalan/lib/ExsltBase.java      |   0
 .../src/main/java}/org/apache/xalan/lib/ExsltCommon.java    |   0
 .../src/main/java}/org/apache/xalan/lib/ExsltDatetime.java  |   0
 .../src/main/java}/org/apache/xalan/lib/ExsltDynamic.java   |   0
 .../src/main/java}/org/apache/xalan/lib/ExsltMath.java      |   0
 .../src/main/java}/org/apache/xalan/lib/ExsltSets.java      |   0
 .../src/main/java}/org/apache/xalan/lib/ExsltStrings.java   |   0
 .../src/main/java}/org/apache/xalan/lib/Extensions.java     |   0
 .../src/main/java}/org/apache/xalan/lib/NodeInfo.java       |   0
 .../src/main/java}/org/apache/xalan/lib/ObjectFactory.java  |   0
 .../src/main/java}/org/apache/xalan/lib/PipeDocument.java   |   0
 .../src/main/java}/org/apache/xalan/lib/Redirect.java       |   0
 .../main/java}/org/apache/xalan/lib/SecuritySupport.java    |   0
 .../src/main/java}/org/apache/xalan/lib/package.html        |   0
 .../main/java}/org/apache/xalan/lib/sql/ConnectionPool.java |   0
 .../org/apache/xalan/lib/sql/ConnectionPoolManager.java     |   0
 .../main/java}/org/apache/xalan/lib/sql/DTMDocument.java    |   0
 .../org/apache/xalan/lib/sql/DefaultConnectionPool.java     |   0
 .../java}/org/apache/xalan/lib/sql/JNDIConnectionPool.java  |   0
 .../main/java}/org/apache/xalan/lib/sql/ObjectArray.java    |   0
 .../main/java}/org/apache/xalan/lib/sql/ObjectFactory.java  |   0
 .../java}/org/apache/xalan/lib/sql/PooledConnection.java    |   0
 .../main/java}/org/apache/xalan/lib/sql/QueryParameter.java |   0
 .../main/java}/org/apache/xalan/lib/sql/SQLDocument.java    |   0
 .../java}/org/apache/xalan/lib/sql/SQLErrorDocument.java    |   0
 .../main/java}/org/apache/xalan/lib/sql/SQLQueryParser.java |   0
 .../java}/org/apache/xalan/lib/sql/SecuritySupport.java     |   0
 .../main/java}/org/apache/xalan/lib/sql/XConnection.java    |   0
 .../src/main/java}/org/apache/xalan/lib/sql/package.html    |   0
 .../org/apache/xalan/processor/ProcessorAttributeSet.java   |   0
 .../org/apache/xalan/processor/ProcessorCharacters.java     |   0
 .../org/apache/xalan/processor/ProcessorDecimalFormat.java  |   0
 .../apache/xalan/processor/ProcessorExsltFuncResult.java    |   0
 .../org/apache/xalan/processor/ProcessorExsltFunction.java  |   0
 .../apache/xalan/processor/ProcessorGlobalParamDecl.java    |   0
 .../apache/xalan/processor/ProcessorGlobalVariableDecl.java |   0
 .../java}/org/apache/xalan/processor/ProcessorImport.java   |   0
 .../java}/org/apache/xalan/processor/ProcessorInclude.java  |   0
 .../main/java}/org/apache/xalan/processor/ProcessorKey.java |   0
 .../main/java}/org/apache/xalan/processor/ProcessorLRE.java |   0
 .../org/apache/xalan/processor/ProcessorNamespaceAlias.java |   0
 .../org/apache/xalan/processor/ProcessorOutputElem.java     |   0
 .../org/apache/xalan/processor/ProcessorPreserveSpace.java  |   0
 .../org/apache/xalan/processor/ProcessorStripSpace.java     |   0
 .../org/apache/xalan/processor/ProcessorStylesheetDoc.java  |   0
 .../apache/xalan/processor/ProcessorStylesheetElement.java  |   0
 .../java}/org/apache/xalan/processor/ProcessorTemplate.java |   0
 .../org/apache/xalan/processor/ProcessorTemplateElem.java   |   0
 .../java}/org/apache/xalan/processor/ProcessorText.java     |   0
 .../java}/org/apache/xalan/processor/ProcessorUnknown.java  |   0
 .../java}/org/apache/xalan/processor/StylesheetHandler.java |   0
 .../org/apache/xalan/processor/TransformerFactoryImpl.java  |   0
 .../org/apache/xalan/processor/WhitespaceInfoPaths.java     |   0
 .../org/apache/xalan/processor/XSLProcessorVersion.src      |   0
 .../java}/org/apache/xalan/processor/XSLTAttributeDef.java  |   0
 .../java}/org/apache/xalan/processor/XSLTElementDef.java    |   0
 .../org/apache/xalan/processor/XSLTElementProcessor.java    |   0
 .../main/java}/org/apache/xalan/processor/XSLTSchema.java   |   0
 .../src/main/java}/org/apache/xalan/processor/package.html  |   0
 .../src/main/java}/org/apache/xalan/res/XSLMessages.java    |   0
 .../main/java}/org/apache/xalan/res/XSLTErrorResources.java |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_ca.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_cs.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_de.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_en.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_es.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_fr.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_hu.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_it.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_ja.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_ko.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_pl.java   |   0
 .../org/apache/xalan/res/XSLTErrorResources_pt_BR.java      |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_ru.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_sk.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_sl.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_sv.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_tr.java   |   0
 .../java}/org/apache/xalan/res/XSLTErrorResources_zh.java   |   0
 .../org/apache/xalan/res/XSLTErrorResources_zh_CN.java      |   0
 .../org/apache/xalan/res/XSLTErrorResources_zh_TW.java      |   0
 .../src/main/java}/org/apache/xalan/res/package.html        |   0
 .../java}/org/apache/xalan/serialize/DOMSerializer.java     |   0
 .../main/java}/org/apache/xalan/serialize/Serializer.java   |   0
 .../java}/org/apache/xalan/serialize/SerializerFactory.java |   0
 .../java}/org/apache/xalan/serialize/SerializerUtils.java   |   0
 .../src/main/java}/org/apache/xalan/templates/AVT.java      |   0
 .../src/main/java}/org/apache/xalan/templates/AVTPart.java  |   0
 .../java}/org/apache/xalan/templates/AVTPartSimple.java     |   0
 .../main/java}/org/apache/xalan/templates/AVTPartXPath.java |   0
 .../java}/org/apache/xalan/templates/AbsPathChecker.java    |   0
 .../main/java}/org/apache/xalan/templates/Constants.java    |   0
 .../org/apache/xalan/templates/DecimalFormatProperties.java |   0
 .../java}/org/apache/xalan/templates/ElemApplyImport.java   |   0
 .../org/apache/xalan/templates/ElemApplyTemplates.java      |   0
 .../java}/org/apache/xalan/templates/ElemAttribute.java     |   0
 .../java}/org/apache/xalan/templates/ElemAttributeSet.java  |   0
 .../java}/org/apache/xalan/templates/ElemCallTemplate.java  |   0
 .../main/java}/org/apache/xalan/templates/ElemChoose.java   |   0
 .../main/java}/org/apache/xalan/templates/ElemComment.java  |   0
 .../src/main/java}/org/apache/xalan/templates/ElemCopy.java |   0
 .../main/java}/org/apache/xalan/templates/ElemCopyOf.java   |   0
 .../main/java}/org/apache/xalan/templates/ElemElement.java  |   0
 .../main/java}/org/apache/xalan/templates/ElemEmpty.java    |   0
 .../org/apache/xalan/templates/ElemExsltFuncResult.java     |   0
 .../java}/org/apache/xalan/templates/ElemExsltFunction.java |   0
 .../java}/org/apache/xalan/templates/ElemExtensionCall.java |   0
 .../java}/org/apache/xalan/templates/ElemExtensionDecl.java |   0
 .../org/apache/xalan/templates/ElemExtensionScript.java     |   0
 .../main/java}/org/apache/xalan/templates/ElemFallback.java |   0
 .../main/java}/org/apache/xalan/templates/ElemForEach.java  |   0
 .../src/main/java}/org/apache/xalan/templates/ElemIf.java   |   0
 .../java}/org/apache/xalan/templates/ElemLiteralResult.java |   0
 .../main/java}/org/apache/xalan/templates/ElemMessage.java  |   0
 .../main/java}/org/apache/xalan/templates/ElemNumber.java   |   0
 .../java}/org/apache/xalan/templates/ElemOtherwise.java     |   0
 .../src/main/java}/org/apache/xalan/templates/ElemPI.java   |   0
 .../main/java}/org/apache/xalan/templates/ElemParam.java    |   0
 .../src/main/java}/org/apache/xalan/templates/ElemSort.java |   0
 .../main/java}/org/apache/xalan/templates/ElemTemplate.java |   0
 .../org/apache/xalan/templates/ElemTemplateElement.java     |   0
 .../src/main/java}/org/apache/xalan/templates/ElemText.java |   0
 .../java}/org/apache/xalan/templates/ElemTextLiteral.java   |   0
 .../main/java}/org/apache/xalan/templates/ElemUnknown.java  |   0
 .../src/main/java}/org/apache/xalan/templates/ElemUse.java  |   0
 .../main/java}/org/apache/xalan/templates/ElemValueOf.java  |   0
 .../main/java}/org/apache/xalan/templates/ElemVariable.java |   0
 .../org/apache/xalan/templates/ElemVariablePsuedo.java      |   0
 .../src/main/java}/org/apache/xalan/templates/ElemWhen.java |   0
 .../java}/org/apache/xalan/templates/ElemWithParam.java     |   0
 .../main/java}/org/apache/xalan/templates/FuncDocument.java |   0
 .../java}/org/apache/xalan/templates/FuncFormatNumb.java    |   0
 .../src/main/java}/org/apache/xalan/templates/FuncKey.java  |   0
 .../java}/org/apache/xalan/templates/KeyDeclaration.java    |   0
 .../java}/org/apache/xalan/templates/NamespaceAlias.java    |   0
 .../java}/org/apache/xalan/templates/OutputProperties.java  |   0
 .../org/apache/xalan/templates/RedundentExprEliminator.java |   0
 .../main/java}/org/apache/xalan/templates/Stylesheet.java   |   0
 .../org/apache/xalan/templates/StylesheetComposed.java      |   0
 .../java}/org/apache/xalan/templates/StylesheetRoot.java    |   0
 .../main/java}/org/apache/xalan/templates/TemplateList.java |   0
 .../xalan/templates/TemplateSubPatternAssociation.java      |   0
 .../java}/org/apache/xalan/templates/VarNameCollector.java  |   0
 .../java}/org/apache/xalan/templates/WhiteSpaceInfo.java    |   0
 .../main/java}/org/apache/xalan/templates/XMLNSDecl.java    |   0
 .../java}/org/apache/xalan/templates/XSLTVisitable.java     |   0
 .../main/java}/org/apache/xalan/templates/XSLTVisitor.java  |   0
 .../org/apache/xalan/templates/XUnresolvedVariable.java     |   0
 .../apache/xalan/templates/XUnresolvedVariableSimple.java   |   0
 .../src/main/java}/org/apache/xalan/templates/package.html  |   0
 .../java}/org/apache/xalan/trace/EndSelectionEvent.java     |   0
 .../main/java}/org/apache/xalan/trace/ExtensionEvent.java   |   0
 .../main/java}/org/apache/xalan/trace/GenerateEvent.java    |   0
 .../java}/org/apache/xalan/trace/PrintTraceListener.java    |   0
 .../main/java}/org/apache/xalan/trace/SelectionEvent.java   |   0
 .../main/java}/org/apache/xalan/trace/TraceListener.java    |   0
 .../main/java}/org/apache/xalan/trace/TraceListenerEx.java  |   0
 .../main/java}/org/apache/xalan/trace/TraceListenerEx2.java |   0
 .../main/java}/org/apache/xalan/trace/TraceListenerEx3.java |   0
 .../src/main/java}/org/apache/xalan/trace/TraceManager.java |   0
 .../src/main/java}/org/apache/xalan/trace/TracerEvent.java  |   0
 .../src/main/java}/org/apache/xalan/trace/package.html      |   0
 .../org/apache/xalan/transformer/ClonerToResultTree.java    |   0
 .../main/java}/org/apache/xalan/transformer/Counter.java    |   0
 .../java}/org/apache/xalan/transformer/CountersTable.java   |   0
 .../java}/org/apache/xalan/transformer/DecimalToRoman.java  |   0
 .../java}/org/apache/xalan/transformer/KeyIterator.java     |   0
 .../main/java}/org/apache/xalan/transformer/KeyManager.java |   0
 .../java}/org/apache/xalan/transformer/KeyRefIterator.java  |   0
 .../main/java}/org/apache/xalan/transformer/KeyTable.java   |   0
 .../src/main/java}/org/apache/xalan/transformer/MsgMgr.java |   0
 .../java}/org/apache/xalan/transformer/NodeSortKey.java     |   0
 .../main/java}/org/apache/xalan/transformer/NodeSorter.java |   0
 .../org/apache/xalan/transformer/NumeratorFormatter.java    |   0
 .../java}/org/apache/xalan/transformer/QueuedEvents.java    |   0
 .../java}/org/apache/xalan/transformer/ResultNameSpace.java |   0
 .../org/apache/xalan/transformer/SerializerSwitcher.java    |   0
 .../main/java}/org/apache/xalan/transformer/StackGuard.java |   0
 .../main/java}/org/apache/xalan/transformer/TrAXFilter.java |   0
 .../org/apache/xalan/transformer/TransformSnapshot.java     |   0
 .../org/apache/xalan/transformer/TransformSnapshotImpl.java |   0
 .../java}/org/apache/xalan/transformer/TransformState.java  |   0
 .../org/apache/xalan/transformer/TransformerClient.java     |   0
 .../apache/xalan/transformer/TransformerHandlerImpl.java    |   0
 .../apache/xalan/transformer/TransformerIdentityImpl.java   |   0
 .../java}/org/apache/xalan/transformer/TransformerImpl.java |   0
 .../org/apache/xalan/transformer/TreeWalker2Result.java     |   0
 .../apache/xalan/transformer/XSLInfiniteLoopException.java  |   0
 .../java}/org/apache/xalan/transformer/XalanProperties.java |   0
 .../org/apache/xalan/transformer/XalanTransformState.java   |   0
 .../main/java}/org/apache/xalan/transformer/package.html    |   0
 .../main/java}/org/apache/xalan/xslt/EnvironmentCheck.java  |   0
 .../src/main/java}/org/apache/xalan/xslt/ObjectFactory.java |   0
 .../src/main/java}/org/apache/xalan/xslt/Process.java       |   0
 .../main/java}/org/apache/xalan/xslt/SecuritySupport.java   |   0
 .../src/main/java}/org/apache/xalan/xslt/package.html       |   0
 .../xalan/xslt/util/XslTransformErrorLocatorHelper.java     |   0
 .../main/java}/org/apache/xalan/xsltc/CollatorFactory.java  |   0
 .../src/main/java}/org/apache/xalan/xsltc/DOM.java          |   0
 .../src/main/java}/org/apache/xalan/xsltc/DOMCache.java     |   0
 .../java}/org/apache/xalan/xsltc/DOMEnhancedForDTM.java     |   0
 .../src/main/java}/org/apache/xalan/xsltc/NodeIterator.java |   0
 .../main/java}/org/apache/xalan/xsltc/ProcessorVersion.java |   0
 .../src/main/java}/org/apache/xalan/xsltc/StripFilter.java  |   0
 .../src/main/java}/org/apache/xalan/xsltc/Translet.java     |   0
 .../java}/org/apache/xalan/xsltc/TransletException.java     |   0
 .../main/java}/org/apache/xalan/xsltc/cmdline/Compile.java  |   0
 .../java}/org/apache/xalan/xsltc/cmdline/ObjectFactory.java |   0
 .../org/apache/xalan/xsltc/cmdline/SecuritySupport.java     |   0
 .../java}/org/apache/xalan/xsltc/cmdline/Transform.java     |   0
 .../java}/org/apache/xalan/xsltc/cmdline/getopt/GetOpt.java |   0
 .../apache/xalan/xsltc/cmdline/getopt/GetOptsException.java |   0
 .../xsltc/cmdline/getopt/IllegalArgumentException.java      |   0
 .../xalan/xsltc/cmdline/getopt/MissingOptArgException.java  |   0
 .../apache/xalan/xsltc/compiler/AbsoluteLocationPath.java   |   0
 .../apache/xalan/xsltc/compiler/AbsolutePathPattern.java    |   0
 .../org/apache/xalan/xsltc/compiler/AlternativePattern.java |   0
 .../org/apache/xalan/xsltc/compiler/AncestorPattern.java    |   0
 .../java}/org/apache/xalan/xsltc/compiler/ApplyImports.java |   0
 .../org/apache/xalan/xsltc/compiler/ApplyTemplates.java     |   0
 .../java}/org/apache/xalan/xsltc/compiler/ArgumentList.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/Attribute.java    |   0
 .../java}/org/apache/xalan/xsltc/compiler/AttributeSet.java |   0
 .../org/apache/xalan/xsltc/compiler/AttributeValue.java     |   0
 .../apache/xalan/xsltc/compiler/AttributeValueTemplate.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/BinOpExpr.java    |   0
 .../java}/org/apache/xalan/xsltc/compiler/BooleanCall.java  |   0
 .../java}/org/apache/xalan/xsltc/compiler/BooleanExpr.java  |   0
 .../java}/org/apache/xalan/xsltc/compiler/CallTemplate.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/CastCall.java     |   0
 .../java}/org/apache/xalan/xsltc/compiler/CastExpr.java     |   0
 .../java}/org/apache/xalan/xsltc/compiler/CeilingCall.java  |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Choose.java  |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Closure.java |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Comment.java |   0
 .../org/apache/xalan/xsltc/compiler/CompilerException.java  |   0
 .../java}/org/apache/xalan/xsltc/compiler/ConcatCall.java   |   0
 .../java}/org/apache/xalan/xsltc/compiler/Constants.java    |   0
 .../java}/org/apache/xalan/xsltc/compiler/ContainsCall.java |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Copy.java    |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/CopyOf.java  |   0
 .../java}/org/apache/xalan/xsltc/compiler/CurrentCall.java  |   0
 .../org/apache/xalan/xsltc/compiler/DecimalFormatting.java  |   0
 .../java}/org/apache/xalan/xsltc/compiler/DocumentCall.java |   0
 .../apache/xalan/xsltc/compiler/ElementAvailableCall.java   |   0
 .../java}/org/apache/xalan/xsltc/compiler/EqualityExpr.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/Expression.java   |   0
 .../java}/org/apache/xalan/xsltc/compiler/Fallback.java     |   0
 .../java}/org/apache/xalan/xsltc/compiler/FilterExpr.java   |   0
 .../org/apache/xalan/xsltc/compiler/FilterParentPath.java   |   0
 .../xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java  |   0
 .../java}/org/apache/xalan/xsltc/compiler/FloorCall.java    |   0
 .../java}/org/apache/xalan/xsltc/compiler/FlowList.java     |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/ForEach.java |   0
 .../org/apache/xalan/xsltc/compiler/FormatNumberCall.java   |   0
 .../apache/xalan/xsltc/compiler/FunctionAvailableCall.java  |   0
 .../java}/org/apache/xalan/xsltc/compiler/FunctionCall.java |   0
 .../org/apache/xalan/xsltc/compiler/GenerateIdCall.java     |   0
 .../java}/org/apache/xalan/xsltc/compiler/IdKeyPattern.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/IdPattern.java    |   0
 .../src/main/java}/org/apache/xalan/xsltc/compiler/If.java  |   0
 .../apache/xalan/xsltc/compiler/IllegalCharException.java   |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Import.java  |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Include.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/Instruction.java  |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/IntExpr.java |   0
 .../src/main/java}/org/apache/xalan/xsltc/compiler/Key.java |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/KeyCall.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/KeyPattern.java   |   0
 .../java}/org/apache/xalan/xsltc/compiler/LangCall.java     |   0
 .../java}/org/apache/xalan/xsltc/compiler/LastCall.java     |   0
 .../org/apache/xalan/xsltc/compiler/LiteralAttribute.java   |   0
 .../org/apache/xalan/xsltc/compiler/LiteralElement.java     |   0
 .../java}/org/apache/xalan/xsltc/compiler/LiteralExpr.java  |   0
 .../org/apache/xalan/xsltc/compiler/LocalNameCall.java      |   0
 .../apache/xalan/xsltc/compiler/LocationPathPattern.java    |   0
 .../java}/org/apache/xalan/xsltc/compiler/LogicalExpr.java  |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Makefile.inc |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Message.java |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Mode.java    |   0
 .../java}/org/apache/xalan/xsltc/compiler/NameBase.java     |   0
 .../java}/org/apache/xalan/xsltc/compiler/NameCall.java     |   0
 .../org/apache/xalan/xsltc/compiler/NamespaceAlias.java     |   0
 .../org/apache/xalan/xsltc/compiler/NamespaceUriCall.java   |   0
 .../java}/org/apache/xalan/xsltc/compiler/NodeTest.java     |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/NotCall.java |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Number.java  |   0
 .../java}/org/apache/xalan/xsltc/compiler/NumberCall.java   |   0
 .../org/apache/xalan/xsltc/compiler/ObjectFactory.java      |   0
 .../java}/org/apache/xalan/xsltc/compiler/Otherwise.java    |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Output.java  |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Param.java   |   0
 .../java}/org/apache/xalan/xsltc/compiler/ParameterRef.java |   0
 .../org/apache/xalan/xsltc/compiler/ParentLocationPath.java |   0
 .../org/apache/xalan/xsltc/compiler/ParentPattern.java      |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Parser.java  |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Pattern.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/PositionCall.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/Predicate.java    |   0
 .../apache/xalan/xsltc/compiler/ProcessingInstruction.java  |   0
 .../xalan/xsltc/compiler/ProcessingInstructionPattern.java  |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/QName.java   |   0
 .../java}/org/apache/xalan/xsltc/compiler/RealExpr.java     |   0
 .../org/apache/xalan/xsltc/compiler/RelationalExpr.java     |   0
 .../apache/xalan/xsltc/compiler/RelativeLocationPath.java   |   0
 .../apache/xalan/xsltc/compiler/RelativePathPattern.java    |   0
 .../java}/org/apache/xalan/xsltc/compiler/RoundCall.java    |   0
 .../org/apache/xalan/xsltc/compiler/SecuritySupport.java    |   0
 .../apache/xalan/xsltc/compiler/SimpleAttributeValue.java   |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Sort.java    |   0
 .../java}/org/apache/xalan/xsltc/compiler/SourceLoader.java |   0
 .../org/apache/xalan/xsltc/compiler/StartsWithCall.java     |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Step.java    |   0
 .../java}/org/apache/xalan/xsltc/compiler/StepPattern.java  |   0
 .../java}/org/apache/xalan/xsltc/compiler/StringCall.java   |   0
 .../org/apache/xalan/xsltc/compiler/StringLengthCall.java   |   0
 .../java}/org/apache/xalan/xsltc/compiler/Stylesheet.java   |   0
 .../java}/org/apache/xalan/xsltc/compiler/SymbolTable.java  |   0
 .../org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java     |   0
 .../java}/org/apache/xalan/xsltc/compiler/Template.java     |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/TestSeq.java |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/Text.java    |   0
 .../org/apache/xalan/xsltc/compiler/TopLevelElement.java    |   0
 .../org/apache/xalan/xsltc/compiler/TransletOutput.java     |   0
 .../java}/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java  |   0
 .../org/apache/xalan/xsltc/compiler/UnionPathExpr.java      |   0
 .../apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java  |   0
 .../org/apache/xalan/xsltc/compiler/UnresolvedRef.java      |   0
 .../org/apache/xalan/xsltc/compiler/UnsupportedElement.java |   0
 .../org/apache/xalan/xsltc/compiler/UseAttributeSets.java   |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/ValueOf.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/Variable.java     |   0
 .../java}/org/apache/xalan/xsltc/compiler/VariableBase.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/VariableRef.java  |   0
 .../org/apache/xalan/xsltc/compiler/VariableRefBase.java    |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/When.java    |   0
 .../java}/org/apache/xalan/xsltc/compiler/Whitespace.java   |   0
 .../java}/org/apache/xalan/xsltc/compiler/WithParam.java    |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/XSLTC.java   |   0
 .../java}/org/apache/xalan/xsltc/compiler/XslAttribute.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/XslElement.java   |   0
 .../xsltc/compiler/util/AttributeSetMethodGenerator.java    |   0
 .../org/apache/xalan/xsltc/compiler/util/BooleanType.java   |   0
 .../apache/xalan/xsltc/compiler/util/ClassGenerator.java    |   0
 .../apache/xalan/xsltc/compiler/util/CompareGenerator.java  |   0
 .../org/apache/xalan/xsltc/compiler/util/ErrorMessages.java |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_ca.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_cs.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_de.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_es.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_fr.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_hu.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_it.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_ja.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_ko.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_no.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_pl.java  |   0
 .../xalan/xsltc/compiler/util/ErrorMessages_pt_BR.java      |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_ru.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_sk.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_sl.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_tr.java  |   0
 .../apache/xalan/xsltc/compiler/util/ErrorMessages_zh.java  |   0
 .../xalan/xsltc/compiler/util/ErrorMessages_zh_TW.java      |   0
 .../org/apache/xalan/xsltc/compiler/util/ErrorMsg.java      |   0
 .../apache/xalan/xsltc/compiler/util/FilterGenerator.java   |   0
 .../java}/org/apache/xalan/xsltc/compiler/util/IntType.java |   0
 .../org/apache/xalan/xsltc/compiler/util/InternalError.java |   0
 .../apache/xalan/xsltc/compiler/util/MarkerInstruction.java |   0
 .../apache/xalan/xsltc/compiler/util/MatchGenerator.java    |   0
 .../apache/xalan/xsltc/compiler/util/MethodGenerator.java   |   0
 .../org/apache/xalan/xsltc/compiler/util/MethodType.java    |   0
 .../apache/xalan/xsltc/compiler/util/MultiHashtable.java    |   0
 .../xalan/xsltc/compiler/util/NamedMethodGenerator.java     |   0
 .../xalan/xsltc/compiler/util/NodeCounterGenerator.java     |   0
 .../org/apache/xalan/xsltc/compiler/util/NodeSetType.java   |   0
 .../xsltc/compiler/util/NodeSortRecordFactGenerator.java    |   0
 .../xalan/xsltc/compiler/util/NodeSortRecordGenerator.java  |   0
 .../org/apache/xalan/xsltc/compiler/util/NodeType.java      |   0
 .../org/apache/xalan/xsltc/compiler/util/NumberType.java    |   0
 .../org/apache/xalan/xsltc/compiler/util/ObjectFactory.java |   0
 .../org/apache/xalan/xsltc/compiler/util/ObjectType.java    |   0
 .../xalan/xsltc/compiler/util/OutlineableChunkEnd.java      |   0
 .../xalan/xsltc/compiler/util/OutlineableChunkStart.java    |   0
 .../org/apache/xalan/xsltc/compiler/util/RealType.java      |   0
 .../org/apache/xalan/xsltc/compiler/util/ReferenceType.java |   0
 .../apache/xalan/xsltc/compiler/util/ResultTreeType.java    |   0
 .../apache/xalan/xsltc/compiler/util/RtMethodGenerator.java |   0
 .../apache/xalan/xsltc/compiler/util/SecuritySupport.java   |   0
 .../org/apache/xalan/xsltc/compiler/util/SlotAllocator.java |   0
 .../org/apache/xalan/xsltc/compiler/util/StringStack.java   |   0
 .../org/apache/xalan/xsltc/compiler/util/StringType.java    |   0
 .../org/apache/xalan/xsltc/compiler/util/TestGenerator.java |   0
 .../java}/org/apache/xalan/xsltc/compiler/util/Type.java    |   0
 .../apache/xalan/xsltc/compiler/util/TypeCheckError.java    |   0
 .../java}/org/apache/xalan/xsltc/compiler/util/Util.java    |   0
 .../org/apache/xalan/xsltc/compiler/util/VoidType.java      |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/xpath.cup    |   0
 .../main/java}/org/apache/xalan/xsltc/compiler/xpath.lex    |   0
 .../java}/org/apache/xalan/xsltc/dom/AbsoluteIterator.java  |   0
 .../org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java  |   0
 .../java}/org/apache/xalan/xsltc/dom/AnyNodeCounter.java    |   0
 .../org/apache/xalan/xsltc/dom/ArrayNodeListIterator.java   |   0
 .../src/main/java}/org/apache/xalan/xsltc/dom/BitArray.java |   0
 .../org/apache/xalan/xsltc/dom/CachedNodeListIterator.java  |   0
 .../org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java  |   0
 .../org/apache/xalan/xsltc/dom/CollatorFactoryBase.java     |   0
 .../org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java   |   0
 .../org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java |   0
 .../main/java}/org/apache/xalan/xsltc/dom/DOMAdapter.java   |   0
 .../main/java}/org/apache/xalan/xsltc/dom/DOMBuilder.java   |   0
 .../main/java}/org/apache/xalan/xsltc/dom/DOMWSFilter.java  |   0
 .../java}/org/apache/xalan/xsltc/dom/DocumentCache.java     |   0
 .../java}/org/apache/xalan/xsltc/dom/DupFilterIterator.java |   0
 .../main/java}/org/apache/xalan/xsltc/dom/EmptyFilter.java  |   0
 .../main/java}/org/apache/xalan/xsltc/dom/ExtendedSAX.java  |   0
 .../src/main/java}/org/apache/xalan/xsltc/dom/Filter.java   |   0
 .../java}/org/apache/xalan/xsltc/dom/FilterIterator.java    |   0
 .../org/apache/xalan/xsltc/dom/FilteredStepIterator.java    |   0
 .../org/apache/xalan/xsltc/dom/ForwardPositionIterator.java |   0
 .../src/main/java}/org/apache/xalan/xsltc/dom/KeyIndex.java |   0
 .../main/java}/org/apache/xalan/xsltc/dom/LoadDocument.java |   0
 .../java}/org/apache/xalan/xsltc/dom/MatchingIterator.java  |   0
 .../src/main/java}/org/apache/xalan/xsltc/dom/MultiDOM.java |   0
 .../apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java |   0
 .../org/apache/xalan/xsltc/dom/MultipleNodeCounter.java     |   0
 .../main/java}/org/apache/xalan/xsltc/dom/NodeCounter.java  |   0
 .../java}/org/apache/xalan/xsltc/dom/NodeIteratorBase.java  |   0
 .../java}/org/apache/xalan/xsltc/dom/NodeSortRecord.java    |   0
 .../org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java   |   0
 .../main/java}/org/apache/xalan/xsltc/dom/NthIterator.java  |   0
 .../java}/org/apache/xalan/xsltc/dom/ObjectFactory.java     |   0
 .../src/main/java}/org/apache/xalan/xsltc/dom/SAXImpl.java  |   0
 .../java}/org/apache/xalan/xsltc/dom/SecuritySupport.java   |   0
 .../org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java    |   0
 .../java}/org/apache/xalan/xsltc/dom/SingleNodeCounter.java |   0
 .../java}/org/apache/xalan/xsltc/dom/SingletonIterator.java |   0
 .../main/java}/org/apache/xalan/xsltc/dom/SortSettings.java |   0
 .../java}/org/apache/xalan/xsltc/dom/SortingIterator.java   |   0
 .../main/java}/org/apache/xalan/xsltc/dom/StepIterator.java |   0
 .../org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java   |   0
 .../java}/org/apache/xalan/xsltc/dom/UnionIterator.java     |   0
 .../java}/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java   |   0
 .../xalan/xsltc/javax.xml.transform.TransformerFactory      |   0
 .../org/apache/xalan/xsltc/runtime/AbstractTranslet.java    |   0
 .../java}/org/apache/xalan/xsltc/runtime/AttributeList.java |   0
 .../java}/org/apache/xalan/xsltc/runtime/Attributes.java    |   0
 .../java}/org/apache/xalan/xsltc/runtime/BasisLibrary.java  |   0
 .../java}/org/apache/xalan/xsltc/runtime/Constants.java     |   0
 .../java}/org/apache/xalan/xsltc/runtime/ErrorMessages.java |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_ca.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_cs.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_de.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_es.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_fr.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_hu.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_it.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_ja.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_ko.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_no.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_pl.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_pt_BR.java |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_ru.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_sk.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_sl.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_tr.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_zh.java    |   0
 .../org/apache/xalan/xsltc/runtime/ErrorMessages_zh_TW.java |   0
 .../java}/org/apache/xalan/xsltc/runtime/Hashtable.java     |   0
 .../apache/xalan/xsltc/runtime/InternalRuntimeError.java    |   0
 .../org/apache/xalan/xsltc/runtime/MessageHandler.java      |   0
 .../src/main/java}/org/apache/xalan/xsltc/runtime/Node.java |   0
 .../java}/org/apache/xalan/xsltc/runtime/ObjectFactory.java |   0
 .../java}/org/apache/xalan/xsltc/runtime/Operators.java     |   0
 .../java}/org/apache/xalan/xsltc/runtime/Parameter.java     |   0
 .../org/apache/xalan/xsltc/runtime/SecuritySupport.java     |   0
 .../org/apache/xalan/xsltc/runtime/StringValueHandler.java  |   0
 .../org/apache/xalan/xsltc/runtime/output/OutputBuffer.java |   0
 .../xalan/xsltc/runtime/output/StringOutputBuffer.java      |   0
 .../xsltc/runtime/output/TransletOutputHandlerFactory.java  |   0
 .../xalan/xsltc/runtime/output/WriterOutputBuffer.java      |   0
 .../src/main/java}/org/apache/xalan/xsltc/trax/DOM2SAX.java |   0
 .../src/main/java}/org/apache/xalan/xsltc/trax/DOM2TO.java  |   0
 .../java}/org/apache/xalan/xsltc/trax/ObjectFactory.java    |   0
 .../java}/org/apache/xalan/xsltc/trax/OutputSettings.java   |   0
 .../src/main/java}/org/apache/xalan/xsltc/trax/SAX2DOM.java |   0
 .../java}/org/apache/xalan/xsltc/trax/SecuritySupport.java  |   0
 .../xalan/xsltc/trax/SmartTransformerFactoryImpl.java       |   0
 .../org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java   |   0
 .../java}/org/apache/xalan/xsltc/trax/TemplatesImpl.java    |   0
 .../main/java}/org/apache/xalan/xsltc/trax/TrAXFilter.java  |   0
 .../org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java |   0
 .../org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java |   0
 .../java}/org/apache/xalan/xsltc/trax/TransformerImpl.java  |   0
 .../src/main/java}/org/apache/xalan/xsltc/trax/Util.java    |   0
 .../main/java}/org/apache/xalan/xsltc/trax/XSLTCSource.java |   0
 .../java}/org/apache/xalan/xsltc/util/IntegerArray.java     |   0
 {src => xalan/src/main/java}/org/apache/xml/dtm/Axis.java   |   0
 {src => xalan/src/main/java}/org/apache/xml/dtm/DTM.java    |   0
 .../src/main/java}/org/apache/xml/dtm/DTMAxisIterator.java  |   0
 .../src/main/java}/org/apache/xml/dtm/DTMAxisTraverser.java |   0
 .../java}/org/apache/xml/dtm/DTMConfigurationException.java |   0
 .../src/main/java}/org/apache/xml/dtm/DTMDOMException.java  |   0
 .../src/main/java}/org/apache/xml/dtm/DTMException.java     |   0
 .../src/main/java}/org/apache/xml/dtm/DTMFilter.java        |   0
 .../src/main/java}/org/apache/xml/dtm/DTMIterator.java      |   0
 .../src/main/java}/org/apache/xml/dtm/DTMManager.java       |   0
 .../src/main/java}/org/apache/xml/dtm/DTMWSFilter.java      |   0
 .../src/main/java}/org/apache/xml/dtm/ObjectFactory.java    |   0
 .../src/main/java}/org/apache/xml/dtm/SecuritySupport.java  |   0
 .../main/java}/org/apache/xml/dtm/ref/ChunkedIntArray.java  |   0
 .../main/java}/org/apache/xml/dtm/ref/CoroutineManager.java |   0
 .../main/java}/org/apache/xml/dtm/ref/CoroutineParser.java  |   0
 .../main/java}/org/apache/xml/dtm/ref/CustomStringPool.java |   0
 .../java}/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java   |   0
 .../java}/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java   |   0
 .../java}/org/apache/xml/dtm/ref/DTMChildIterNodeList.java  |   0
 .../main/java}/org/apache/xml/dtm/ref/DTMDefaultBase.java   |   0
 .../org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java     |   0
 .../org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java    |   0
 .../main/java}/org/apache/xml/dtm/ref/DTMDocumentImpl.java  |   0
 .../java}/org/apache/xml/dtm/ref/DTMManagerDefault.java     |   0
 .../main/java}/org/apache/xml/dtm/ref/DTMNamedNodeMap.java  |   0
 .../main/java}/org/apache/xml/dtm/ref/DTMNodeIterator.java  |   0
 .../src/main/java}/org/apache/xml/dtm/ref/DTMNodeList.java  |   0
 .../main/java}/org/apache/xml/dtm/ref/DTMNodeListBase.java  |   0
 .../src/main/java}/org/apache/xml/dtm/ref/DTMNodeProxy.java |   0
 .../java}/org/apache/xml/dtm/ref/DTMSafeStringPool.java     |   0
 .../main/java}/org/apache/xml/dtm/ref/DTMStringPool.java    |   0
 .../main/java}/org/apache/xml/dtm/ref/DTMTreeWalker.java    |   0
 .../main/java}/org/apache/xml/dtm/ref/EmptyIterator.java    |   0
 .../java}/org/apache/xml/dtm/ref/ExpandedNameTable.java     |   0
 .../src/main/java}/org/apache/xml/dtm/ref/ExtendedType.java |   0
 .../java}/org/apache/xml/dtm/ref/IncrementalSAXSource.java  |   0
 .../org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java |   0
 .../org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java |   0
 .../src/main/java}/org/apache/xml/dtm/ref/NodeLocator.java  |   0
 .../main/java}/org/apache/xml/dtm/ref/ObjectFactory.java    |   0
 .../main/java}/org/apache/xml/dtm/ref/SecuritySupport.java  |   0
 .../main/java}/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java  |   0
 .../ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java |   0
 .../main/java}/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java  |   0
 .../main/java}/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java |   0
 .../java}/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java    |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources.java    |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_ca.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_cs.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_de.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_en.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_es.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_fr.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_hu.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_it.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_ja.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_ko.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_pl.java |   0
 .../java}/org/apache/xml/res/XMLErrorResources_pt_BR.java   |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_ru.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_sk.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_sl.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_sv.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_tr.java |   0
 .../main/java}/org/apache/xml/res/XMLErrorResources_zh.java |   0
 .../java}/org/apache/xml/res/XMLErrorResources_zh_TW.java   |   0
 .../src/main/java}/org/apache/xml/res/XMLMessages.java      |   0
 .../src/main/java}/org/apache/xml/utils/AttList.java        |   0
 .../src/main/java}/org/apache/xml/utils/BoolStack.java      |   0
 .../src/main/java}/org/apache/xml/utils/Constants.java      |   0
 .../src/main/java}/org/apache/xml/utils/DOM2Helper.java     |   0
 .../src/main/java}/org/apache/xml/utils/DOMBuilder.java     |   0
 .../src/main/java}/org/apache/xml/utils/DOMHelper.java      |   0
 .../src/main/java}/org/apache/xml/utils/DOMOrder.java       |   0
 .../java}/org/apache/xml/utils/DefaultErrorHandler.java     |   0
 .../src/main/java}/org/apache/xml/utils/ElemDesc.java       |   0
 .../main/java}/org/apache/xml/utils/FastStringBuffer.java   |   0
 .../src/main/java}/org/apache/xml/utils/Hashtree2Node.java  |   0
 .../src/main/java}/org/apache/xml/utils/IntStack.java       |   0
 .../src/main/java}/org/apache/xml/utils/IntVector.java      |   0
 .../java}/org/apache/xml/utils/ListingErrorHandler.java     |   0
 .../src/main/java}/org/apache/xml/utils/LocaleUtility.java  |   0
 .../java}/org/apache/xml/utils/MutableAttrListImpl.java     |   0
 .../src/main/java}/org/apache/xml/utils/NSInfo.java         |   0
 .../src/main/java}/org/apache/xml/utils/NameSpace.java      |   0
 .../main/java}/org/apache/xml/utils/NamespaceSupport2.java  |   0
 .../src/main/java}/org/apache/xml/utils/NodeConsumer.java   |   0
 .../src/main/java}/org/apache/xml/utils/NodeVector.java     |   0
 .../src/main/java}/org/apache/xml/utils/ObjectFactory.java  |   0
 .../src/main/java}/org/apache/xml/utils/ObjectPool.java     |   0
 .../src/main/java}/org/apache/xml/utils/ObjectStack.java    |   0
 .../src/main/java}/org/apache/xml/utils/ObjectVector.java   |   0
 .../src/main/java}/org/apache/xml/utils/PrefixResolver.java |   0
 .../java}/org/apache/xml/utils/PrefixResolverDefault.java   |   0
 .../src/main/java}/org/apache/xml/utils/QName.java          |   0
 .../java}/org/apache/xml/utils/RawCharacterHandler.java     |   0
 .../main/java}/org/apache/xml/utils/SAXSourceLocator.java   |   0
 .../main/java}/org/apache/xml/utils/SecuritySupport.java    |   0
 .../java}/org/apache/xml/utils/SerializableLocatorImpl.java |   0
 .../main/java}/org/apache/xml/utils/StopParseException.java |   0
 .../main/java}/org/apache/xml/utils/StringBufferPool.java   |   0
 .../main/java}/org/apache/xml/utils/StringComparable.java   |   0
 .../main/java}/org/apache/xml/utils/StringToIntTable.java   |   0
 .../java}/org/apache/xml/utils/StringToStringTable.java     |   0
 .../org/apache/xml/utils/StringToStringTableVector.java     |   0
 .../src/main/java}/org/apache/xml/utils/StringVector.java   |   0
 .../java}/org/apache/xml/utils/StylesheetPIHandler.java     |   0
 .../java}/org/apache/xml/utils/SuballocatedByteVector.java  |   0
 .../java}/org/apache/xml/utils/SuballocatedIntVector.java   |   0
 .../main/java}/org/apache/xml/utils/SystemIDResolver.java   |   0
 .../java}/org/apache/xml/utils/ThreadControllerWrapper.java |   0
 .../src/main/java}/org/apache/xml/utils/TreeWalker.java     |   0
 {src => xalan/src/main/java}/org/apache/xml/utils/URI.java  |   0
 .../src/main/java}/org/apache/xml/utils/UnImplNode.java     |   0
 .../java}/org/apache/xml/utils/WrappedRuntimeException.java |   0
 .../java}/org/apache/xml/utils/WrongParserException.java    |   0
 .../src/main/java}/org/apache/xml/utils/XML11Char.java      |   0
 .../src/main/java}/org/apache/xml/utils/XMLChar.java        |   0
 .../java}/org/apache/xml/utils/XMLCharacterRecognizer.java  |   0
 .../main/java}/org/apache/xml/utils/XMLReaderManager.java   |   0
 .../src/main/java}/org/apache/xml/utils/XMLString.java      |   0
 .../main/java}/org/apache/xml/utils/XMLStringDefault.java   |   0
 .../main/java}/org/apache/xml/utils/XMLStringFactory.java   |   0
 .../java}/org/apache/xml/utils/XMLStringFactoryDefault.java |   0
 .../src/main/java}/org/apache/xml/utils/package.html        |   0
 .../java}/org/apache/xml/utils/res/CharArrayWrapper.java    |   0
 .../java}/org/apache/xml/utils/res/IntArrayWrapper.java     |   0
 .../java}/org/apache/xml/utils/res/LongArrayWrapper.java    |   0
 .../java}/org/apache/xml/utils/res/StringArrayWrapper.java  |   0
 .../java}/org/apache/xml/utils/res/XResourceBundle.java     |   0
 .../java}/org/apache/xml/utils/res/XResourceBundleBase.java |   0
 .../main/java}/org/apache/xml/utils/res/XResources_cy.java  |   0
 .../main/java}/org/apache/xml/utils/res/XResources_de.java  |   0
 .../main/java}/org/apache/xml/utils/res/XResources_el.java  |   0
 .../main/java}/org/apache/xml/utils/res/XResources_en.java  |   0
 .../main/java}/org/apache/xml/utils/res/XResources_es.java  |   0
 .../main/java}/org/apache/xml/utils/res/XResources_fr.java  |   0
 .../main/java}/org/apache/xml/utils/res/XResources_he.java  |   0
 .../main/java}/org/apache/xml/utils/res/XResources_hy.java  |   0
 .../main/java}/org/apache/xml/utils/res/XResources_it.java  |   0
 .../java}/org/apache/xml/utils/res/XResources_ja_JP_A.java  |   0
 .../java}/org/apache/xml/utils/res/XResources_ja_JP_HA.java |   0
 .../java}/org/apache/xml/utils/res/XResources_ja_JP_HI.java |   0
 .../java}/org/apache/xml/utils/res/XResources_ja_JP_I.java  |   0
 .../main/java}/org/apache/xml/utils/res/XResources_ka.java  |   0
 .../main/java}/org/apache/xml/utils/res/XResources_ko.java  |   0
 .../main/java}/org/apache/xml/utils/res/XResources_sv.java  |   0
 .../java}/org/apache/xml/utils/res/XResources_zh_CN.java    |   0
 .../java}/org/apache/xml/utils/res/XResources_zh_TW.java    |   0
 {src => xalan/src/main/java}/org/apache/xpath/Arg.java      |   0
 .../src/main/java}/org/apache/xpath/CachedXPathAPI.java     |   0
 .../src/main/java}/org/apache/xpath/Expression.java         |   0
 .../src/main/java}/org/apache/xpath/ExpressionNode.java     |   0
 .../src/main/java}/org/apache/xpath/ExpressionOwner.java    |   0
 .../src/main/java}/org/apache/xpath/ExtensionsProvider.java |   0
 .../src/main/java}/org/apache/xpath/FoundIndex.java         |   0
 {src => xalan/src/main/java}/org/apache/xpath/NodeSet.java  |   0
 .../src/main/java}/org/apache/xpath/NodeSetDTM.java         |   0
 .../src/main/java}/org/apache/xpath/SourceTree.java         |   0
 .../src/main/java}/org/apache/xpath/SourceTreeManager.java  |   0
 .../src/main/java}/org/apache/xpath/VariableStack.java      |   0
 .../org/apache/xpath/WhitespaceStrippingElementMatcher.java |   0
 {src => xalan/src/main/java}/org/apache/xpath/XPath.java    |   0
 {src => xalan/src/main/java}/org/apache/xpath/XPathAPI.java |   0
 .../src/main/java}/org/apache/xpath/XPathContext.java       |   0
 .../src/main/java}/org/apache/xpath/XPathException.java     |   0
 .../src/main/java}/org/apache/xpath/XPathFactory.java       |   0
 .../java}/org/apache/xpath/XPathProcessorException.java     |   0
 .../src/main/java}/org/apache/xpath/XPathVisitable.java     |   0
 .../src/main/java}/org/apache/xpath/XPathVisitor.java       |   0
 .../main/java}/org/apache/xpath/axes/AttributeIterator.java |   0
 .../src/main/java}/org/apache/xpath/axes/AxesWalker.java    |   0
 .../main/java}/org/apache/xpath/axes/BasicTestIterator.java |   0
 .../src/main/java}/org/apache/xpath/axes/ChildIterator.java |   0
 .../main/java}/org/apache/xpath/axes/ChildTestIterator.java |   0
 .../main/java}/org/apache/xpath/axes/ContextNodeList.java   |   0
 .../java}/org/apache/xpath/axes/DescendantIterator.java     |   0
 .../java}/org/apache/xpath/axes/FilterExprIterator.java     |   0
 .../org/apache/xpath/axes/FilterExprIteratorSimple.java     |   0
 .../main/java}/org/apache/xpath/axes/FilterExprWalker.java  |   0
 .../org/apache/xpath/axes/HasPositionalPredChecker.java     |   0
 .../src/main/java}/org/apache/xpath/axes/IteratorPool.java  |   0
 .../main/java}/org/apache/xpath/axes/LocPathIterator.java   |   0
 .../java}/org/apache/xpath/axes/MatchPatternIterator.java   |   0
 .../src/main/java}/org/apache/xpath/axes/NodeSequence.java  |   0
 .../main/java}/org/apache/xpath/axes/OneStepIterator.java   |   0
 .../java}/org/apache/xpath/axes/OneStepIteratorForward.java |   0
 .../src/main/java}/org/apache/xpath/axes/PathComponent.java |   0
 .../java}/org/apache/xpath/axes/PredicatedNodeTest.java     |   0
 .../src/main/java}/org/apache/xpath/axes/RTFIterator.java   |   0
 .../main/java}/org/apache/xpath/axes/ReverseAxesWalker.java |   0
 .../org/apache/xpath/axes/SelfIteratorNoPredicate.java      |   0
 .../main/java}/org/apache/xpath/axes/SubContextList.java    |   0
 .../java}/org/apache/xpath/axes/UnionChildIterator.java     |   0
 .../main/java}/org/apache/xpath/axes/UnionPathIterator.java |   0
 .../src/main/java}/org/apache/xpath/axes/WalkerFactory.java |   0
 .../main/java}/org/apache/xpath/axes/WalkingIterator.java   |   0
 .../java}/org/apache/xpath/axes/WalkingIteratorSorted.java  |   0
 .../src/main/java}/org/apache/xpath/axes/package.html       |   0
 .../src/main/java}/org/apache/xpath/compiler/Compiler.java  |   0
 .../main/java}/org/apache/xpath/compiler/FunctionTable.java |   0
 .../src/main/java}/org/apache/xpath/compiler/Keywords.java  |   0
 .../src/main/java}/org/apache/xpath/compiler/Lexer.java     |   0
 .../src/main/java}/org/apache/xpath/compiler/OpCodes.java   |   0
 .../src/main/java}/org/apache/xpath/compiler/OpMap.java     |   0
 .../main/java}/org/apache/xpath/compiler/OpMapVector.java   |   0
 .../main/java}/org/apache/xpath/compiler/PsuedoNames.java   |   0
 .../main/java}/org/apache/xpath/compiler/XPathDumper.java   |   0
 .../main/java}/org/apache/xpath/compiler/XPathParser.java   |   0
 .../src/main/java}/org/apache/xpath/compiler/package.html   |   0
 .../java}/org/apache/xpath/domapi/XPathEvaluatorImpl.java   |   0
 .../java}/org/apache/xpath/domapi/XPathExpressionImpl.java  |   0
 .../java}/org/apache/xpath/domapi/XPathNSResolverImpl.java  |   0
 .../java}/org/apache/xpath/domapi/XPathNamespaceImpl.java   |   0
 .../main/java}/org/apache/xpath/domapi/XPathResultImpl.java |   0
 .../apache/xpath/domapi/XPathStylesheetDOM3Exception.java   |   0
 .../src/main/java}/org/apache/xpath/domapi/package.html     |   0
 .../main/java}/org/apache/xpath/functions/FuncBoolean.java  |   0
 .../main/java}/org/apache/xpath/functions/FuncCeiling.java  |   0
 .../main/java}/org/apache/xpath/functions/FuncConcat.java   |   0
 .../main/java}/org/apache/xpath/functions/FuncContains.java |   0
 .../main/java}/org/apache/xpath/functions/FuncCount.java    |   0
 .../main/java}/org/apache/xpath/functions/FuncCurrent.java  |   0
 .../java}/org/apache/xpath/functions/FuncDoclocation.java   |   0
 .../org/apache/xpath/functions/FuncExtElementAvailable.java |   0
 .../java}/org/apache/xpath/functions/FuncExtFunction.java   |   0
 .../apache/xpath/functions/FuncExtFunctionAvailable.java    |   0
 .../main/java}/org/apache/xpath/functions/FuncFalse.java    |   0
 .../main/java}/org/apache/xpath/functions/FuncFloor.java    |   0
 .../java}/org/apache/xpath/functions/FuncGenerateId.java    |   0
 .../src/main/java}/org/apache/xpath/functions/FuncId.java   |   0
 .../src/main/java}/org/apache/xpath/functions/FuncLang.java |   0
 .../src/main/java}/org/apache/xpath/functions/FuncLast.java |   0
 .../java}/org/apache/xpath/functions/FuncLocalPart.java     |   0
 .../java}/org/apache/xpath/functions/FuncNamespace.java     |   0
 .../org/apache/xpath/functions/FuncNormalizeSpace.java      |   0
 .../src/main/java}/org/apache/xpath/functions/FuncNot.java  |   0
 .../main/java}/org/apache/xpath/functions/FuncNumber.java   |   0
 .../main/java}/org/apache/xpath/functions/FuncPosition.java |   0
 .../main/java}/org/apache/xpath/functions/FuncQname.java    |   0
 .../main/java}/org/apache/xpath/functions/FuncRound.java    |   0
 .../java}/org/apache/xpath/functions/FuncStartsWith.java    |   0
 .../main/java}/org/apache/xpath/functions/FuncString.java   |   0
 .../java}/org/apache/xpath/functions/FuncStringLength.java  |   0
 .../java}/org/apache/xpath/functions/FuncSubstring.java     |   0
 .../org/apache/xpath/functions/FuncSubstringAfter.java      |   0
 .../org/apache/xpath/functions/FuncSubstringBefore.java     |   0
 .../src/main/java}/org/apache/xpath/functions/FuncSum.java  |   0
 .../org/apache/xpath/functions/FuncSystemProperty.java      |   0
 .../java}/org/apache/xpath/functions/FuncTranslate.java     |   0
 .../src/main/java}/org/apache/xpath/functions/FuncTrue.java |   0
 .../org/apache/xpath/functions/FuncUnparsedEntityURI.java   |   0
 .../src/main/java}/org/apache/xpath/functions/Function.java |   0
 .../java}/org/apache/xpath/functions/Function2Args.java     |   0
 .../java}/org/apache/xpath/functions/Function3Args.java     |   0
 .../java}/org/apache/xpath/functions/FunctionDef1Arg.java   |   0
 .../java}/org/apache/xpath/functions/FunctionMultiArgs.java |   0
 .../java}/org/apache/xpath/functions/FunctionOneArg.java    |   0
 .../java}/org/apache/xpath/functions/ObjectFactory.java     |   0
 .../java}/org/apache/xpath/functions/SecuritySupport.java   |   0
 .../apache/xpath/functions/WrongNumberArgsException.java    |   0
 .../src/main/java}/org/apache/xpath/functions/package.html  |   0
 .../java}/org/apache/xpath/jaxp/JAXPExtensionsProvider.java |   0
 .../java}/org/apache/xpath/jaxp/JAXPPrefixResolver.java     |   0
 .../main/java}/org/apache/xpath/jaxp/JAXPVariableStack.java |   0
 .../java}/org/apache/xpath/jaxp/XPathExpressionImpl.java    |   0
 .../main/java}/org/apache/xpath/jaxp/XPathFactoryImpl.java  |   0
 .../src/main/java}/org/apache/xpath/jaxp/XPathImpl.java     |   0
 .../main/java}/org/apache/xpath/objects/DTMXRTreeFrag.java  |   0
 .../src/main/java}/org/apache/xpath/objects/XBoolean.java   |   0
 .../main/java}/org/apache/xpath/objects/XBooleanStatic.java |   0
 .../org/apache/xpath/objects/XMLStringFactoryImpl.java      |   0
 .../src/main/java}/org/apache/xpath/objects/XNodeSet.java   |   0
 .../main/java}/org/apache/xpath/objects/XNodeSetForDOM.java |   0
 .../src/main/java}/org/apache/xpath/objects/XNull.java      |   0
 .../src/main/java}/org/apache/xpath/objects/XNumber.java    |   0
 .../src/main/java}/org/apache/xpath/objects/XObject.java    |   0
 .../main/java}/org/apache/xpath/objects/XObjectFactory.java |   0
 .../src/main/java}/org/apache/xpath/objects/XRTreeFrag.java |   0
 .../org/apache/xpath/objects/XRTreeFragSelectWrapper.java   |   0
 .../src/main/java}/org/apache/xpath/objects/XString.java    |   0
 .../java}/org/apache/xpath/objects/XStringForChars.java     |   0
 .../main/java}/org/apache/xpath/objects/XStringForFSB.java  |   0
 .../src/main/java}/org/apache/xpath/objects/package.html    |   0
 .../src/main/java}/org/apache/xpath/operations/And.java     |   0
 .../src/main/java}/org/apache/xpath/operations/Bool.java    |   0
 .../src/main/java}/org/apache/xpath/operations/Div.java     |   0
 .../src/main/java}/org/apache/xpath/operations/Equals.java  |   0
 .../src/main/java}/org/apache/xpath/operations/Gt.java      |   0
 .../src/main/java}/org/apache/xpath/operations/Gte.java     |   0
 .../src/main/java}/org/apache/xpath/operations/Lt.java      |   0
 .../src/main/java}/org/apache/xpath/operations/Lte.java     |   0
 .../src/main/java}/org/apache/xpath/operations/Minus.java   |   0
 .../src/main/java}/org/apache/xpath/operations/Mod.java     |   0
 .../src/main/java}/org/apache/xpath/operations/Mult.java    |   0
 .../src/main/java}/org/apache/xpath/operations/Neg.java     |   0
 .../main/java}/org/apache/xpath/operations/NotEquals.java   |   0
 .../src/main/java}/org/apache/xpath/operations/Number.java  |   0
 .../main/java}/org/apache/xpath/operations/Operation.java   |   0
 .../src/main/java}/org/apache/xpath/operations/Or.java      |   0
 .../src/main/java}/org/apache/xpath/operations/Plus.java    |   0
 .../src/main/java}/org/apache/xpath/operations/Quo.java     |   0
 .../src/main/java}/org/apache/xpath/operations/String.java  |   0
 .../java}/org/apache/xpath/operations/UnaryOperation.java   |   0
 .../main/java}/org/apache/xpath/operations/Variable.java    |   0
 .../org/apache/xpath/operations/VariableSafeAbsRef.java     |   0
 .../src/main/java}/org/apache/xpath/operations/package.html |   0
 {src => xalan/src/main/java}/org/apache/xpath/package.html  |   0
 .../org/apache/xpath/patterns/ContextMatchStepPattern.java  |   0
 .../java}/org/apache/xpath/patterns/FunctionPattern.java    |   0
 .../src/main/java}/org/apache/xpath/patterns/NodeTest.java  |   0
 .../java}/org/apache/xpath/patterns/NodeTestFilter.java     |   0
 .../main/java}/org/apache/xpath/patterns/StepPattern.java   |   0
 .../main/java}/org/apache/xpath/patterns/UnionPattern.java  |   0
 .../src/main/java}/org/apache/xpath/patterns/package.html   |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources.java     |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_ca.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_cs.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_de.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_en.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_es.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_fr.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_hu.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_it.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_ja.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_ko.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_pl.java  |   0
 .../org/apache/xpath/res/XPATHErrorResources_pt_BR.java     |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_ru.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_sk.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_sl.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_sv.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_tr.java  |   0
 .../java}/org/apache/xpath/res/XPATHErrorResources_zh.java  |   0
 .../org/apache/xpath/res/XPATHErrorResources_zh_CN.java     |   0
 .../org/apache/xpath/res/XPATHErrorResources_zh_TW.java     |   0
 .../src/main/java}/org/apache/xpath/res/XPATHMessages.java  |   0
 .../src/main/java}/org/apache/xpath/res/package.html        |   0
 .../resources}/org/apache/xalan/res/XSLTInfo.properties     |   0
 {src => xalan/src/main/resources}/trax/trax.properties      |   0
 .../src/site/xhtml/javadocOverview.xhtml                    |   0
 1256 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/commits.xml b/ancient_history.commits.xml
similarity index 100%
rename from commits.xml
rename to ancient_history.commits.xml
diff --git a/lib/brazil-2.1.jar b/samples/lib/brazil-2.1.jar
similarity index 100%
rename from lib/brazil-2.1.jar
rename to samples/lib/brazil-2.1.jar
diff --git a/samples/AppletXMLtoHTML/foo-s1.xml b/samples/src/main/java/org/apache/xalan/samples/AppletXMLtoHTML/foo-s1.xml
similarity index 100%
rename from samples/AppletXMLtoHTML/foo-s1.xml
rename to samples/src/main/java/org/apache/xalan/samples/AppletXMLtoHTML/foo-s1.xml
diff --git a/samples/AppletXMLtoHTML/lts3611beac.jpg b/samples/src/main/java/org/apache/xalan/samples/AppletXMLtoHTML/lts3611beac.jpg
similarity index 100%
rename from samples/AppletXMLtoHTML/lts3611beac.jpg
rename to samples/src/main/java/org/apache/xalan/samples/AppletXMLtoHTML/lts3611beac.jpg
diff --git a/samples/AppletXMLtoHTML/rabbitwhorn.jpg b/samples/src/main/java/org/apache/xalan/samples/AppletXMLtoHTML/rabbitwhorn.jpg
similarity index 100%
rename from samples/AppletXMLtoHTML/rabbitwhorn.jpg
rename to samples/src/main/java/org/apache/xalan/samples/AppletXMLtoHTML/rabbitwhorn.jpg
diff --git a/samples/AppletXMLtoHTML/s1ToHTML.xsl b/samples/src/main/java/org/apache/xalan/samples/AppletXMLtoHTML/s1ToHTML.xsl
similarity index 100%
rename from samples/AppletXMLtoHTML/s1ToHTML.xsl
rename to samples/src/main/java/org/apache/xalan/samples/AppletXMLtoHTML/s1ToHTML.xsl
diff --git a/samples/AppletXMLtoHTML/trax.xml b/samples/src/main/java/org/apache/xalan/samples/AppletXMLtoHTML/trax.xml
similarity index 100%
rename from samples/AppletXMLtoHTML/trax.xml
rename to samples/src/main/java/org/apache/xalan/samples/AppletXMLtoHTML/trax.xml
diff --git a/samples/AppletXMLtoHTML/xalanApplets.xml b/samples/src/main/java/org/apache/xalan/samples/AppletXMLtoHTML/xalanApplets.xml
similarity index 100%
rename from samples/AppletXMLtoHTML/xalanApplets.xml
rename to samples/src/main/java/org/apache/xalan/samples/AppletXMLtoHTML/xalanApplets.xml
diff --git a/samples/ApplyXPath/ApplyXPath.java b/samples/src/main/java/org/apache/xalan/samples/ApplyXPath/ApplyXPath.java
similarity index 100%
rename from samples/ApplyXPath/ApplyXPath.java
rename to samples/src/main/java/org/apache/xalan/samples/ApplyXPath/ApplyXPath.java
diff --git a/samples/ApplyXPath/foo.xml b/samples/src/main/java/org/apache/xalan/samples/ApplyXPath/foo.xml
similarity index 100%
rename from samples/ApplyXPath/foo.xml
rename to samples/src/main/java/org/apache/xalan/samples/ApplyXPath/foo.xml
diff --git a/samples/ApplyXPathDOM/ApplyXPathDOM.java b/samples/src/main/java/org/apache/xalan/samples/ApplyXPathDOM/ApplyXPathDOM.java
similarity index 100%
rename from samples/ApplyXPathDOM/ApplyXPathDOM.java
rename to samples/src/main/java/org/apache/xalan/samples/ApplyXPathDOM/ApplyXPathDOM.java
diff --git a/samples/ApplyXPathDOM/foo.xml b/samples/src/main/java/org/apache/xalan/samples/ApplyXPathDOM/foo.xml
similarity index 100%
rename from samples/ApplyXPathDOM/foo.xml
rename to samples/src/main/java/org/apache/xalan/samples/ApplyXPathDOM/foo.xml
diff --git a/samples/CompiledApplet/README.applet b/samples/src/main/java/org/apache/xalan/samples/CompiledApplet/README.applet
similarity index 100%
rename from samples/CompiledApplet/README.applet
rename to samples/src/main/java/org/apache/xalan/samples/CompiledApplet/README.applet
diff --git a/samples/CompiledApplet/TransformApplet.java b/samples/src/main/java/org/apache/xalan/samples/CompiledApplet/TransformApplet.java
similarity index 100%
rename from samples/CompiledApplet/TransformApplet.java
rename to samples/src/main/java/org/apache/xalan/samples/CompiledApplet/TransformApplet.java
diff --git a/samples/CompiledBrazil/README.brazil b/samples/src/main/java/org/apache/xalan/samples/CompiledBrazil/README.brazil
similarity index 100%
rename from samples/CompiledBrazil/README.brazil
rename to samples/src/main/java/org/apache/xalan/samples/CompiledBrazil/README.brazil
diff --git a/samples/CompiledBrazil/TransformHandler.java b/samples/src/main/java/org/apache/xalan/samples/CompiledBrazil/TransformHandler.java
similarity index 100%
rename from samples/CompiledBrazil/TransformHandler.java
rename to samples/src/main/java/org/apache/xalan/samples/CompiledBrazil/TransformHandler.java
diff --git a/samples/CompiledEJB/README.ejb b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/README.ejb
similarity index 100%
rename from samples/CompiledEJB/README.ejb
rename to samples/src/main/java/org/apache/xalan/samples/CompiledEJB/README.ejb
diff --git a/samples/CompiledEJB/TransformBean.java b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformBean.java
similarity index 100%
rename from samples/CompiledEJB/TransformBean.java
rename to samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformBean.java
diff --git a/samples/CompiledEJB/TransformHome.java b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformHome.java
similarity index 100%
rename from samples/CompiledEJB/TransformHome.java
rename to samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformHome.java
diff --git a/samples/CompiledEJB/TransformRemote.java b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformRemote.java
similarity index 100%
rename from samples/CompiledEJB/TransformRemote.java
rename to samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformRemote.java
diff --git a/samples/CompiledEJB/TransformServlet.java b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformServlet.java
similarity index 100%
rename from samples/CompiledEJB/TransformServlet.java
rename to samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformServlet.java
diff --git a/samples/CompiledJAXP/Compile.java b/samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/Compile.java
similarity index 100%
rename from samples/CompiledJAXP/Compile.java
rename to samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/Compile.java
diff --git a/samples/CompiledJAXP/README.cjaxp b/samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/README.cjaxp
similarity index 100%
rename from samples/CompiledJAXP/README.cjaxp
rename to samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/README.cjaxp
diff --git a/samples/CompiledJAXP/Transform.java b/samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/Transform.java
similarity index 100%
rename from samples/CompiledJAXP/Transform.java
rename to samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/Transform.java
diff --git a/samples/CompiledServlet/CompileServlet.java b/samples/src/main/java/org/apache/xalan/samples/CompiledServlet/CompileServlet.java
similarity index 100%
rename from samples/CompiledServlet/CompileServlet.java
rename to samples/src/main/java/org/apache/xalan/samples/CompiledServlet/CompileServlet.java
diff --git a/samples/CompiledServlet/README.servlet b/samples/src/main/java/org/apache/xalan/samples/CompiledServlet/README.servlet
similarity index 100%
rename from samples/CompiledServlet/README.servlet
rename to samples/src/main/java/org/apache/xalan/samples/CompiledServlet/README.servlet
diff --git a/samples/CompiledServlet/TransformServlet.java b/samples/src/main/java/org/apache/xalan/samples/CompiledServlet/TransformationServlet.java
similarity index 100%
rename from samples/CompiledServlet/TransformServlet.java
rename to samples/src/main/java/org/apache/xalan/samples/CompiledServlet/TransformationServlet.java
diff --git a/samples/DOM2DOM/DOM2DOM.java b/samples/src/main/java/org/apache/xalan/samples/DOM2DOM/DOM2DOM.java
similarity index 100%
rename from samples/DOM2DOM/DOM2DOM.java
rename to samples/src/main/java/org/apache/xalan/samples/DOM2DOM/DOM2DOM.java
diff --git a/samples/DOM2DOM/birds.xml b/samples/src/main/java/org/apache/xalan/samples/DOM2DOM/birds.xml
similarity index 100%
rename from samples/DOM2DOM/birds.xml
rename to samples/src/main/java/org/apache/xalan/samples/DOM2DOM/birds.xml
diff --git a/samples/DOM2DOM/birds.xsl b/samples/src/main/java/org/apache/xalan/samples/DOM2DOM/birds.xsl
similarity index 100%
rename from samples/DOM2DOM/birds.xsl
rename to samples/src/main/java/org/apache/xalan/samples/DOM2DOM/birds.xsl
diff --git a/samples/Pipe/Pipe.java b/samples/src/main/java/org/apache/xalan/samples/Pipe/Pipe.java
similarity index 100%
rename from samples/Pipe/Pipe.java
rename to samples/src/main/java/org/apache/xalan/samples/Pipe/Pipe.java
diff --git a/samples/Pipe/foo.xml b/samples/src/main/java/org/apache/xalan/samples/Pipe/foo.xml
similarity index 100%
rename from samples/Pipe/foo.xml
rename to samples/src/main/java/org/apache/xalan/samples/Pipe/foo.xml
diff --git a/samples/Pipe/foo1.xsl b/samples/src/main/java/org/apache/xalan/samples/Pipe/foo1.xsl
similarity index 100%
rename from samples/Pipe/foo1.xsl
rename to samples/src/main/java/org/apache/xalan/samples/Pipe/foo1.xsl
diff --git a/samples/Pipe/foo2.xsl b/samples/src/main/java/org/apache/xalan/samples/Pipe/foo2.xsl
similarity index 100%
rename from samples/Pipe/foo2.xsl
rename to samples/src/main/java/org/apache/xalan/samples/Pipe/foo2.xsl
diff --git a/samples/Pipe/foo3.xsl b/samples/src/main/java/org/apache/xalan/samples/Pipe/foo3.xsl
similarity index 100%
rename from samples/Pipe/foo3.xsl
rename to samples/src/main/java/org/apache/xalan/samples/Pipe/foo3.xsl
diff --git a/samples/SAX2SAX/SAX2SAX.java b/samples/src/main/java/org/apache/xalan/samples/SAX2SAX/SAX2SAX.java
similarity index 100%
rename from samples/SAX2SAX/SAX2SAX.java
rename to samples/src/main/java/org/apache/xalan/samples/SAX2SAX/SAX2SAX.java
diff --git a/samples/SAX2SAX/birds.xml b/samples/src/main/java/org/apache/xalan/samples/SAX2SAX/birds.xml
similarity index 100%
rename from samples/SAX2SAX/birds.xml
rename to samples/src/main/java/org/apache/xalan/samples/SAX2SAX/birds.xml
diff --git a/samples/SAX2SAX/birds.xsl b/samples/src/main/java/org/apache/xalan/samples/SAX2SAX/birds.xsl
similarity index 100%
rename from samples/SAX2SAX/birds.xsl
rename to samples/src/main/java/org/apache/xalan/samples/SAX2SAX/birds.xsl
diff --git a/samples/SAX2SAX/foo.xml b/samples/src/main/java/org/apache/xalan/samples/SAX2SAX/foo.xml
similarity index 100%
rename from samples/SAX2SAX/foo.xml
rename to samples/src/main/java/org/apache/xalan/samples/SAX2SAX/foo.xml
diff --git a/samples/SAX2SAX/foo.xsl b/samples/src/main/java/org/apache/xalan/samples/SAX2SAX/foo.xsl
similarity index 100%
rename from samples/SAX2SAX/foo.xsl
rename to samples/src/main/java/org/apache/xalan/samples/SAX2SAX/foo.xsl
diff --git a/samples/SimpleTransform/SimpleTransform.java b/samples/src/main/java/org/apache/xalan/samples/SimpleTransform/SimpleTransform.java
similarity index 100%
rename from samples/SimpleTransform/SimpleTransform.java
rename to samples/src/main/java/org/apache/xalan/samples/SimpleTransform/SimpleTransform.java
diff --git a/samples/SimpleTransform/birds.xml b/samples/src/main/java/org/apache/xalan/samples/SimpleTransform/birds.xml
similarity index 100%
rename from samples/SimpleTransform/birds.xml
rename to samples/src/main/java/org/apache/xalan/samples/SimpleTransform/birds.xml
diff --git a/samples/SimpleTransform/birds.xsl b/samples/src/main/java/org/apache/xalan/samples/SimpleTransform/birds.xsl
similarity index 100%
rename from samples/SimpleTransform/birds.xsl
rename to samples/src/main/java/org/apache/xalan/samples/SimpleTransform/birds.xsl
diff --git a/samples/SimpleTransform/foo.xml b/samples/src/main/java/org/apache/xalan/samples/SimpleTransform/foo.xml
similarity index 100%
rename from samples/SimpleTransform/foo.xml
rename to samples/src/main/java/org/apache/xalan/samples/SimpleTransform/foo.xml
diff --git a/samples/SimpleTransform/foo.xsl b/samples/src/main/java/org/apache/xalan/samples/SimpleTransform/foo.xsl
similarity index 100%
rename from samples/SimpleTransform/foo.xsl
rename to samples/src/main/java/org/apache/xalan/samples/SimpleTransform/foo.xsl
diff --git a/samples/Trace/Trace.java b/samples/src/main/java/org/apache/xalan/samples/Trace/Trace.java
similarity index 100%
rename from samples/Trace/Trace.java
rename to samples/src/main/java/org/apache/xalan/samples/Trace/Trace.java
diff --git a/samples/Trace/foo.xml b/samples/src/main/java/org/apache/xalan/samples/Trace/foo.xml
similarity index 100%
rename from samples/Trace/foo.xml
rename to samples/src/main/java/org/apache/xalan/samples/Trace/foo.xml
diff --git a/samples/Trace/foo.xsl b/samples/src/main/java/org/apache/xalan/samples/Trace/foo.xsl
similarity index 100%
rename from samples/Trace/foo.xsl
rename to samples/src/main/java/org/apache/xalan/samples/Trace/foo.xsl
diff --git a/samples/TransformThread/TransformThread.java b/samples/src/main/java/org/apache/xalan/samples/TransformThread/TransformThread.java
similarity index 100%
rename from samples/TransformThread/TransformThread.java
rename to samples/src/main/java/org/apache/xalan/samples/TransformThread/TransformThread.java
diff --git a/samples/TransformThread/foo0.xml b/samples/src/main/java/org/apache/xalan/samples/TransformThread/foo0.xml
similarity index 100%
rename from samples/TransformThread/foo0.xml
rename to samples/src/main/java/org/apache/xalan/samples/TransformThread/foo0.xml
diff --git a/samples/TransformThread/foo0.xsl b/samples/src/main/java/org/apache/xalan/samples/TransformThread/foo0.xsl
similarity index 100%
rename from samples/TransformThread/foo0.xsl
rename to samples/src/main/java/org/apache/xalan/samples/TransformThread/foo0.xsl
diff --git a/samples/TransformThread/foo1.xml b/samples/src/main/java/org/apache/xalan/samples/TransformThread/foo1.xml
similarity index 100%
rename from samples/TransformThread/foo1.xml
rename to samples/src/main/java/org/apache/xalan/samples/TransformThread/foo1.xml
diff --git a/samples/TransformThread/foo1.xsl b/samples/src/main/java/org/apache/xalan/samples/TransformThread/foo1.xsl
similarity index 100%
rename from samples/TransformThread/foo1.xsl
rename to samples/src/main/java/org/apache/xalan/samples/TransformThread/foo1.xsl
diff --git a/samples/UseStylesheetPI/UseStylesheetPI.java b/samples/src/main/java/org/apache/xalan/samples/UseStylesheetPI/UseStylesheetPI.java
similarity index 100%
rename from samples/UseStylesheetPI/UseStylesheetPI.java
rename to samples/src/main/java/org/apache/xalan/samples/UseStylesheetPI/UseStylesheetPI.java
diff --git a/samples/UseStylesheetPI/foo.xsl b/samples/src/main/java/org/apache/xalan/samples/UseStylesheetPI/foo.xsl
similarity index 100%
rename from samples/UseStylesheetPI/foo.xsl
rename to samples/src/main/java/org/apache/xalan/samples/UseStylesheetPI/foo.xsl
diff --git a/samples/UseStylesheetPI/fooX.xml b/samples/src/main/java/org/apache/xalan/samples/UseStylesheetPI/fooX.xml
similarity index 100%
rename from samples/UseStylesheetPI/fooX.xml
rename to samples/src/main/java/org/apache/xalan/samples/UseStylesheetPI/fooX.xml
diff --git a/samples/UseStylesheetParam/UseStylesheetParam.java b/samples/src/main/java/org/apache/xalan/samples/UseStylesheetParam/UseStylesheetParam.java
similarity index 100%
rename from samples/UseStylesheetParam/UseStylesheetParam.java
rename to samples/src/main/java/org/apache/xalan/samples/UseStylesheetParam/UseStylesheetParam.java
diff --git a/samples/UseStylesheetParam/foo.xml b/samples/src/main/java/org/apache/xalan/samples/UseStylesheetParam/foo.xml
similarity index 100%
rename from samples/UseStylesheetParam/foo.xml
rename to samples/src/main/java/org/apache/xalan/samples/UseStylesheetParam/foo.xml
diff --git a/samples/UseStylesheetParam/foo.xsl b/samples/src/main/java/org/apache/xalan/samples/UseStylesheetParam/foo.xsl
similarity index 100%
rename from samples/UseStylesheetParam/foo.xsl
rename to samples/src/main/java/org/apache/xalan/samples/UseStylesheetParam/foo.xsl
diff --git a/samples/UseXMLFilters/UseXMLFilters.java b/samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/UseXMLFilters.java
similarity index 100%
rename from samples/UseXMLFilters/UseXMLFilters.java
rename to samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/UseXMLFilters.java
diff --git a/samples/UseXMLFilters/foo.xml b/samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/foo.xml
similarity index 100%
rename from samples/UseXMLFilters/foo.xml
rename to samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/foo.xml
diff --git a/samples/UseXMLFilters/foo1.xsl b/samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/foo1.xsl
similarity index 100%
rename from samples/UseXMLFilters/foo1.xsl
rename to samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/foo1.xsl
diff --git a/samples/UseXMLFilters/foo2.xsl b/samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/foo2.xsl
similarity index 100%
rename from samples/UseXMLFilters/foo2.xsl
rename to samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/foo2.xsl
diff --git a/samples/UseXMLFilters/foo3.xsl b/samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/foo3.xsl
similarity index 100%
rename from samples/UseXMLFilters/foo3.xsl
rename to samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/foo3.xsl
diff --git a/samples/Validate/Validate.java b/samples/src/main/java/org/apache/xalan/samples/Validate/Validate.java
similarity index 100%
rename from samples/Validate/Validate.java
rename to samples/src/main/java/org/apache/xalan/samples/Validate/Validate.java
diff --git a/samples/Validate/ValidateXMLInput.java b/samples/src/main/java/org/apache/xalan/samples/Validate/ValidateXMLInput.java
similarity index 100%
rename from samples/Validate/ValidateXMLInput.java
rename to samples/src/main/java/org/apache/xalan/samples/Validate/ValidateXMLInput.java
diff --git a/samples/Validate/birds.xml b/samples/src/main/java/org/apache/xalan/samples/Validate/birds.xml
similarity index 100%
rename from samples/Validate/birds.xml
rename to samples/src/main/java/org/apache/xalan/samples/Validate/birds.xml
diff --git a/samples/Validate/birds.xsl b/samples/src/main/java/org/apache/xalan/samples/Validate/birds.xsl
similarity index 100%
rename from samples/Validate/birds.xsl
rename to samples/src/main/java/org/apache/xalan/samples/Validate/birds.xsl
diff --git a/samples/XPathAPI/ApplyXPathJAXP.java b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ApplyXPathJAXP.java
similarity index 100%
rename from samples/XPathAPI/ApplyXPathJAXP.java
rename to samples/src/main/java/org/apache/xalan/samples/XPathAPI/ApplyXPathJAXP.java
diff --git a/samples/XPathAPI/ExtensionFunctionResolver.java b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ExtensionFunctionResolver.java
similarity index 100%
rename from samples/XPathAPI/ExtensionFunctionResolver.java
rename to samples/src/main/java/org/apache/xalan/samples/XPathAPI/ExtensionFunctionResolver.java
diff --git a/samples/XPathAPI/ExtensionTest.java b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ExtensionTest.java
similarity index 100%
rename from samples/XPathAPI/ExtensionTest.java
rename to samples/src/main/java/org/apache/xalan/samples/XPathAPI/ExtensionTest.java
diff --git a/samples/XPathAPI/XPathResolver.java b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/XPathResolver.java
similarity index 100%
rename from samples/XPathAPI/XPathResolver.java
rename to samples/src/main/java/org/apache/xalan/samples/XPathAPI/XPathResolver.java
diff --git a/samples/XPathAPI/foo.xml b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/foo.xml
similarity index 100%
rename from samples/XPathAPI/foo.xml
rename to samples/src/main/java/org/apache/xalan/samples/XPathAPI/foo.xml
diff --git a/samples/XPathAPI/numlist.xml b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/numlist.xml
similarity index 100%
rename from samples/XPathAPI/numlist.xml
rename to samples/src/main/java/org/apache/xalan/samples/XPathAPI/numlist.xml
diff --git a/samples/extensions/1-redir.xml b/samples/src/main/java/org/apache/xalan/samples/extensions/1-redir.xml
similarity index 100%
rename from samples/extensions/1-redir.xml
rename to samples/src/main/java/org/apache/xalan/samples/extensions/1-redir.xml
diff --git a/samples/extensions/1-redir.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/1-redir.xsl
similarity index 100%
rename from samples/extensions/1-redir.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/1-redir.xsl
diff --git a/samples/extensions/2-basicJscript.xml b/samples/src/main/java/org/apache/xalan/samples/extensions/2-basicJscript.xml
similarity index 100%
rename from samples/extensions/2-basicJscript.xml
rename to samples/src/main/java/org/apache/xalan/samples/extensions/2-basicJscript.xml
diff --git a/samples/extensions/2-basicJscript.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/2-basicJscript.xsl
similarity index 100%
rename from samples/extensions/2-basicJscript.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/2-basicJscript.xsl
diff --git a/samples/extensions/3-java-namespace.xml b/samples/src/main/java/org/apache/xalan/samples/extensions/3-java-namespace.xml
similarity index 100%
rename from samples/extensions/3-java-namespace.xml
rename to samples/src/main/java/org/apache/xalan/samples/extensions/3-java-namespace.xml
diff --git a/samples/extensions/3-java-namespace.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/3-java-namespace.xsl
similarity index 100%
rename from samples/extensions/3-java-namespace.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/3-java-namespace.xsl
diff --git a/samples/extensions/4-numlistJava.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/4-numlistJava.xsl
similarity index 100%
rename from samples/extensions/4-numlistJava.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/4-numlistJava.xsl
diff --git a/samples/extensions/5-numlistJscript.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/5-numlistJscript.xsl
similarity index 100%
rename from samples/extensions/5-numlistJscript.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/5-numlistJscript.xsl
diff --git a/samples/extensions/IntDate.java b/samples/src/main/java/org/apache/xalan/samples/extensions/IntDate.java
similarity index 100%
rename from samples/extensions/IntDate.java
rename to samples/src/main/java/org/apache/xalan/samples/extensions/IntDate.java
diff --git a/samples/extensions/MyCounter.java b/samples/src/main/java/org/apache/xalan/samples/extensions/MyCounter.java
similarity index 100%
rename from samples/extensions/MyCounter.java
rename to samples/src/main/java/org/apache/xalan/samples/extensions/MyCounter.java
diff --git a/samples/extensions/numlist.xml b/samples/src/main/java/org/apache/xalan/samples/extensions/numlist.xml
similarity index 100%
rename from samples/extensions/numlist.xml
rename to samples/src/main/java/org/apache/xalan/samples/extensions/numlist.xml
diff --git a/samples/extensions/sql/GETTING_STARTED.txt b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/GETTING_STARTED.txt
similarity index 100%
rename from samples/extensions/sql/GETTING_STARTED.txt
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/GETTING_STARTED.txt
diff --git a/samples/extensions/sql/basic-connection/DumpSQL.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/basic-connection/DumpSQL.xsl
similarity index 100%
rename from samples/extensions/sql/basic-connection/DumpSQL.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/basic-connection/DumpSQL.xsl
diff --git a/samples/extensions/sql/basic-connection/dbinfo.xml b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/basic-connection/dbinfo.xml
similarity index 100%
rename from samples/extensions/sql/basic-connection/dbinfo.xml
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/basic-connection/dbinfo.xml
diff --git a/samples/extensions/sql/basic-connection/dbtest-cinfo.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/basic-connection/dbtest-cinfo.xsl
similarity index 100%
rename from samples/extensions/sql/basic-connection/dbtest-cinfo.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/basic-connection/dbtest-cinfo.xsl
diff --git a/samples/extensions/sql/basic-connection/dbtest.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/basic-connection/dbtest.xsl
similarity index 100%
rename from samples/extensions/sql/basic-connection/dbtest.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/basic-connection/dbtest.xsl
diff --git a/samples/extensions/sql/createdb.sql b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/createdb.sql
similarity index 100%
rename from samples/extensions/sql/createdb.sql
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/createdb.sql
diff --git a/samples/extensions/sql/ext-connection/ExternalConnection.java b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/extConnection/ExternalConnection.java
similarity index 100%
rename from samples/extensions/sql/ext-connection/ExternalConnection.java
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/extConnection/ExternalConnection.java
diff --git a/samples/extensions/sql/ext-connection/dbtest.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/extConnection/dbtest.xsl
similarity index 100%
rename from samples/extensions/sql/ext-connection/dbtest.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/extConnection/dbtest.xsl
diff --git a/samples/extensions/sql/pquery/dbinfo.xml b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/pquery/dbinfo.xml
similarity index 100%
rename from samples/extensions/sql/pquery/dbinfo.xml
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/pquery/dbinfo.xml
diff --git a/samples/extensions/sql/pquery/dbtest.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/pquery/dbtest.xsl
similarity index 100%
rename from samples/extensions/sql/pquery/dbtest.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/pquery/dbtest.xsl
diff --git a/samples/extensions/sql/runDerby.bat b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/runDerby.bat
similarity index 100%
rename from samples/extensions/sql/runDerby.bat
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/runDerby.bat
diff --git a/samples/extensions/sql/runDerby.sh b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/runDerby.sh
similarity index 100%
rename from samples/extensions/sql/runDerby.sh
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/runDerby.sh
diff --git a/samples/extensions/sql/runExtConnection.bat b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/runExtConnection.bat
similarity index 100%
rename from samples/extensions/sql/runExtConnection.bat
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/runExtConnection.bat
diff --git a/samples/extensions/sql/runExtConnection.sh b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/runExtConnection.sh
similarity index 100%
rename from samples/extensions/sql/runExtConnection.sh
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/runExtConnection.sh
diff --git a/samples/extensions/sql/runXalan.bat b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/runXalan.bat
similarity index 100%
rename from samples/extensions/sql/runXalan.bat
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/runXalan.bat
diff --git a/samples/extensions/sql/runXalan.sh b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/runXalan.sh
similarity index 100%
rename from samples/extensions/sql/runXalan.sh
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/runXalan.sh
diff --git a/samples/extensions/sql/show-error/dbinfo.xml b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/show-error/dbinfo.xml
similarity index 100%
rename from samples/extensions/sql/show-error/dbinfo.xml
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/show-error/dbinfo.xml
diff --git a/samples/extensions/sql/show-error/invalidConn.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/show-error/invalidConn.xsl
similarity index 100%
rename from samples/extensions/sql/show-error/invalidConn.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/show-error/invalidConn.xsl
diff --git a/samples/extensions/sql/show-error/invalidPQuery.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/show-error/invalidPQuery.xsl
similarity index 100%
rename from samples/extensions/sql/show-error/invalidPQuery.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/show-error/invalidPQuery.xsl
diff --git a/samples/extensions/sql/show-error/invalidQuery.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/show-error/invalidQuery.xsl
similarity index 100%
rename from samples/extensions/sql/show-error/invalidQuery.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/show-error/invalidQuery.xsl
diff --git a/samples/extensions/sql/streamable/cachedNodes.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/streamable/cachedNodes.xsl
similarity index 100%
rename from samples/extensions/sql/streamable/cachedNodes.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/streamable/cachedNodes.xsl
diff --git a/samples/extensions/sql/streamable/dbinfo.xml b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/streamable/dbinfo.xml
similarity index 100%
rename from samples/extensions/sql/streamable/dbinfo.xml
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/streamable/dbinfo.xml
diff --git a/samples/extensions/sql/streamable/pivot.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/streamable/pivot.xsl
similarity index 100%
rename from samples/extensions/sql/streamable/pivot.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/streamable/pivot.xsl
diff --git a/samples/extensions/sql/streamable/streamNodes.xsl b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/streamable/streamNodes.xsl
similarity index 100%
rename from samples/extensions/sql/streamable/streamNodes.xsl
rename to samples/src/main/java/org/apache/xalan/samples/extensions/sql/streamable/streamNodes.xsl
diff --git a/samples/servlet/ApplyXSLT.java b/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLT.java
similarity index 100%
rename from samples/servlet/ApplyXSLT.java
rename to samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLT.java
diff --git a/samples/servlet/ApplyXSLTException.java b/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTException.java
similarity index 100%
rename from samples/servlet/ApplyXSLTException.java
rename to samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTException.java
diff --git a/samples/servlet/ApplyXSLTListener.java b/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTListener.java
similarity index 100%
rename from samples/servlet/ApplyXSLTListener.java
rename to samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTListener.java
diff --git a/samples/servlet/ApplyXSLTProperties.java b/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTProperties.java
similarity index 100%
rename from samples/servlet/ApplyXSLTProperties.java
rename to samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTProperties.java
diff --git a/samples/servlet/DefaultApplyXSLTProperties.java b/samples/src/main/java/org/apache/xalan/samples/servlet/DefaultApplyXSLTProperties.java
similarity index 100%
rename from samples/servlet/DefaultApplyXSLTProperties.java
rename to samples/src/main/java/org/apache/xalan/samples/servlet/DefaultApplyXSLTProperties.java
diff --git a/samples/servlet/SimpleXSLTServlet.java b/samples/src/main/java/org/apache/xalan/samples/servlet/SimpleXSLTServlet.java
similarity index 100%
rename from samples/servlet/SimpleXSLTServlet.java
rename to samples/src/main/java/org/apache/xalan/samples/servlet/SimpleXSLTServlet.java
diff --git a/samples/servlet/UseStylesheetParamServlet.java b/samples/src/main/java/org/apache/xalan/samples/servlet/UseStylesheetParamServlet.java
similarity index 100%
rename from samples/servlet/UseStylesheetParamServlet.java
rename to samples/src/main/java/org/apache/xalan/samples/servlet/UseStylesheetParamServlet.java
diff --git a/samples/servlet/XSLTServletWithParams.java b/samples/src/main/java/org/apache/xalan/samples/servlet/XSLTServletWithParams.java
similarity index 100%
rename from samples/servlet/XSLTServletWithParams.java
rename to samples/src/main/java/org/apache/xalan/samples/servlet/XSLTServletWithParams.java
diff --git a/samples/servlet/birds.xml b/samples/src/main/java/org/apache/xalan/samples/servlet/birds.xml
similarity index 100%
rename from samples/servlet/birds.xml
rename to samples/src/main/java/org/apache/xalan/samples/servlet/birds.xml
diff --git a/samples/servlet/birds.xsl b/samples/src/main/java/org/apache/xalan/samples/servlet/birds.xsl
similarity index 100%
rename from samples/servlet/birds.xsl
rename to samples/src/main/java/org/apache/xalan/samples/servlet/birds.xsl
diff --git a/samples/servlet/booklist1.xsl b/samples/src/main/java/org/apache/xalan/samples/servlet/booklist1.xsl
similarity index 100%
rename from samples/servlet/booklist1.xsl
rename to samples/src/main/java/org/apache/xalan/samples/servlet/booklist1.xsl
diff --git a/samples/servlet/booklist2.xsl b/samples/src/main/java/org/apache/xalan/samples/servlet/booklist2.xsl
similarity index 100%
rename from samples/servlet/booklist2.xsl
rename to samples/src/main/java/org/apache/xalan/samples/servlet/booklist2.xsl
diff --git a/samples/servlet/catalog.xml b/samples/src/main/java/org/apache/xalan/samples/servlet/catalog.xml
similarity index 100%
rename from samples/servlet/catalog.xml
rename to samples/src/main/java/org/apache/xalan/samples/servlet/catalog.xml
diff --git a/samples/servlet/default.xsl b/samples/src/main/java/org/apache/xalan/samples/servlet/default.xsl
similarity index 100%
rename from samples/servlet/default.xsl
rename to samples/src/main/java/org/apache/xalan/samples/servlet/default.xsl
diff --git a/samples/servlet/default2.xsl b/samples/src/main/java/org/apache/xalan/samples/servlet/default2.xsl
similarity index 100%
rename from samples/servlet/default2.xsl
rename to samples/src/main/java/org/apache/xalan/samples/servlet/default2.xsl
diff --git a/samples/servlet/fooparam.xml b/samples/src/main/java/org/apache/xalan/samples/servlet/fooparam.xml
similarity index 100%
rename from samples/servlet/fooparam.xml
rename to samples/src/main/java/org/apache/xalan/samples/servlet/fooparam.xml
diff --git a/samples/servlet/fooparam.xsl b/samples/src/main/java/org/apache/xalan/samples/servlet/fooparam.xsl
similarity index 100%
rename from samples/servlet/fooparam.xsl
rename to samples/src/main/java/org/apache/xalan/samples/servlet/fooparam.xsl
diff --git a/samples/servlet/jspSample.jsp b/samples/src/main/java/org/apache/xalan/samples/servlet/jspSample.jsp
similarity index 100%
rename from samples/servlet/jspSample.jsp
rename to samples/src/main/java/org/apache/xalan/samples/servlet/jspSample.jsp
diff --git a/samples/servlet/media.properties b/samples/src/main/java/org/apache/xalan/samples/servlet/media.properties
similarity index 100%
rename from samples/servlet/media.properties
rename to samples/src/main/java/org/apache/xalan/samples/servlet/media.properties
diff --git a/samples/servlet/web.xml b/samples/src/main/java/org/apache/xalan/samples/servlet/web.xml
similarity index 100%
rename from samples/servlet/web.xml
rename to samples/src/main/java/org/apache/xalan/samples/servlet/web.xml
diff --git a/samples/translets/JAXPTransletMultipleTransformations.java b/samples/src/main/java/org/apache/xalan/samples/translets/JAXPTransletMultipleTransformations.java
similarity index 100%
rename from samples/translets/JAXPTransletMultipleTransformations.java
rename to samples/src/main/java/org/apache/xalan/samples/translets/JAXPTransletMultipleTransformations.java
diff --git a/samples/translets/JAXPTransletOneTransformation.java b/samples/src/main/java/org/apache/xalan/samples/translets/JAXPTransletOneTransformation.java
similarity index 100%
rename from samples/translets/JAXPTransletOneTransformation.java
rename to samples/src/main/java/org/apache/xalan/samples/translets/JAXPTransletOneTransformation.java
diff --git a/samples/translets/todo.xml b/samples/src/main/java/org/apache/xalan/samples/translets/todo.xml
similarity index 100%
rename from samples/translets/todo.xml
rename to samples/src/main/java/org/apache/xalan/samples/translets/todo.xml
diff --git a/samples/translets/todo.xsl b/samples/src/main/java/org/apache/xalan/samples/translets/todo.xsl
similarity index 100%
rename from samples/translets/todo.xsl
rename to samples/src/main/java/org/apache/xalan/samples/translets/todo.xsl
diff --git a/samples/translets/todotoo.xml b/samples/src/main/java/org/apache/xalan/samples/translets/todotoo.xml
similarity index 100%
rename from samples/translets/todotoo.xml
rename to samples/src/main/java/org/apache/xalan/samples/translets/todotoo.xml
diff --git a/samples/trax/ExampleContentHandler.java b/samples/src/main/java/org/apache/xalan/samples/trax/ExampleContentHandler.java
similarity index 100%
rename from samples/trax/ExampleContentHandler.java
rename to samples/src/main/java/org/apache/xalan/samples/trax/ExampleContentHandler.java
diff --git a/samples/trax/Examples.java b/samples/src/main/java/org/apache/xalan/samples/trax/Examples.java
similarity index 100%
rename from samples/trax/Examples.java
rename to samples/src/main/java/org/apache/xalan/samples/trax/Examples.java
diff --git a/samples/trax/xml/baz.xml b/samples/src/main/java/org/apache/xalan/samples/trax/xml/baz.xml
similarity index 100%
rename from samples/trax/xml/baz.xml
rename to samples/src/main/java/org/apache/xalan/samples/trax/xml/baz.xml
diff --git a/samples/trax/xml/foo.xml b/samples/src/main/java/org/apache/xalan/samples/trax/xml/foo.xml
similarity index 100%
rename from samples/trax/xml/foo.xml
rename to samples/src/main/java/org/apache/xalan/samples/trax/xml/foo.xml
diff --git a/samples/trax/xml/subdir1/foo2.xml b/samples/src/main/java/org/apache/xalan/samples/trax/xml/subdir1/foo2.xml
similarity index 100%
rename from samples/trax/xml/subdir1/foo2.xml
rename to samples/src/main/java/org/apache/xalan/samples/trax/xml/subdir1/foo2.xml
diff --git a/samples/trax/xml/subdir1/subdir2/foo3.xml b/samples/src/main/java/org/apache/xalan/samples/trax/xml/subdir1/subdir2/foo3.xml
similarity index 100%
rename from samples/trax/xml/subdir1/subdir2/foo3.xml
rename to samples/src/main/java/org/apache/xalan/samples/trax/xml/subdir1/subdir2/foo3.xml
diff --git a/samples/trax/xsl/baz.xsl b/samples/src/main/java/org/apache/xalan/samples/trax/xsl/baz.xsl
similarity index 100%
rename from samples/trax/xsl/baz.xsl
rename to samples/src/main/java/org/apache/xalan/samples/trax/xsl/baz.xsl
diff --git a/samples/trax/xsl/foo.xsl b/samples/src/main/java/org/apache/xalan/samples/trax/xsl/foo.xsl
similarity index 100%
rename from samples/trax/xsl/foo.xsl
rename to samples/src/main/java/org/apache/xalan/samples/trax/xsl/foo.xsl
diff --git a/samples/trax/xsl/foo2.xsl b/samples/src/main/java/org/apache/xalan/samples/trax/xsl/foo2.xsl
similarity index 100%
rename from samples/trax/xsl/foo2.xsl
rename to samples/src/main/java/org/apache/xalan/samples/trax/xsl/foo2.xsl
diff --git a/samples/trax/xsl/foo3.xsl b/samples/src/main/java/org/apache/xalan/samples/trax/xsl/foo3.xsl
similarity index 100%
rename from samples/trax/xsl/foo3.xsl
rename to samples/src/main/java/org/apache/xalan/samples/trax/xsl/foo3.xsl
diff --git a/samples/trax/xsl/inc1/inc1.xsl b/samples/src/main/java/org/apache/xalan/samples/trax/xsl/inc1/inc1.xsl
similarity index 100%
rename from samples/trax/xsl/inc1/inc1.xsl
rename to samples/src/main/java/org/apache/xalan/samples/trax/xsl/inc1/inc1.xsl
diff --git a/samples/trax/xsl/inc1/inc2/inc2.xsl b/samples/src/main/java/org/apache/xalan/samples/trax/xsl/inc1/inc2/inc2.xsl
similarity index 100%
rename from samples/trax/xsl/inc1/inc2/inc2.xsl
rename to samples/src/main/java/org/apache/xalan/samples/trax/xsl/inc1/inc2/inc2.xsl
diff --git a/samples/AppletXMLtoHTML/README.html b/samples/src/site/xhtml/AppletXMLtoHTML/README.xhtml
similarity index 100%
rename from samples/AppletXMLtoHTML/README.html
rename to samples/src/site/xhtml/AppletXMLtoHTML/README.xhtml
diff --git a/samples/AppletXMLtoHTML/appletXMLtoHTML.html b/samples/src/site/xhtml/AppletXMLtoHTML/appletXMLtoHTML.xhtml
similarity index 100%
rename from samples/AppletXMLtoHTML/appletXMLtoHTML.html
rename to samples/src/site/xhtml/AppletXMLtoHTML/appletXMLtoHTML.xhtml
diff --git a/samples/AppletXMLtoHTML/client.html b/samples/src/site/xhtml/AppletXMLtoHTML/client.xhtml
similarity index 100%
rename from samples/AppletXMLtoHTML/client.html
rename to samples/src/site/xhtml/AppletXMLtoHTML/client.xhtml
diff --git a/samples/AppletXMLtoHTML/target.html b/samples/src/site/xhtml/AppletXMLtoHTML/target.xhtml
similarity index 100%
rename from samples/AppletXMLtoHTML/target.html
rename to samples/src/site/xhtml/AppletXMLtoHTML/target.xhtml
diff --git a/samples/ApplyXPath/readme.html b/samples/src/site/xhtml/ApplyXPath/readme.xhtml
similarity index 100%
rename from samples/ApplyXPath/readme.html
rename to samples/src/site/xhtml/ApplyXPath/readme.xhtml
diff --git a/samples/ApplyXPathDOM/readme.html b/samples/src/site/xhtml/ApplyXPathDOM/readme.xhtml
similarity index 100%
rename from samples/ApplyXPathDOM/readme.html
rename to samples/src/site/xhtml/ApplyXPathDOM/readme.xhtml
diff --git a/samples/CompiledApplet/index.html b/samples/src/site/xhtml/CompiledApplet/index.xhtml
similarity index 100%
rename from samples/CompiledApplet/index.html
rename to samples/src/site/xhtml/CompiledApplet/index.xhtml
diff --git a/samples/CompiledApplet/menu.html b/samples/src/site/xhtml/CompiledApplet/menu.xhtml
similarity index 100%
rename from samples/CompiledApplet/menu.html
rename to samples/src/site/xhtml/CompiledApplet/menu.xhtml
diff --git a/samples/CompiledApplet/singleTransform.html b/samples/src/site/xhtml/CompiledApplet/singleTransform.xhtml
similarity index 100%
rename from samples/CompiledApplet/singleTransform.html
rename to samples/src/site/xhtml/CompiledApplet/singleTransform.xhtml
diff --git a/samples/CompiledEJB/bottom_frame.html b/samples/src/site/xhtml/CompiledEJB/bottom_frame.xhtml
similarity index 100%
rename from samples/CompiledEJB/bottom_frame.html
rename to samples/src/site/xhtml/CompiledEJB/bottom_frame.xhtml
diff --git a/samples/CompiledEJB/index.html b/samples/src/site/xhtml/CompiledEJB/index.xhtml
similarity index 100%
rename from samples/CompiledEJB/index.html
rename to samples/src/site/xhtml/CompiledEJB/index.xhtml
diff --git a/samples/CompiledEJB/top_frame.html b/samples/src/site/xhtml/CompiledEJB/top_frame.xhtml
similarity index 100%
rename from samples/CompiledEJB/top_frame.html
rename to samples/src/site/xhtml/CompiledEJB/top_frame.xhtml
diff --git a/samples/DOM2DOM/readme.html b/samples/src/site/xhtml/DOM2DOM/readme.xhtml
similarity index 100%
rename from samples/DOM2DOM/readme.html
rename to samples/src/site/xhtml/DOM2DOM/readme.xhtml
diff --git a/samples/Pipe/readme.html b/samples/src/site/xhtml/Pipe/readme.xhtml
similarity index 100%
rename from samples/Pipe/readme.html
rename to samples/src/site/xhtml/Pipe/readme.xhtml
diff --git a/samples/SimpleTransform/readme.html b/samples/src/site/xhtml/SimpleTransform/readme.xhtml
similarity index 100%
rename from samples/SimpleTransform/readme.html
rename to samples/src/site/xhtml/SimpleTransform/readme.xhtml
diff --git a/samples/UseStylesheetParam/readme.html b/samples/src/site/xhtml/UseStylesheetParam/readme.xhtml
similarity index 100%
rename from samples/UseStylesheetParam/readme.html
rename to samples/src/site/xhtml/UseStylesheetParam/readme.xhtml
diff --git a/samples/UseXMLFilters/readme.html b/samples/src/site/xhtml/UseXMLFilters/readme.xhtml
similarity index 100%
rename from samples/UseXMLFilters/readme.html
rename to samples/src/site/xhtml/UseXMLFilters/readme.xhtml
diff --git a/samples/Validate/readme.html b/samples/src/site/xhtml/Validate/readme.xhtml
similarity index 100%
rename from samples/Validate/readme.html
rename to samples/src/site/xhtml/Validate/readme.xhtml
diff --git a/samples/extensions/readme.html b/samples/src/site/xhtml/extensions/readme.xhtml
similarity index 100%
rename from samples/extensions/readme.html
rename to samples/src/site/xhtml/extensions/readme.xhtml
diff --git a/samples/extensions/sql/basic-connection/readme.html b/samples/src/site/xhtml/extensions/sql/basic-connection/readme.xhtml
similarity index 100%
rename from samples/extensions/sql/basic-connection/readme.html
rename to samples/src/site/xhtml/extensions/sql/basic-connection/readme.xhtml
diff --git a/samples/extensions/sql/ext-connection/readme.html b/samples/src/site/xhtml/extensions/sql/extConnection/readme.xhtml
similarity index 100%
rename from samples/extensions/sql/ext-connection/readme.html
rename to samples/src/site/xhtml/extensions/sql/extConnection/readme.xhtml
diff --git a/samples/extensions/sql/pquery/readme.html b/samples/src/site/xhtml/extensions/sql/pquery/readme.xhtml
similarity index 100%
rename from samples/extensions/sql/pquery/readme.html
rename to samples/src/site/xhtml/extensions/sql/pquery/readme.xhtml
diff --git a/samples/extensions/sql/readme.html b/samples/src/site/xhtml/extensions/sql/readme.xhtml
similarity index 100%
rename from samples/extensions/sql/readme.html
rename to samples/src/site/xhtml/extensions/sql/readme.xhtml
diff --git a/samples/extensions/sql/show-error/readme.html b/samples/src/site/xhtml/extensions/sql/show-error/readme.xhtml
similarity index 100%
rename from samples/extensions/sql/show-error/readme.html
rename to samples/src/site/xhtml/extensions/sql/show-error/readme.xhtml
diff --git a/samples/extensions/sql/streamable/readme.html b/samples/src/site/xhtml/extensions/sql/streamable/readme.xhtml
similarity index 100%
rename from samples/extensions/sql/streamable/readme.html
rename to samples/src/site/xhtml/extensions/sql/streamable/readme.xhtml
diff --git a/samples/servlet/readme.html b/samples/src/site/xhtml/servlet/readme.xhtml
similarity index 100%
rename from samples/servlet/readme.html
rename to samples/src/site/xhtml/servlet/readme.xhtml
diff --git a/samples/translets/readme.html b/samples/src/site/xhtml/translets/readme.xhtml
similarity index 100%
rename from samples/translets/readme.html
rename to samples/src/site/xhtml/translets/readme.xhtml
diff --git a/tools/xalan2jtaglet.jar b/samples/tools/xalan2jtaglet.jar
similarity index 100%
rename from tools/xalan2jtaglet.jar
rename to samples/tools/xalan2jtaglet.jar
diff --git a/src/MANIFEST.SERIALIZER b/serializer/src/main/java/MANIFEST.SERIALIZER
similarity index 100%
rename from src/MANIFEST.SERIALIZER
rename to serializer/src/main/java/MANIFEST.SERIALIZER
diff --git a/src/org/apache/xml/serializer/AttributesImplSerializer.java b/serializer/src/main/java/org/apache/xml/serializer/AttributesImplSerializer.java
similarity index 100%
rename from src/org/apache/xml/serializer/AttributesImplSerializer.java
rename to serializer/src/main/java/org/apache/xml/serializer/AttributesImplSerializer.java
diff --git a/src/org/apache/xml/serializer/CharInfo.java b/serializer/src/main/java/org/apache/xml/serializer/CharInfo.java
similarity index 100%
rename from src/org/apache/xml/serializer/CharInfo.java
rename to serializer/src/main/java/org/apache/xml/serializer/CharInfo.java
diff --git a/src/org/apache/xml/serializer/DOM3Serializer.java b/serializer/src/main/java/org/apache/xml/serializer/DOM3Serializer.java
similarity index 100%
rename from src/org/apache/xml/serializer/DOM3Serializer.java
rename to serializer/src/main/java/org/apache/xml/serializer/DOM3Serializer.java
diff --git a/src/org/apache/xml/serializer/DOMSerializer.java b/serializer/src/main/java/org/apache/xml/serializer/DOMSerializer.java
similarity index 100%
rename from src/org/apache/xml/serializer/DOMSerializer.java
rename to serializer/src/main/java/org/apache/xml/serializer/DOMSerializer.java
diff --git a/src/org/apache/xml/serializer/ElemContext.java b/serializer/src/main/java/org/apache/xml/serializer/ElemContext.java
similarity index 100%
rename from src/org/apache/xml/serializer/ElemContext.java
rename to serializer/src/main/java/org/apache/xml/serializer/ElemContext.java
diff --git a/src/org/apache/xml/serializer/ElemDesc.java b/serializer/src/main/java/org/apache/xml/serializer/ElemDesc.java
similarity index 100%
rename from src/org/apache/xml/serializer/ElemDesc.java
rename to serializer/src/main/java/org/apache/xml/serializer/ElemDesc.java
diff --git a/src/org/apache/xml/serializer/EmptySerializer.java b/serializer/src/main/java/org/apache/xml/serializer/EmptySerializer.java
similarity index 100%
rename from src/org/apache/xml/serializer/EmptySerializer.java
rename to serializer/src/main/java/org/apache/xml/serializer/EmptySerializer.java
diff --git a/src/org/apache/xml/serializer/EncodingInfo.java b/serializer/src/main/java/org/apache/xml/serializer/EncodingInfo.java
similarity index 100%
rename from src/org/apache/xml/serializer/EncodingInfo.java
rename to serializer/src/main/java/org/apache/xml/serializer/EncodingInfo.java
diff --git a/src/org/apache/xml/serializer/Encodings.java b/serializer/src/main/java/org/apache/xml/serializer/Encodings.java
similarity index 100%
rename from src/org/apache/xml/serializer/Encodings.java
rename to serializer/src/main/java/org/apache/xml/serializer/Encodings.java
diff --git a/src/org/apache/xml/serializer/ExtendedContentHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java
similarity index 100%
rename from src/org/apache/xml/serializer/ExtendedContentHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java
diff --git a/src/org/apache/xml/serializer/ExtendedLexicalHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java
similarity index 100%
rename from src/org/apache/xml/serializer/ExtendedLexicalHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java
diff --git a/src/org/apache/xml/serializer/Method.java b/serializer/src/main/java/org/apache/xml/serializer/Method.java
similarity index 100%
rename from src/org/apache/xml/serializer/Method.java
rename to serializer/src/main/java/org/apache/xml/serializer/Method.java
diff --git a/src/org/apache/xml/serializer/NamespaceMappings.java b/serializer/src/main/java/org/apache/xml/serializer/NamespaceMappings.java
similarity index 100%
rename from src/org/apache/xml/serializer/NamespaceMappings.java
rename to serializer/src/main/java/org/apache/xml/serializer/NamespaceMappings.java
diff --git a/src/org/apache/xml/serializer/ObjectFactory.java b/serializer/src/main/java/org/apache/xml/serializer/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xml/serializer/ObjectFactory.java
rename to serializer/src/main/java/org/apache/xml/serializer/ObjectFactory.java
diff --git a/src/org/apache/xml/serializer/OutputPropertiesFactory.java b/serializer/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java
similarity index 100%
rename from src/org/apache/xml/serializer/OutputPropertiesFactory.java
rename to serializer/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java
diff --git a/src/org/apache/xml/serializer/OutputPropertyUtils.java b/serializer/src/main/java/org/apache/xml/serializer/OutputPropertyUtils.java
similarity index 100%
rename from src/org/apache/xml/serializer/OutputPropertyUtils.java
rename to serializer/src/main/java/org/apache/xml/serializer/OutputPropertyUtils.java
diff --git a/src/org/apache/xml/serializer/SecuritySupport.java b/serializer/src/main/java/org/apache/xml/serializer/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xml/serializer/SecuritySupport.java
rename to serializer/src/main/java/org/apache/xml/serializer/SecuritySupport.java
diff --git a/src/org/apache/xml/serializer/SerializationHandler.java b/serializer/src/main/java/org/apache/xml/serializer/SerializationHandler.java
similarity index 100%
rename from src/org/apache/xml/serializer/SerializationHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/SerializationHandler.java
diff --git a/src/org/apache/xml/serializer/Serializer.java b/serializer/src/main/java/org/apache/xml/serializer/Serializer.java
similarity index 100%
rename from src/org/apache/xml/serializer/Serializer.java
rename to serializer/src/main/java/org/apache/xml/serializer/Serializer.java
diff --git a/src/org/apache/xml/serializer/SerializerBase.java b/serializer/src/main/java/org/apache/xml/serializer/SerializerBase.java
similarity index 100%
rename from src/org/apache/xml/serializer/SerializerBase.java
rename to serializer/src/main/java/org/apache/xml/serializer/SerializerBase.java
diff --git a/src/org/apache/xml/serializer/SerializerConstants.java b/serializer/src/main/java/org/apache/xml/serializer/SerializerConstants.java
similarity index 100%
rename from src/org/apache/xml/serializer/SerializerConstants.java
rename to serializer/src/main/java/org/apache/xml/serializer/SerializerConstants.java
diff --git a/src/org/apache/xml/serializer/SerializerFactory.java b/serializer/src/main/java/org/apache/xml/serializer/SerializerFactory.java
similarity index 100%
rename from src/org/apache/xml/serializer/SerializerFactory.java
rename to serializer/src/main/java/org/apache/xml/serializer/SerializerFactory.java
diff --git a/src/org/apache/xml/serializer/SerializerTrace.java b/serializer/src/main/java/org/apache/xml/serializer/SerializerTrace.java
similarity index 100%
rename from src/org/apache/xml/serializer/SerializerTrace.java
rename to serializer/src/main/java/org/apache/xml/serializer/SerializerTrace.java
diff --git a/src/org/apache/xml/serializer/SerializerTraceWriter.java b/serializer/src/main/java/org/apache/xml/serializer/SerializerTraceWriter.java
similarity index 100%
rename from src/org/apache/xml/serializer/SerializerTraceWriter.java
rename to serializer/src/main/java/org/apache/xml/serializer/SerializerTraceWriter.java
diff --git a/src/org/apache/xml/serializer/ToHTMLSAXHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ToHTMLSAXHandler.java
similarity index 100%
rename from src/org/apache/xml/serializer/ToHTMLSAXHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToHTMLSAXHandler.java
diff --git a/src/org/apache/xml/serializer/ToHTMLStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
similarity index 100%
rename from src/org/apache/xml/serializer/ToHTMLStream.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
diff --git a/src/org/apache/xml/serializer/ToSAXHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
similarity index 100%
rename from src/org/apache/xml/serializer/ToSAXHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
diff --git a/src/org/apache/xml/serializer/ToStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToStream.java
similarity index 100%
rename from src/org/apache/xml/serializer/ToStream.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToStream.java
diff --git a/src/org/apache/xml/serializer/ToTextSAXHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
similarity index 100%
rename from src/org/apache/xml/serializer/ToTextSAXHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
diff --git a/src/org/apache/xml/serializer/ToTextStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToTextStream.java
similarity index 100%
rename from src/org/apache/xml/serializer/ToTextStream.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToTextStream.java
diff --git a/src/org/apache/xml/serializer/ToUnknownStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
similarity index 100%
rename from src/org/apache/xml/serializer/ToUnknownStream.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
diff --git a/src/org/apache/xml/serializer/ToXMLSAXHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
similarity index 100%
rename from src/org/apache/xml/serializer/ToXMLSAXHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
diff --git a/src/org/apache/xml/serializer/ToXMLStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToXMLStream.java
similarity index 100%
rename from src/org/apache/xml/serializer/ToXMLStream.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToXMLStream.java
diff --git a/src/org/apache/xml/serializer/TransformStateSetter.java b/serializer/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
similarity index 100%
rename from src/org/apache/xml/serializer/TransformStateSetter.java
rename to serializer/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
diff --git a/src/org/apache/xml/serializer/TreeWalker.java b/serializer/src/main/java/org/apache/xml/serializer/TreeWalker.java
similarity index 100%
rename from src/org/apache/xml/serializer/TreeWalker.java
rename to serializer/src/main/java/org/apache/xml/serializer/TreeWalker.java
diff --git a/src/org/apache/xml/serializer/WriterChain.java b/serializer/src/main/java/org/apache/xml/serializer/WriterChain.java
similarity index 100%
rename from src/org/apache/xml/serializer/WriterChain.java
rename to serializer/src/main/java/org/apache/xml/serializer/WriterChain.java
diff --git a/src/org/apache/xml/serializer/WriterToASCI.java b/serializer/src/main/java/org/apache/xml/serializer/WriterToASCI.java
similarity index 100%
rename from src/org/apache/xml/serializer/WriterToASCI.java
rename to serializer/src/main/java/org/apache/xml/serializer/WriterToASCI.java
diff --git a/src/org/apache/xml/serializer/WriterToUTF8Buffered.java b/serializer/src/main/java/org/apache/xml/serializer/WriterToUTF8Buffered.java
similarity index 100%
rename from src/org/apache/xml/serializer/WriterToUTF8Buffered.java
rename to serializer/src/main/java/org/apache/xml/serializer/WriterToUTF8Buffered.java
diff --git a/src/org/apache/xml/serializer/XSLOutputAttributes.java b/serializer/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java
similarity index 100%
rename from src/org/apache/xml/serializer/XSLOutputAttributes.java
rename to serializer/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java
diff --git a/src/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
similarity index 100%
rename from src/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
diff --git a/src/org/apache/xml/serializer/dom3/DOM3TreeWalker.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java
similarity index 100%
rename from src/org/apache/xml/serializer/dom3/DOM3TreeWalker.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java
diff --git a/src/org/apache/xml/serializer/dom3/DOMConstants.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOMConstants.java
similarity index 100%
rename from src/org/apache/xml/serializer/dom3/DOMConstants.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/DOMConstants.java
diff --git a/src/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java
similarity index 100%
rename from src/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java
diff --git a/src/org/apache/xml/serializer/dom3/DOMErrorImpl.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOMErrorImpl.java
similarity index 100%
rename from src/org/apache/xml/serializer/dom3/DOMErrorImpl.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/DOMErrorImpl.java
diff --git a/src/org/apache/xml/serializer/dom3/DOMLocatorImpl.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOMLocatorImpl.java
similarity index 100%
rename from src/org/apache/xml/serializer/dom3/DOMLocatorImpl.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/DOMLocatorImpl.java
diff --git a/src/org/apache/xml/serializer/dom3/DOMOutputImpl.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOMOutputImpl.java
similarity index 100%
rename from src/org/apache/xml/serializer/dom3/DOMOutputImpl.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/DOMOutputImpl.java
diff --git a/src/org/apache/xml/serializer/dom3/DOMStringListImpl.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOMStringListImpl.java
similarity index 100%
rename from src/org/apache/xml/serializer/dom3/DOMStringListImpl.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/DOMStringListImpl.java
diff --git a/src/org/apache/xml/serializer/dom3/LSSerializerImpl.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java
similarity index 100%
rename from src/org/apache/xml/serializer/dom3/LSSerializerImpl.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java
diff --git a/src/org/apache/xml/serializer/dom3/NamespaceSupport.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
similarity index 100%
rename from src/org/apache/xml/serializer/dom3/NamespaceSupport.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
diff --git a/src/org/apache/xml/serializer/utils/AttList.java b/serializer/src/main/java/org/apache/xml/serializer/utils/AttList.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/AttList.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/AttList.java
diff --git a/src/org/apache/xml/serializer/utils/BoolStack.java b/serializer/src/main/java/org/apache/xml/serializer/utils/BoolStack.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/BoolStack.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/BoolStack.java
diff --git a/src/org/apache/xml/serializer/utils/DOM2Helper.java b/serializer/src/main/java/org/apache/xml/serializer/utils/DOM2Helper.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/DOM2Helper.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/DOM2Helper.java
diff --git a/src/org/apache/xml/serializer/utils/Messages.java b/serializer/src/main/java/org/apache/xml/serializer/utils/Messages.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/Messages.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/Messages.java
diff --git a/src/org/apache/xml/serializer/utils/MsgKey.java b/serializer/src/main/java/org/apache/xml/serializer/utils/MsgKey.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/MsgKey.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/MsgKey.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_ca.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ca.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_ca.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ca.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_cs.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_cs.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_cs.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_cs.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_de.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_de.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_de.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_de.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_en.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_en.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_en.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_en.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_es.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_es.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_es.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_es.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_fr.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_fr.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_fr.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_fr.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_hu.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_hu.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_hu.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_hu.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_it.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_it.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_it.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_it.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_ja.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ja.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_ja.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ja.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_ko.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ko.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_ko.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ko.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_pl.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pl.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_pl.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pl.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_ru.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ru.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_ru.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ru.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_sk.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sk.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_sk.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sk.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_sl.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sl.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_sl.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sl.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_sv.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sv.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_sv.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sv.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_tr.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_tr.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_tr.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_tr.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_zh.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_zh.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java
diff --git a/src/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java
diff --git a/src/org/apache/xml/serializer/utils/StringToIntTable.java b/serializer/src/main/java/org/apache/xml/serializer/utils/StringToIntTable.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/StringToIntTable.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/StringToIntTable.java
diff --git a/src/org/apache/xml/serializer/utils/SystemIDResolver.java b/serializer/src/main/java/org/apache/xml/serializer/utils/SystemIDResolver.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/SystemIDResolver.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/SystemIDResolver.java
diff --git a/src/org/apache/xml/serializer/utils/URI.java b/serializer/src/main/java/org/apache/xml/serializer/utils/URI.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/URI.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/URI.java
diff --git a/src/org/apache/xml/serializer/utils/Utils.java b/serializer/src/main/java/org/apache/xml/serializer/utils/Utils.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/Utils.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/Utils.java
diff --git a/src/org/apache/xml/serializer/utils/WrappedRuntimeException.java b/serializer/src/main/java/org/apache/xml/serializer/utils/WrappedRuntimeException.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/WrappedRuntimeException.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/WrappedRuntimeException.java
diff --git a/src/org/apache/xml/serializer/utils/XML11Char.java b/serializer/src/main/java/org/apache/xml/serializer/utils/XML11Char.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/XML11Char.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/XML11Char.java
diff --git a/src/org/apache/xml/serializer/utils/XMLChar.java b/serializer/src/main/java/org/apache/xml/serializer/utils/XMLChar.java
similarity index 100%
rename from src/org/apache/xml/serializer/utils/XMLChar.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/XMLChar.java
diff --git a/src/org/apache/xml/serializer/Encodings.properties b/serializer/src/main/resources/org/apache/xml/serializer/Encodings.properties
similarity index 100%
rename from src/org/apache/xml/serializer/Encodings.properties
rename to serializer/src/main/resources/org/apache/xml/serializer/Encodings.properties
diff --git a/src/org/apache/xml/serializer/HTMLEntities.properties b/serializer/src/main/resources/org/apache/xml/serializer/HTMLEntities.properties
similarity index 100%
rename from src/org/apache/xml/serializer/HTMLEntities.properties
rename to serializer/src/main/resources/org/apache/xml/serializer/HTMLEntities.properties
diff --git a/src/org/apache/xml/serializer/Version.src b/serializer/src/main/resources/org/apache/xml/serializer/Version.src
similarity index 100%
rename from src/org/apache/xml/serializer/Version.src
rename to serializer/src/main/resources/org/apache/xml/serializer/Version.src
diff --git a/src/org/apache/xml/serializer/XMLEntities.properties b/serializer/src/main/resources/org/apache/xml/serializer/XMLEntities.properties
similarity index 100%
rename from src/org/apache/xml/serializer/XMLEntities.properties
rename to serializer/src/main/resources/org/apache/xml/serializer/XMLEntities.properties
diff --git a/src/org/apache/xml/serializer/output_html.properties b/serializer/src/main/resources/org/apache/xml/serializer/output_html.properties
similarity index 100%
rename from src/org/apache/xml/serializer/output_html.properties
rename to serializer/src/main/resources/org/apache/xml/serializer/output_html.properties
diff --git a/src/org/apache/xml/serializer/output_text.properties b/serializer/src/main/resources/org/apache/xml/serializer/output_text.properties
similarity index 100%
rename from src/org/apache/xml/serializer/output_text.properties
rename to serializer/src/main/resources/org/apache/xml/serializer/output_text.properties
diff --git a/src/org/apache/xml/serializer/output_unknown.properties b/serializer/src/main/resources/org/apache/xml/serializer/output_unknown.properties
similarity index 100%
rename from src/org/apache/xml/serializer/output_unknown.properties
rename to serializer/src/main/resources/org/apache/xml/serializer/output_unknown.properties
diff --git a/src/org/apache/xml/serializer/output_xml.properties b/serializer/src/main/resources/org/apache/xml/serializer/output_xml.properties
similarity index 100%
rename from src/org/apache/xml/serializer/output_xml.properties
rename to serializer/src/main/resources/org/apache/xml/serializer/output_xml.properties
diff --git a/src/org/apache/xml/serializer/package.html b/serializer/src/main/resources/org/apache/xml/serializer/package.html
similarity index 100%
rename from src/org/apache/xml/serializer/package.html
rename to serializer/src/main/resources/org/apache/xml/serializer/package.html
diff --git a/xdocs/sources/design/compilation.gif b/stylebook/sources/design/compilation.gif
similarity index 100%
rename from xdocs/sources/design/compilation.gif
rename to stylebook/sources/design/compilation.gif
diff --git a/xdocs/sources/design/conceptual.gif b/stylebook/sources/design/conceptual.gif
similarity index 100%
rename from xdocs/sources/design/conceptual.gif
rename to stylebook/sources/design/conceptual.gif
diff --git a/xdocs/sources/design/data.gif b/stylebook/sources/design/data.gif
similarity index 100%
rename from xdocs/sources/design/data.gif
rename to stylebook/sources/design/data.gif
diff --git a/xdocs/sources/design/design2_0_0.xml b/stylebook/sources/design/design2_0_0.xml
similarity index 100%
rename from xdocs/sources/design/design2_0_0.xml
rename to stylebook/sources/design/design2_0_0.xml
diff --git a/xdocs/sources/design/org_apache.gif b/stylebook/sources/design/org_apache.gif
similarity index 100%
rename from xdocs/sources/design/org_apache.gif
rename to stylebook/sources/design/org_apache.gif
diff --git a/xdocs/sources/design/process.gif b/stylebook/sources/design/process.gif
similarity index 100%
rename from xdocs/sources/design/process.gif
rename to stylebook/sources/design/process.gif
diff --git a/xdocs/sources/design/trax.gif b/stylebook/sources/design/trax.gif
similarity index 100%
rename from xdocs/sources/design/trax.gif
rename to stylebook/sources/design/trax.gif
diff --git a/xdocs/sources/design/xalan.gif b/stylebook/sources/design/xalan.gif
similarity index 100%
rename from xdocs/sources/design/xalan.gif
rename to stylebook/sources/design/xalan.gif
diff --git a/xdocs/sources/design/xalan1_1x1.gif b/stylebook/sources/design/xalan1_1x1.gif
similarity index 100%
rename from xdocs/sources/design/xalan1_1x1.gif
rename to stylebook/sources/design/xalan1_1x1.gif
diff --git a/xdocs/sources/design/xmllogo.gif b/stylebook/sources/design/xmllogo.gif
similarity index 100%
rename from xdocs/sources/design/xmllogo.gif
rename to stylebook/sources/design/xmllogo.gif
diff --git a/xdocs/sources/design/xpath.gif b/stylebook/sources/design/xpath.gif
similarity index 100%
rename from xdocs/sources/design/xpath.gif
rename to stylebook/sources/design/xpath.gif
diff --git a/xdocs/sources/design/xslt_abstract.gif b/stylebook/sources/design/xslt_abstract.gif
similarity index 100%
rename from xdocs/sources/design/xslt_abstract.gif
rename to stylebook/sources/design/xslt_abstract.gif
diff --git a/xdocs/sources/entities.src b/stylebook/sources/entities.ent
similarity index 100%
rename from xdocs/sources/entities.src
rename to stylebook/sources/entities.ent
diff --git a/xdocs/sources/xalan-apache-org-site.xml b/stylebook/sources/xalan-apache-org-site.xml
similarity index 100%
rename from xdocs/sources/xalan-apache-org-site.xml
rename to stylebook/sources/xalan-apache-org-site.xml
diff --git a/xdocs/sources/xalan-apache-org/index.xml b/stylebook/sources/xalan-apache-org/index.xml
similarity index 100%
rename from xdocs/sources/xalan-apache-org/index.xml
rename to stylebook/sources/xalan-apache-org/index.xml
diff --git a/xdocs/sources/xalan-collate.xsl b/stylebook/sources/xalan-collate.xsl
similarity index 100%
rename from xdocs/sources/xalan-collate.xsl
rename to stylebook/sources/xalan-collate.xsl
diff --git a/xdocs/sources/xalan-jlocal.xml b/stylebook/sources/xalan-jlocal.xml
similarity index 100%
rename from xdocs/sources/xalan-jlocal.xml
rename to stylebook/sources/xalan-jlocal.xml
diff --git a/xdocs/sources/xalan-jsite.xml b/stylebook/sources/xalan-jsite.xml
similarity index 100%
rename from xdocs/sources/xalan-jsite.xml
rename to stylebook/sources/xalan-jsite.xml
diff --git a/xdocs/sources/xalan/bugreporting.xml b/stylebook/sources/xalan/bugreporting.xml
similarity index 100%
rename from xdocs/sources/xalan/bugreporting.xml
rename to stylebook/sources/xalan/bugreporting.xml
diff --git a/xdocs/sources/xalan/builds.xml b/stylebook/sources/xalan/builds.xml
similarity index 100%
rename from xdocs/sources/xalan/builds.xml
rename to stylebook/sources/xalan/builds.xml
diff --git a/xdocs/sources/xalan/charter.xml b/stylebook/sources/xalan/charter.xml
similarity index 100%
rename from xdocs/sources/xalan/charter.xml
rename to stylebook/sources/xalan/charter.xml
diff --git a/xdocs/sources/xalan/commandline.xml b/stylebook/sources/xalan/commandline.xml
similarity index 100%
rename from xdocs/sources/xalan/commandline.xml
rename to stylebook/sources/xalan/commandline.xml
diff --git a/xdocs/sources/xalan/commandline_xsltc.xml b/stylebook/sources/xalan/commandline_xsltc.xml
similarity index 100%
rename from xdocs/sources/xalan/commandline_xsltc.xml
rename to stylebook/sources/xalan/commandline_xsltc.xml
diff --git a/xdocs/sources/xalan/contact_us.xml b/stylebook/sources/xalan/contact_us.xml
similarity index 100%
rename from xdocs/sources/xalan/contact_us.xml
rename to stylebook/sources/xalan/contact_us.xml
diff --git a/xdocs/sources/xalan/downloads.xml b/stylebook/sources/xalan/downloads.xml
similarity index 100%
rename from xdocs/sources/xalan/downloads.xml
rename to stylebook/sources/xalan/downloads.xml
diff --git a/xdocs/sources/xalan/dtm.xml b/stylebook/sources/xalan/dtm.xml
similarity index 100%
rename from xdocs/sources/xalan/dtm.xml
rename to stylebook/sources/xalan/dtm.xml
diff --git a/xdocs/sources/xalan/extensions.xml b/stylebook/sources/xalan/extensions.xml
similarity index 100%
rename from xdocs/sources/xalan/extensions.xml
rename to stylebook/sources/xalan/extensions.xml
diff --git a/xdocs/sources/xalan/extensions_xsltc.xml b/stylebook/sources/xalan/extensions_xsltc.xml
similarity index 100%
rename from xdocs/sources/xalan/extensions_xsltc.xml
rename to stylebook/sources/xalan/extensions_xsltc.xml
diff --git a/xdocs/sources/xalan/extensionslib.xml b/stylebook/sources/xalan/extensionslib.xml
similarity index 100%
rename from xdocs/sources/xalan/extensionslib.xml
rename to stylebook/sources/xalan/extensionslib.xml
diff --git a/xdocs/sources/xalan/faq.xml b/stylebook/sources/xalan/faq.xml
similarity index 100%
rename from xdocs/sources/xalan/faq.xml
rename to stylebook/sources/xalan/faq.xml
diff --git a/xdocs/sources/xalan/features.xml b/stylebook/sources/xalan/features.xml
similarity index 100%
rename from xdocs/sources/xalan/features.xml
rename to stylebook/sources/xalan/features.xml
diff --git a/xdocs/sources/xalan/getstarted.xml b/stylebook/sources/xalan/getstarted.xml
similarity index 100%
rename from xdocs/sources/xalan/getstarted.xml
rename to stylebook/sources/xalan/getstarted.xml
diff --git a/xdocs/sources/xalan/history.xml b/stylebook/sources/xalan/history.xml
similarity index 100%
rename from xdocs/sources/xalan/history.xml
rename to stylebook/sources/xalan/history.xml
diff --git a/xdocs/sources/xalan/index.xml b/stylebook/sources/xalan/index.xml
similarity index 100%
rename from xdocs/sources/xalan/index.xml
rename to stylebook/sources/xalan/index.xml
diff --git a/xdocs/sources/xalan/overview.xml b/stylebook/sources/xalan/overview.xml
similarity index 100%
rename from xdocs/sources/xalan/overview.xml
rename to stylebook/sources/xalan/overview.xml
diff --git a/xdocs/sources/xalan/public_apis.xml b/stylebook/sources/xalan/public_apis.xml
similarity index 100%
rename from xdocs/sources/xalan/public_apis.xml
rename to stylebook/sources/xalan/public_apis.xml
diff --git a/xdocs/sources/xalan/readme.xml b/stylebook/sources/xalan/readme.xml
similarity index 100%
rename from xdocs/sources/xalan/readme.xml
rename to stylebook/sources/xalan/readme.xml
diff --git a/xdocs/sources/xalan/resources.xml b/stylebook/sources/xalan/resources.xml
similarity index 100%
rename from xdocs/sources/xalan/resources.xml
rename to stylebook/sources/xalan/resources.xml
diff --git a/xdocs/sources/xalan/samples.xml b/stylebook/sources/xalan/samples.xml
similarity index 100%
rename from xdocs/sources/xalan/samples.xml
rename to stylebook/sources/xalan/samples.xml
diff --git a/xdocs/sources/xalan/trax.xml b/stylebook/sources/xalan/trax.xml
similarity index 100%
rename from xdocs/sources/xalan/trax.xml
rename to stylebook/sources/xalan/trax.xml
diff --git a/xdocs/sources/xalan/usagepatterns.xml b/stylebook/sources/xalan/usagepatterns.xml
similarity index 100%
rename from xdocs/sources/xalan/usagepatterns.xml
rename to stylebook/sources/xalan/usagepatterns.xml
diff --git a/xdocs/sources/xalan/whatsnew.xml b/stylebook/sources/xalan/whatsnew.xml
similarity index 100%
rename from xdocs/sources/xalan/whatsnew.xml
rename to stylebook/sources/xalan/whatsnew.xml
diff --git a/xdocs/sources/xalan/xmlfilters.gif b/stylebook/sources/xalan/xmlfilters.gif
similarity index 100%
rename from xdocs/sources/xalan/xmlfilters.gif
rename to stylebook/sources/xalan/xmlfilters.gif
diff --git a/xdocs/sources/xalan/xpath_apis.xml b/stylebook/sources/xalan/xpath_apis.xml
similarity index 100%
rename from xdocs/sources/xalan/xpath_apis.xml
rename to stylebook/sources/xalan/xpath_apis.xml
diff --git a/xdocs/sources/xalan/xsltc_history.xml b/stylebook/sources/xalan/xsltc_history.xml
similarity index 100%
rename from xdocs/sources/xalan/xsltc_history.xml
rename to stylebook/sources/xalan/xsltc_history.xml
diff --git a/xdocs/sources/xalan/xsltc_usage.xml b/stylebook/sources/xalan/xsltc_usage.xml
similarity index 100%
rename from xdocs/sources/xalan/xsltc_usage.xml
rename to stylebook/sources/xalan/xsltc_usage.xml
diff --git a/xdocs/sources/xalandesign.xml b/stylebook/sources/xalandesign.xml
similarity index 100%
rename from xdocs/sources/xalandesign.xml
rename to stylebook/sources/xalandesign.xml
diff --git a/xdocs/sources/xsltc.xml b/stylebook/sources/xsltc.xml
similarity index 100%
rename from xdocs/sources/xsltc.xml
rename to stylebook/sources/xsltc.xml
diff --git a/xdocs/sources/xsltc/DOMInterface.gif b/stylebook/sources/xsltc/DOMInterface.gif
similarity index 100%
rename from xdocs/sources/xsltc/DOMInterface.gif
rename to stylebook/sources/xsltc/DOMInterface.gif
diff --git a/xdocs/sources/xsltc/DOMLocking.gif b/stylebook/sources/xsltc/DOMLocking.gif
similarity index 100%
rename from xdocs/sources/xsltc/DOMLocking.gif
rename to stylebook/sources/xsltc/DOMLocking.gif
diff --git a/xdocs/sources/xsltc/README b/stylebook/sources/xsltc/README
similarity index 100%
rename from xdocs/sources/xsltc/README
rename to stylebook/sources/xsltc/README
diff --git a/xdocs/sources/xsltc/README.APACHE b/stylebook/sources/xsltc/README.APACHE
similarity index 100%
rename from xdocs/sources/xsltc/README.APACHE
rename to stylebook/sources/xsltc/README.APACHE
diff --git a/xdocs/sources/xsltc/README.api b/stylebook/sources/xsltc/README.api
similarity index 100%
rename from xdocs/sources/xsltc/README.api
rename to stylebook/sources/xsltc/README.api
diff --git a/xdocs/sources/xsltc/README.xslt b/stylebook/sources/xsltc/README.xslt
similarity index 100%
rename from xdocs/sources/xsltc/README.xslt
rename to stylebook/sources/xsltc/README.xslt
diff --git a/xdocs/sources/xsltc/README.xsltc b/stylebook/sources/xsltc/README.xsltc
similarity index 100%
rename from xdocs/sources/xsltc/README.xsltc
rename to stylebook/sources/xsltc/README.xsltc
diff --git a/xdocs/sources/xsltc/README2 b/stylebook/sources/xsltc/README2
similarity index 100%
rename from xdocs/sources/xsltc/README2
rename to stylebook/sources/xsltc/README2
diff --git a/xdocs/sources/xsltc/all_namespaces.gif b/stylebook/sources/xsltc/all_namespaces.gif
similarity index 100%
rename from xdocs/sources/xsltc/all_namespaces.gif
rename to stylebook/sources/xsltc/all_namespaces.gif
diff --git a/xdocs/sources/xsltc/ast_stage1.gif b/stylebook/sources/xsltc/ast_stage1.gif
similarity index 100%
rename from xdocs/sources/xsltc/ast_stage1.gif
rename to stylebook/sources/xsltc/ast_stage1.gif
diff --git a/xdocs/sources/xsltc/ast_stage2.gif b/stylebook/sources/xsltc/ast_stage2.gif
similarity index 100%
rename from xdocs/sources/xsltc/ast_stage2.gif
rename to stylebook/sources/xsltc/ast_stage2.gif
diff --git a/xdocs/sources/xsltc/ast_stage3.gif b/stylebook/sources/xsltc/ast_stage3.gif
similarity index 100%
rename from xdocs/sources/xsltc/ast_stage3.gif
rename to stylebook/sources/xsltc/ast_stage3.gif
diff --git a/xdocs/sources/xsltc/cast_expression.gif b/stylebook/sources/xsltc/cast_expression.gif
similarity index 100%
rename from xdocs/sources/xsltc/cast_expression.gif
rename to stylebook/sources/xsltc/cast_expression.gif
diff --git a/xdocs/sources/xsltc/class_loader.gif b/stylebook/sources/xsltc/class_loader.gif
similarity index 100%
rename from xdocs/sources/xsltc/class_loader.gif
rename to stylebook/sources/xsltc/class_loader.gif
diff --git a/xdocs/sources/xsltc/compiler_AST.gif b/stylebook/sources/xsltc/compiler_AST.gif
similarity index 100%
rename from xdocs/sources/xsltc/compiler_AST.gif
rename to stylebook/sources/xsltc/compiler_AST.gif
diff --git a/xdocs/sources/xsltc/compiler_DOM.gif b/stylebook/sources/xsltc/compiler_DOM.gif
similarity index 100%
rename from xdocs/sources/xsltc/compiler_DOM.gif
rename to stylebook/sources/xsltc/compiler_DOM.gif
diff --git a/xdocs/sources/xsltc/compiler_architecture.gif b/stylebook/sources/xsltc/compiler_architecture.gif
similarity index 100%
rename from xdocs/sources/xsltc/compiler_architecture.gif
rename to stylebook/sources/xsltc/compiler_architecture.gif
diff --git a/xdocs/sources/xsltc/compiler_design.gif b/stylebook/sources/xsltc/compiler_design.gif
similarity index 100%
rename from xdocs/sources/xsltc/compiler_design.gif
rename to stylebook/sources/xsltc/compiler_design.gif
diff --git a/xdocs/sources/xsltc/dom_namespace1.gif b/stylebook/sources/xsltc/dom_namespace1.gif
similarity index 100%
rename from xdocs/sources/xsltc/dom_namespace1.gif
rename to stylebook/sources/xsltc/dom_namespace1.gif
diff --git a/xdocs/sources/xsltc/dom_namespace2.gif b/stylebook/sources/xsltc/dom_namespace2.gif
similarity index 100%
rename from xdocs/sources/xsltc/dom_namespace2.gif
rename to stylebook/sources/xsltc/dom_namespace2.gif
diff --git a/xdocs/sources/xsltc/dom_namespace3.gif b/stylebook/sources/xsltc/dom_namespace3.gif
similarity index 100%
rename from xdocs/sources/xsltc/dom_namespace3.gif
rename to stylebook/sources/xsltc/dom_namespace3.gif
diff --git a/xdocs/sources/xsltc/index.xml b/stylebook/sources/xsltc/index.xml
similarity index 100%
rename from xdocs/sources/xsltc/index.xml
rename to stylebook/sources/xsltc/index.xml
diff --git a/xdocs/sources/xsltc/iterator_stack.gif b/stylebook/sources/xsltc/iterator_stack.gif
similarity index 100%
rename from xdocs/sources/xsltc/iterator_stack.gif
rename to stylebook/sources/xsltc/iterator_stack.gif
diff --git a/xdocs/sources/xsltc/key_relations.gif b/stylebook/sources/xsltc/key_relations.gif
similarity index 100%
rename from xdocs/sources/xsltc/key_relations.gif
rename to stylebook/sources/xsltc/key_relations.gif
diff --git a/xdocs/sources/xsltc/match_namespace1.gif b/stylebook/sources/xsltc/match_namespace1.gif
similarity index 100%
rename from xdocs/sources/xsltc/match_namespace1.gif
rename to stylebook/sources/xsltc/match_namespace1.gif
diff --git a/xdocs/sources/xsltc/match_namespace2.gif b/stylebook/sources/xsltc/match_namespace2.gif
similarity index 100%
rename from xdocs/sources/xsltc/match_namespace2.gif
rename to stylebook/sources/xsltc/match_namespace2.gif
diff --git a/xdocs/sources/xsltc/namespace_stack.gif b/stylebook/sources/xsltc/namespace_stack.gif
similarity index 100%
rename from xdocs/sources/xsltc/namespace_stack.gif
rename to stylebook/sources/xsltc/namespace_stack.gif
diff --git a/xdocs/sources/xsltc/output_namespaces1.gif b/stylebook/sources/xsltc/output_namespaces1.gif
similarity index 100%
rename from xdocs/sources/xsltc/output_namespaces1.gif
rename to stylebook/sources/xsltc/output_namespaces1.gif
diff --git a/xdocs/sources/xsltc/output_namespaces2.gif b/stylebook/sources/xsltc/output_namespaces2.gif
similarity index 100%
rename from xdocs/sources/xsltc/output_namespaces2.gif
rename to stylebook/sources/xsltc/output_namespaces2.gif
diff --git a/xdocs/sources/xsltc/output_settings.gif b/stylebook/sources/xsltc/output_settings.gif
similarity index 100%
rename from xdocs/sources/xsltc/output_settings.gif
rename to stylebook/sources/xsltc/output_settings.gif
diff --git a/xdocs/sources/xsltc/overall_design.gif b/stylebook/sources/xsltc/overall_design.gif
similarity index 100%
rename from xdocs/sources/xsltc/overall_design.gif
rename to stylebook/sources/xsltc/overall_design.gif
diff --git a/xdocs/sources/xsltc/pattern_objects.gif b/stylebook/sources/xsltc/pattern_objects.gif
similarity index 100%
rename from xdocs/sources/xsltc/pattern_objects.gif
rename to stylebook/sources/xsltc/pattern_objects.gif
diff --git a/xdocs/sources/xsltc/runtime_architecture.gif b/stylebook/sources/xsltc/runtime_architecture.gif
similarity index 100%
rename from xdocs/sources/xsltc/runtime_architecture.gif
rename to stylebook/sources/xsltc/runtime_architecture.gif
diff --git a/xdocs/sources/xsltc/runtime_design.gif b/stylebook/sources/xsltc/runtime_design.gif
similarity index 100%
rename from xdocs/sources/xsltc/runtime_design.gif
rename to stylebook/sources/xsltc/runtime_design.gif
diff --git a/xdocs/sources/xsltc/runtime_type_mapping.gif b/stylebook/sources/xsltc/runtime_type_mapping.gif
similarity index 100%
rename from xdocs/sources/xsltc/runtime_type_mapping.gif
rename to stylebook/sources/xsltc/runtime_type_mapping.gif
diff --git a/xdocs/sources/xsltc/sort_objects.gif b/stylebook/sources/xsltc/sort_objects.gif
similarity index 100%
rename from xdocs/sources/xsltc/sort_objects.gif
rename to stylebook/sources/xsltc/sort_objects.gif
diff --git a/xdocs/sources/xsltc/translet_wrapping.gif b/stylebook/sources/xsltc/translet_wrapping.gif
similarity index 100%
rename from xdocs/sources/xsltc/translet_wrapping.gif
rename to stylebook/sources/xsltc/translet_wrapping.gif
diff --git a/xdocs/sources/xsltc/trax_output_settings.gif b/stylebook/sources/xsltc/trax_output_settings.gif
similarity index 100%
rename from xdocs/sources/xsltc/trax_output_settings.gif
rename to stylebook/sources/xsltc/trax_output_settings.gif
diff --git a/xdocs/sources/xsltc/trax_translet_wrapping.gif b/stylebook/sources/xsltc/trax_translet_wrapping.gif
similarity index 100%
rename from xdocs/sources/xsltc/trax_translet_wrapping.gif
rename to stylebook/sources/xsltc/trax_translet_wrapping.gif
diff --git a/xdocs/sources/xsltc/type_mapping.gif b/stylebook/sources/xsltc/type_mapping.gif
similarity index 100%
rename from xdocs/sources/xsltc/type_mapping.gif
rename to stylebook/sources/xsltc/type_mapping.gif
diff --git a/xdocs/sources/xsltc/type_mappings.gif b/stylebook/sources/xsltc/type_mappings.gif
similarity index 100%
rename from xdocs/sources/xsltc/type_mappings.gif
rename to stylebook/sources/xsltc/type_mappings.gif
diff --git a/xdocs/sources/xsltc/typecast.gif b/stylebook/sources/xsltc/typecast.gif
similarity index 100%
rename from xdocs/sources/xsltc/typecast.gif
rename to stylebook/sources/xsltc/typecast.gif
diff --git a/xdocs/sources/xsltc/uri_resolver.gif b/stylebook/sources/xsltc/uri_resolver.gif
similarity index 100%
rename from xdocs/sources/xsltc/uri_resolver.gif
rename to stylebook/sources/xsltc/uri_resolver.gif
diff --git a/xdocs/sources/xsltc/xsl_choose_design.xml b/stylebook/sources/xsltc/xsl_choose_design.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsl_choose_design.xml
rename to stylebook/sources/xsltc/xsl_choose_design.xml
diff --git a/xdocs/sources/xsltc/xsl_comment_design.xml b/stylebook/sources/xsltc/xsl_comment_design.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsl_comment_design.xml
rename to stylebook/sources/xsltc/xsl_comment_design.xml
diff --git a/xdocs/sources/xsltc/xsl_if_design.xml b/stylebook/sources/xsltc/xsl_if_design.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsl_if_design.xml
rename to stylebook/sources/xsltc/xsl_if_design.xml
diff --git a/xdocs/sources/xsltc/xsl_include_design.xml b/stylebook/sources/xsltc/xsl_include_design.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsl_include_design.xml
rename to stylebook/sources/xsltc/xsl_include_design.xml
diff --git a/xdocs/sources/xsltc/xsl_key_design.xml b/stylebook/sources/xsltc/xsl_key_design.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsl_key_design.xml
rename to stylebook/sources/xsltc/xsl_key_design.xml
diff --git a/xdocs/sources/xsltc/xsl_lang_design.xml b/stylebook/sources/xsltc/xsl_lang_design.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsl_lang_design.xml
rename to stylebook/sources/xsltc/xsl_lang_design.xml
diff --git a/xdocs/sources/xsltc/xsl_sort_design.xml b/stylebook/sources/xsltc/xsl_sort_design.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsl_sort_design.xml
rename to stylebook/sources/xsltc/xsl_sort_design.xml
diff --git a/xdocs/sources/xsltc/xsl_unparsed_design.xml b/stylebook/sources/xsltc/xsl_unparsed_design.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsl_unparsed_design.xml
rename to stylebook/sources/xsltc/xsl_unparsed_design.xml
diff --git a/xdocs/sources/xsltc/xsl_variable_design.xml b/stylebook/sources/xsltc/xsl_variable_design.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsl_variable_design.xml
rename to stylebook/sources/xsltc/xsl_variable_design.xml
diff --git a/xdocs/sources/xsltc/xsl_whitespace_design.xml b/stylebook/sources/xsltc/xsl_whitespace_design.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsl_whitespace_design.xml
rename to stylebook/sources/xsltc/xsl_whitespace_design.xml
diff --git a/xdocs/sources/xsltc/xsltc_compiler.xml b/stylebook/sources/xsltc/xsltc_compiler.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsltc_compiler.xml
rename to stylebook/sources/xsltc/xsltc_compiler.xml
diff --git a/xdocs/sources/xsltc/xsltc_dom.xml b/stylebook/sources/xsltc/xsltc_dom.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsltc_dom.xml
rename to stylebook/sources/xsltc/xsltc_dom.xml
diff --git a/xdocs/sources/xsltc/xsltc_iterators.xml b/stylebook/sources/xsltc/xsltc_iterators.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsltc_iterators.xml
rename to stylebook/sources/xsltc/xsltc_iterators.xml
diff --git a/xdocs/sources/xsltc/xsltc_namespace.xml b/stylebook/sources/xsltc/xsltc_namespace.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsltc_namespace.xml
rename to stylebook/sources/xsltc/xsltc_namespace.xml
diff --git a/xdocs/sources/xsltc/xsltc_native_api.xml b/stylebook/sources/xsltc/xsltc_native_api.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsltc_native_api.xml
rename to stylebook/sources/xsltc/xsltc_native_api.xml
diff --git a/xdocs/sources/xsltc/xsltc_overview.xml b/stylebook/sources/xsltc/xsltc_overview.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsltc_overview.xml
rename to stylebook/sources/xsltc/xsltc_overview.xml
diff --git a/xdocs/sources/xsltc/xsltc_performance.xml b/stylebook/sources/xsltc/xsltc_performance.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsltc_performance.xml
rename to stylebook/sources/xsltc/xsltc_performance.xml
diff --git a/xdocs/sources/xsltc/xsltc_predicates.xml b/stylebook/sources/xsltc/xsltc_predicates.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsltc_predicates.xml
rename to stylebook/sources/xsltc/xsltc_predicates.xml
diff --git a/xdocs/sources/xsltc/xsltc_runtime.xml b/stylebook/sources/xsltc/xsltc_runtime.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsltc_runtime.xml
rename to stylebook/sources/xsltc/xsltc_runtime.xml
diff --git a/xdocs/sources/xsltc/xsltc_trax.xml b/stylebook/sources/xsltc/xsltc_trax.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsltc_trax.xml
rename to stylebook/sources/xsltc/xsltc_trax.xml
diff --git a/xdocs/sources/xsltc/xsltc_trax_api.xml b/stylebook/sources/xsltc/xsltc_trax_api.xml
similarity index 100%
rename from xdocs/sources/xsltc/xsltc_trax_api.xml
rename to stylebook/sources/xsltc/xsltc_trax_api.xml
diff --git a/xdocs/style/dtd/spec.dtd b/stylebook/style/dtd/spec.dtd
similarity index 100%
rename from xdocs/style/dtd/spec.dtd
rename to stylebook/style/dtd/spec.dtd
diff --git a/xdocs/style/dtd/xsl-html40s.dtd b/stylebook/style/dtd/xsl-html40s.dtd
similarity index 100%
rename from xdocs/style/dtd/xsl-html40s.dtd
rename to stylebook/style/dtd/xsl-html40s.dtd
diff --git a/xdocs/style/loaderdesign.xml b/stylebook/style/loaderdesign.xml
similarity index 100%
rename from xdocs/style/loaderdesign.xml
rename to stylebook/style/loaderdesign.xml
diff --git a/xdocs/style/stylesheets/design2project.xsl b/stylebook/style/stylesheets/design2project.xsl
similarity index 100%
rename from xdocs/style/stylesheets/design2project.xsl
rename to stylebook/style/stylesheets/design2project.xsl
diff --git a/xdocs/style/stylesheets/designdoc2html.xsl b/stylebook/style/stylesheets/designdoc2html.xsl
similarity index 100%
rename from xdocs/style/stylesheets/designdoc2html.xsl
rename to stylebook/style/stylesheets/designdoc2html.xsl
diff --git a/xdocs/style/stylesheets/done.xsl b/stylebook/style/stylesheets/done.xsl
similarity index 100%
rename from xdocs/style/stylesheets/done.xsl
rename to stylebook/style/stylesheets/done.xsl
diff --git a/xdocs/style/stylesheets/spec.xsl b/stylebook/style/stylesheets/spec.xsl
similarity index 100%
rename from xdocs/style/stylesheets/spec.xsl
rename to stylebook/style/stylesheets/spec.xsl
diff --git a/xdocs/style/stylesheets/xml2fo.xsl b/stylebook/style/stylesheets/xml2fo.xsl
similarity index 100%
rename from xdocs/style/stylesheets/xml2fo.xsl
rename to stylebook/style/stylesheets/xml2fo.xsl
diff --git a/tools/stylebook-1.0-b3_xalan-2.jar b/stylebook/stylebook-1.0-b3_xalan-2.jar
similarity index 100%
rename from tools/stylebook-1.0-b3_xalan-2.jar
rename to stylebook/stylebook-1.0-b3_xalan-2.jar
diff --git a/xdocs/xml-site-style.tar.gz b/stylebook/xml-site-style.tar.gz
similarity index 100%
rename from xdocs/xml-site-style.tar.gz
rename to stylebook/xml-site-style.tar.gz
diff --git a/src/MANIFEST.MF b/xalan/src/main/java/MANIFEST.MF
similarity index 100%
rename from src/MANIFEST.MF
rename to xalan/src/main/java/MANIFEST.MF
diff --git a/src/META-INF/services/javax.xml.transform.TransformerFactory b/xalan/src/main/java/META-INF/services/javax.xml.transform.TransformerFactory
similarity index 100%
rename from src/META-INF/services/javax.xml.transform.TransformerFactory
rename to xalan/src/main/java/META-INF/services/javax.xml.transform.TransformerFactory
diff --git a/src/META-INF/services/javax.xml.xpath.XPathFactory b/xalan/src/main/java/META-INF/services/javax.xml.xpath.XPathFactory
similarity index 100%
rename from src/META-INF/services/javax.xml.xpath.XPathFactory
rename to xalan/src/main/java/META-INF/services/javax.xml.xpath.XPathFactory
diff --git a/src/META-INF/services/org.apache.xalan.extensions.bsf.BSFManager b/xalan/src/main/java/META-INF/services/org.apache.xalan.extensions.bsf.BSFManager
similarity index 100%
rename from src/META-INF/services/org.apache.xalan.extensions.bsf.BSFManager
rename to xalan/src/main/java/META-INF/services/org.apache.xalan.extensions.bsf.BSFManager
diff --git a/src/META-INF/services/org.apache.xml.dtm.DTMManager b/xalan/src/main/java/META-INF/services/org.apache.xml.dtm.DTMManager
similarity index 100%
rename from src/META-INF/services/org.apache.xml.dtm.DTMManager
rename to xalan/src/main/java/META-INF/services/org.apache.xml.dtm.DTMManager
diff --git a/src/manifest.xalan-interpretive b/xalan/src/main/java/manifest.xalan-interpretive
similarity index 100%
rename from src/manifest.xalan-interpretive
rename to xalan/src/main/java/manifest.xalan-interpretive
diff --git a/src/manifest.xsltc b/xalan/src/main/java/manifest.xsltc
similarity index 100%
rename from src/manifest.xsltc
rename to xalan/src/main/java/manifest.xsltc
diff --git a/src/org/apache/xalan/Version.src b/xalan/src/main/java/org/apache/xalan/Version.src
similarity index 100%
rename from src/org/apache/xalan/Version.src
rename to xalan/src/main/java/org/apache/xalan/Version.src
diff --git a/src/org/apache/xalan/client/XSLTProcessorApplet.java b/xalan/src/main/java/org/apache/xalan/client/XSLTProcessorApplet.java
similarity index 100%
rename from src/org/apache/xalan/client/XSLTProcessorApplet.java
rename to xalan/src/main/java/org/apache/xalan/client/XSLTProcessorApplet.java
diff --git a/src/org/apache/xalan/client/package.html b/xalan/src/main/java/org/apache/xalan/client/package.html
similarity index 100%
rename from src/org/apache/xalan/client/package.html
rename to xalan/src/main/java/org/apache/xalan/client/package.html
diff --git a/src/org/apache/xalan/extensions/ExpressionContext.java b/xalan/src/main/java/org/apache/xalan/extensions/ExpressionContext.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ExpressionContext.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ExpressionContext.java
diff --git a/src/org/apache/xalan/extensions/ExpressionVisitor.java b/xalan/src/main/java/org/apache/xalan/extensions/ExpressionVisitor.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ExpressionVisitor.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ExpressionVisitor.java
diff --git a/src/org/apache/xalan/extensions/ExtensionHandler.java b/xalan/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ExtensionHandler.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java
diff --git a/src/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java b/xalan/src/main/java/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ExtensionHandlerExsltFunction.java
diff --git a/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java b/xalan/src/main/java/org/apache/xalan/extensions/ExtensionHandlerGeneral.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ExtensionHandlerGeneral.java
diff --git a/src/org/apache/xalan/extensions/ExtensionHandlerJava.java b/xalan/src/main/java/org/apache/xalan/extensions/ExtensionHandlerJava.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ExtensionHandlerJava.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ExtensionHandlerJava.java
diff --git a/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java b/xalan/src/main/java/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java
diff --git a/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java b/xalan/src/main/java/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java
diff --git a/src/org/apache/xalan/extensions/ExtensionNamespaceContext.java b/xalan/src/main/java/org/apache/xalan/extensions/ExtensionNamespaceContext.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ExtensionNamespaceContext.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ExtensionNamespaceContext.java
diff --git a/src/org/apache/xalan/extensions/ExtensionNamespaceSupport.java b/xalan/src/main/java/org/apache/xalan/extensions/ExtensionNamespaceSupport.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ExtensionNamespaceSupport.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ExtensionNamespaceSupport.java
diff --git a/src/org/apache/xalan/extensions/ExtensionNamespacesManager.java b/xalan/src/main/java/org/apache/xalan/extensions/ExtensionNamespacesManager.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ExtensionNamespacesManager.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ExtensionNamespacesManager.java
diff --git a/src/org/apache/xalan/extensions/ExtensionsTable.java b/xalan/src/main/java/org/apache/xalan/extensions/ExtensionsTable.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ExtensionsTable.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ExtensionsTable.java
diff --git a/src/org/apache/xalan/extensions/MethodResolver.java b/xalan/src/main/java/org/apache/xalan/extensions/MethodResolver.java
similarity index 100%
rename from src/org/apache/xalan/extensions/MethodResolver.java
rename to xalan/src/main/java/org/apache/xalan/extensions/MethodResolver.java
diff --git a/src/org/apache/xalan/extensions/ObjectFactory.java b/xalan/src/main/java/org/apache/xalan/extensions/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xalan/extensions/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xalan/extensions/ObjectFactory.java
diff --git a/src/org/apache/xalan/extensions/SecuritySupport.java b/xalan/src/main/java/org/apache/xalan/extensions/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xalan/extensions/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xalan/extensions/SecuritySupport.java
diff --git a/src/org/apache/xalan/extensions/XPathFunctionImpl.java b/xalan/src/main/java/org/apache/xalan/extensions/XPathFunctionImpl.java
similarity index 100%
rename from src/org/apache/xalan/extensions/XPathFunctionImpl.java
rename to xalan/src/main/java/org/apache/xalan/extensions/XPathFunctionImpl.java
diff --git a/src/org/apache/xalan/extensions/XPathFunctionResolverImpl.java b/xalan/src/main/java/org/apache/xalan/extensions/XPathFunctionResolverImpl.java
similarity index 100%
rename from src/org/apache/xalan/extensions/XPathFunctionResolverImpl.java
rename to xalan/src/main/java/org/apache/xalan/extensions/XPathFunctionResolverImpl.java
diff --git a/src/org/apache/xalan/extensions/XSLProcessorContext.java b/xalan/src/main/java/org/apache/xalan/extensions/XSLProcessorContext.java
similarity index 100%
rename from src/org/apache/xalan/extensions/XSLProcessorContext.java
rename to xalan/src/main/java/org/apache/xalan/extensions/XSLProcessorContext.java
diff --git a/src/org/apache/xalan/extensions/package.html b/xalan/src/main/java/org/apache/xalan/extensions/package.html
similarity index 100%
rename from src/org/apache/xalan/extensions/package.html
rename to xalan/src/main/java/org/apache/xalan/extensions/package.html
diff --git a/src/org/apache/xalan/lib/ExsltBase.java b/xalan/src/main/java/org/apache/xalan/lib/ExsltBase.java
similarity index 100%
rename from src/org/apache/xalan/lib/ExsltBase.java
rename to xalan/src/main/java/org/apache/xalan/lib/ExsltBase.java
diff --git a/src/org/apache/xalan/lib/ExsltCommon.java b/xalan/src/main/java/org/apache/xalan/lib/ExsltCommon.java
similarity index 100%
rename from src/org/apache/xalan/lib/ExsltCommon.java
rename to xalan/src/main/java/org/apache/xalan/lib/ExsltCommon.java
diff --git a/src/org/apache/xalan/lib/ExsltDatetime.java b/xalan/src/main/java/org/apache/xalan/lib/ExsltDatetime.java
similarity index 100%
rename from src/org/apache/xalan/lib/ExsltDatetime.java
rename to xalan/src/main/java/org/apache/xalan/lib/ExsltDatetime.java
diff --git a/src/org/apache/xalan/lib/ExsltDynamic.java b/xalan/src/main/java/org/apache/xalan/lib/ExsltDynamic.java
similarity index 100%
rename from src/org/apache/xalan/lib/ExsltDynamic.java
rename to xalan/src/main/java/org/apache/xalan/lib/ExsltDynamic.java
diff --git a/src/org/apache/xalan/lib/ExsltMath.java b/xalan/src/main/java/org/apache/xalan/lib/ExsltMath.java
similarity index 100%
rename from src/org/apache/xalan/lib/ExsltMath.java
rename to xalan/src/main/java/org/apache/xalan/lib/ExsltMath.java
diff --git a/src/org/apache/xalan/lib/ExsltSets.java b/xalan/src/main/java/org/apache/xalan/lib/ExsltSets.java
similarity index 100%
rename from src/org/apache/xalan/lib/ExsltSets.java
rename to xalan/src/main/java/org/apache/xalan/lib/ExsltSets.java
diff --git a/src/org/apache/xalan/lib/ExsltStrings.java b/xalan/src/main/java/org/apache/xalan/lib/ExsltStrings.java
similarity index 100%
rename from src/org/apache/xalan/lib/ExsltStrings.java
rename to xalan/src/main/java/org/apache/xalan/lib/ExsltStrings.java
diff --git a/src/org/apache/xalan/lib/Extensions.java b/xalan/src/main/java/org/apache/xalan/lib/Extensions.java
similarity index 100%
rename from src/org/apache/xalan/lib/Extensions.java
rename to xalan/src/main/java/org/apache/xalan/lib/Extensions.java
diff --git a/src/org/apache/xalan/lib/NodeInfo.java b/xalan/src/main/java/org/apache/xalan/lib/NodeInfo.java
similarity index 100%
rename from src/org/apache/xalan/lib/NodeInfo.java
rename to xalan/src/main/java/org/apache/xalan/lib/NodeInfo.java
diff --git a/src/org/apache/xalan/lib/ObjectFactory.java b/xalan/src/main/java/org/apache/xalan/lib/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xalan/lib/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xalan/lib/ObjectFactory.java
diff --git a/src/org/apache/xalan/lib/PipeDocument.java b/xalan/src/main/java/org/apache/xalan/lib/PipeDocument.java
similarity index 100%
rename from src/org/apache/xalan/lib/PipeDocument.java
rename to xalan/src/main/java/org/apache/xalan/lib/PipeDocument.java
diff --git a/src/org/apache/xalan/lib/Redirect.java b/xalan/src/main/java/org/apache/xalan/lib/Redirect.java
similarity index 100%
rename from src/org/apache/xalan/lib/Redirect.java
rename to xalan/src/main/java/org/apache/xalan/lib/Redirect.java
diff --git a/src/org/apache/xalan/lib/SecuritySupport.java b/xalan/src/main/java/org/apache/xalan/lib/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xalan/lib/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xalan/lib/SecuritySupport.java
diff --git a/src/org/apache/xalan/lib/package.html b/xalan/src/main/java/org/apache/xalan/lib/package.html
similarity index 100%
rename from src/org/apache/xalan/lib/package.html
rename to xalan/src/main/java/org/apache/xalan/lib/package.html
diff --git a/src/org/apache/xalan/lib/sql/ConnectionPool.java b/xalan/src/main/java/org/apache/xalan/lib/sql/ConnectionPool.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/ConnectionPool.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/ConnectionPool.java
diff --git a/src/org/apache/xalan/lib/sql/ConnectionPoolManager.java b/xalan/src/main/java/org/apache/xalan/lib/sql/ConnectionPoolManager.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/ConnectionPoolManager.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/ConnectionPoolManager.java
diff --git a/src/org/apache/xalan/lib/sql/DTMDocument.java b/xalan/src/main/java/org/apache/xalan/lib/sql/DTMDocument.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/DTMDocument.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/DTMDocument.java
diff --git a/src/org/apache/xalan/lib/sql/DefaultConnectionPool.java b/xalan/src/main/java/org/apache/xalan/lib/sql/DefaultConnectionPool.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/DefaultConnectionPool.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/DefaultConnectionPool.java
diff --git a/src/org/apache/xalan/lib/sql/JNDIConnectionPool.java b/xalan/src/main/java/org/apache/xalan/lib/sql/JNDIConnectionPool.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/JNDIConnectionPool.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/JNDIConnectionPool.java
diff --git a/src/org/apache/xalan/lib/sql/ObjectArray.java b/xalan/src/main/java/org/apache/xalan/lib/sql/ObjectArray.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/ObjectArray.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/ObjectArray.java
diff --git a/src/org/apache/xalan/lib/sql/ObjectFactory.java b/xalan/src/main/java/org/apache/xalan/lib/sql/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/ObjectFactory.java
diff --git a/src/org/apache/xalan/lib/sql/PooledConnection.java b/xalan/src/main/java/org/apache/xalan/lib/sql/PooledConnection.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/PooledConnection.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/PooledConnection.java
diff --git a/src/org/apache/xalan/lib/sql/QueryParameter.java b/xalan/src/main/java/org/apache/xalan/lib/sql/QueryParameter.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/QueryParameter.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/QueryParameter.java
diff --git a/src/org/apache/xalan/lib/sql/SQLDocument.java b/xalan/src/main/java/org/apache/xalan/lib/sql/SQLDocument.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/SQLDocument.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/SQLDocument.java
diff --git a/src/org/apache/xalan/lib/sql/SQLErrorDocument.java b/xalan/src/main/java/org/apache/xalan/lib/sql/SQLErrorDocument.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/SQLErrorDocument.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/SQLErrorDocument.java
diff --git a/src/org/apache/xalan/lib/sql/SQLQueryParser.java b/xalan/src/main/java/org/apache/xalan/lib/sql/SQLQueryParser.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/SQLQueryParser.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/SQLQueryParser.java
diff --git a/src/org/apache/xalan/lib/sql/SecuritySupport.java b/xalan/src/main/java/org/apache/xalan/lib/sql/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/SecuritySupport.java
diff --git a/src/org/apache/xalan/lib/sql/XConnection.java b/xalan/src/main/java/org/apache/xalan/lib/sql/XConnection.java
similarity index 100%
rename from src/org/apache/xalan/lib/sql/XConnection.java
rename to xalan/src/main/java/org/apache/xalan/lib/sql/XConnection.java
diff --git a/src/org/apache/xalan/lib/sql/package.html b/xalan/src/main/java/org/apache/xalan/lib/sql/package.html
similarity index 100%
rename from src/org/apache/xalan/lib/sql/package.html
rename to xalan/src/main/java/org/apache/xalan/lib/sql/package.html
diff --git a/src/org/apache/xalan/processor/ProcessorAttributeSet.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorAttributeSet.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorAttributeSet.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorAttributeSet.java
diff --git a/src/org/apache/xalan/processor/ProcessorCharacters.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorCharacters.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorCharacters.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorCharacters.java
diff --git a/src/org/apache/xalan/processor/ProcessorDecimalFormat.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorDecimalFormat.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorDecimalFormat.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorDecimalFormat.java
diff --git a/src/org/apache/xalan/processor/ProcessorExsltFuncResult.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorExsltFuncResult.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorExsltFuncResult.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorExsltFuncResult.java
diff --git a/src/org/apache/xalan/processor/ProcessorExsltFunction.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorExsltFunction.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java
diff --git a/src/org/apache/xalan/processor/ProcessorGlobalParamDecl.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorGlobalParamDecl.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorGlobalParamDecl.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorGlobalParamDecl.java
diff --git a/src/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java
diff --git a/src/org/apache/xalan/processor/ProcessorImport.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorImport.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorImport.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorImport.java
diff --git a/src/org/apache/xalan/processor/ProcessorInclude.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorInclude.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorInclude.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorInclude.java
diff --git a/src/org/apache/xalan/processor/ProcessorKey.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorKey.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorKey.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorKey.java
diff --git a/src/org/apache/xalan/processor/ProcessorLRE.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorLRE.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
diff --git a/src/org/apache/xalan/processor/ProcessorNamespaceAlias.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorNamespaceAlias.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
diff --git a/src/org/apache/xalan/processor/ProcessorOutputElem.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorOutputElem.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorOutputElem.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorOutputElem.java
diff --git a/src/org/apache/xalan/processor/ProcessorPreserveSpace.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorPreserveSpace.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java
diff --git a/src/org/apache/xalan/processor/ProcessorStripSpace.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorStripSpace.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
diff --git a/src/org/apache/xalan/processor/ProcessorStylesheetDoc.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorStylesheetDoc.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorStylesheetDoc.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorStylesheetDoc.java
diff --git a/src/org/apache/xalan/processor/ProcessorStylesheetElement.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorStylesheetElement.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java
diff --git a/src/org/apache/xalan/processor/ProcessorTemplate.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorTemplate.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorTemplate.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorTemplate.java
diff --git a/src/org/apache/xalan/processor/ProcessorTemplateElem.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorTemplateElem.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorTemplateElem.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorTemplateElem.java
diff --git a/src/org/apache/xalan/processor/ProcessorText.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorText.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorText.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorText.java
diff --git a/src/org/apache/xalan/processor/ProcessorUnknown.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorUnknown.java
similarity index 100%
rename from src/org/apache/xalan/processor/ProcessorUnknown.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorUnknown.java
diff --git a/src/org/apache/xalan/processor/StylesheetHandler.java b/xalan/src/main/java/org/apache/xalan/processor/StylesheetHandler.java
similarity index 100%
rename from src/org/apache/xalan/processor/StylesheetHandler.java
rename to xalan/src/main/java/org/apache/xalan/processor/StylesheetHandler.java
diff --git a/src/org/apache/xalan/processor/TransformerFactoryImpl.java b/xalan/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
similarity index 100%
rename from src/org/apache/xalan/processor/TransformerFactoryImpl.java
rename to xalan/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
diff --git a/src/org/apache/xalan/processor/WhitespaceInfoPaths.java b/xalan/src/main/java/org/apache/xalan/processor/WhitespaceInfoPaths.java
similarity index 100%
rename from src/org/apache/xalan/processor/WhitespaceInfoPaths.java
rename to xalan/src/main/java/org/apache/xalan/processor/WhitespaceInfoPaths.java
diff --git a/src/org/apache/xalan/processor/XSLProcessorVersion.src b/xalan/src/main/java/org/apache/xalan/processor/XSLProcessorVersion.src
similarity index 100%
rename from src/org/apache/xalan/processor/XSLProcessorVersion.src
rename to xalan/src/main/java/org/apache/xalan/processor/XSLProcessorVersion.src
diff --git a/src/org/apache/xalan/processor/XSLTAttributeDef.java b/xalan/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java
similarity index 100%
rename from src/org/apache/xalan/processor/XSLTAttributeDef.java
rename to xalan/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java
diff --git a/src/org/apache/xalan/processor/XSLTElementDef.java b/xalan/src/main/java/org/apache/xalan/processor/XSLTElementDef.java
similarity index 100%
rename from src/org/apache/xalan/processor/XSLTElementDef.java
rename to xalan/src/main/java/org/apache/xalan/processor/XSLTElementDef.java
diff --git a/src/org/apache/xalan/processor/XSLTElementProcessor.java b/xalan/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
similarity index 100%
rename from src/org/apache/xalan/processor/XSLTElementProcessor.java
rename to xalan/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
diff --git a/src/org/apache/xalan/processor/XSLTSchema.java b/xalan/src/main/java/org/apache/xalan/processor/XSLTSchema.java
similarity index 100%
rename from src/org/apache/xalan/processor/XSLTSchema.java
rename to xalan/src/main/java/org/apache/xalan/processor/XSLTSchema.java
diff --git a/src/org/apache/xalan/processor/package.html b/xalan/src/main/java/org/apache/xalan/processor/package.html
similarity index 100%
rename from src/org/apache/xalan/processor/package.html
rename to xalan/src/main/java/org/apache/xalan/processor/package.html
diff --git a/src/org/apache/xalan/res/XSLMessages.java b/xalan/src/main/java/org/apache/xalan/res/XSLMessages.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLMessages.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLMessages.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_ca.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ca.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_ca.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ca.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_cs.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_cs.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_cs.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_cs.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_de.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_de.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_de.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_de.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_en.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_en.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_en.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_en.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_es.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_es.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_es.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_es.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_fr.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_fr.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_fr.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_fr.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_hu.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_hu.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_hu.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_hu.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_it.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_it.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_it.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_it.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_ja.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ja.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_ja.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ja.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_ko.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ko.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_ko.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ko.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_pl.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pl.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_pl.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pl.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_pt_BR.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pt_BR.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_pt_BR.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pt_BR.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_ru.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ru.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_ru.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ru.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_sk.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sk.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_sk.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sk.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_sl.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sl.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_sl.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sl.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_sv.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sv.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_sv.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sv.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_tr.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_tr.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_tr.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_tr.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_zh.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_zh.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_zh_CN.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh_CN.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_zh_CN.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh_CN.java
diff --git a/src/org/apache/xalan/res/XSLTErrorResources_zh_TW.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh_TW.java
similarity index 100%
rename from src/org/apache/xalan/res/XSLTErrorResources_zh_TW.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh_TW.java
diff --git a/src/org/apache/xalan/res/package.html b/xalan/src/main/java/org/apache/xalan/res/package.html
similarity index 100%
rename from src/org/apache/xalan/res/package.html
rename to xalan/src/main/java/org/apache/xalan/res/package.html
diff --git a/src/org/apache/xalan/serialize/DOMSerializer.java b/xalan/src/main/java/org/apache/xalan/serialize/DOMSerializer.java
similarity index 100%
rename from src/org/apache/xalan/serialize/DOMSerializer.java
rename to xalan/src/main/java/org/apache/xalan/serialize/DOMSerializer.java
diff --git a/src/org/apache/xalan/serialize/Serializer.java b/xalan/src/main/java/org/apache/xalan/serialize/Serializer.java
similarity index 100%
rename from src/org/apache/xalan/serialize/Serializer.java
rename to xalan/src/main/java/org/apache/xalan/serialize/Serializer.java
diff --git a/src/org/apache/xalan/serialize/SerializerFactory.java b/xalan/src/main/java/org/apache/xalan/serialize/SerializerFactory.java
similarity index 100%
rename from src/org/apache/xalan/serialize/SerializerFactory.java
rename to xalan/src/main/java/org/apache/xalan/serialize/SerializerFactory.java
diff --git a/src/org/apache/xalan/serialize/SerializerUtils.java b/xalan/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
similarity index 100%
rename from src/org/apache/xalan/serialize/SerializerUtils.java
rename to xalan/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
diff --git a/src/org/apache/xalan/templates/AVT.java b/xalan/src/main/java/org/apache/xalan/templates/AVT.java
similarity index 100%
rename from src/org/apache/xalan/templates/AVT.java
rename to xalan/src/main/java/org/apache/xalan/templates/AVT.java
diff --git a/src/org/apache/xalan/templates/AVTPart.java b/xalan/src/main/java/org/apache/xalan/templates/AVTPart.java
similarity index 100%
rename from src/org/apache/xalan/templates/AVTPart.java
rename to xalan/src/main/java/org/apache/xalan/templates/AVTPart.java
diff --git a/src/org/apache/xalan/templates/AVTPartSimple.java b/xalan/src/main/java/org/apache/xalan/templates/AVTPartSimple.java
similarity index 100%
rename from src/org/apache/xalan/templates/AVTPartSimple.java
rename to xalan/src/main/java/org/apache/xalan/templates/AVTPartSimple.java
diff --git a/src/org/apache/xalan/templates/AVTPartXPath.java b/xalan/src/main/java/org/apache/xalan/templates/AVTPartXPath.java
similarity index 100%
rename from src/org/apache/xalan/templates/AVTPartXPath.java
rename to xalan/src/main/java/org/apache/xalan/templates/AVTPartXPath.java
diff --git a/src/org/apache/xalan/templates/AbsPathChecker.java b/xalan/src/main/java/org/apache/xalan/templates/AbsPathChecker.java
similarity index 100%
rename from src/org/apache/xalan/templates/AbsPathChecker.java
rename to xalan/src/main/java/org/apache/xalan/templates/AbsPathChecker.java
diff --git a/src/org/apache/xalan/templates/Constants.java b/xalan/src/main/java/org/apache/xalan/templates/Constants.java
similarity index 100%
rename from src/org/apache/xalan/templates/Constants.java
rename to xalan/src/main/java/org/apache/xalan/templates/Constants.java
diff --git a/src/org/apache/xalan/templates/DecimalFormatProperties.java b/xalan/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java
similarity index 100%
rename from src/org/apache/xalan/templates/DecimalFormatProperties.java
rename to xalan/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java
diff --git a/src/org/apache/xalan/templates/ElemApplyImport.java b/xalan/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemApplyImport.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
diff --git a/src/org/apache/xalan/templates/ElemApplyTemplates.java b/xalan/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemApplyTemplates.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
diff --git a/src/org/apache/xalan/templates/ElemAttribute.java b/xalan/src/main/java/org/apache/xalan/templates/ElemAttribute.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemAttribute.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemAttribute.java
diff --git a/src/org/apache/xalan/templates/ElemAttributeSet.java b/xalan/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemAttributeSet.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
diff --git a/src/org/apache/xalan/templates/ElemCallTemplate.java b/xalan/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemCallTemplate.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
diff --git a/src/org/apache/xalan/templates/ElemChoose.java b/xalan/src/main/java/org/apache/xalan/templates/ElemChoose.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemChoose.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemChoose.java
diff --git a/src/org/apache/xalan/templates/ElemComment.java b/xalan/src/main/java/org/apache/xalan/templates/ElemComment.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemComment.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemComment.java
diff --git a/src/org/apache/xalan/templates/ElemCopy.java b/xalan/src/main/java/org/apache/xalan/templates/ElemCopy.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemCopy.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemCopy.java
diff --git a/src/org/apache/xalan/templates/ElemCopyOf.java b/xalan/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemCopyOf.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
diff --git a/src/org/apache/xalan/templates/ElemElement.java b/xalan/src/main/java/org/apache/xalan/templates/ElemElement.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemElement.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemElement.java
diff --git a/src/org/apache/xalan/templates/ElemEmpty.java b/xalan/src/main/java/org/apache/xalan/templates/ElemEmpty.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemEmpty.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemEmpty.java
diff --git a/src/org/apache/xalan/templates/ElemExsltFuncResult.java b/xalan/src/main/java/org/apache/xalan/templates/ElemExsltFuncResult.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemExsltFuncResult.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemExsltFuncResult.java
diff --git a/src/org/apache/xalan/templates/ElemExsltFunction.java b/xalan/src/main/java/org/apache/xalan/templates/ElemExsltFunction.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemExsltFunction.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemExsltFunction.java
diff --git a/src/org/apache/xalan/templates/ElemExtensionCall.java b/xalan/src/main/java/org/apache/xalan/templates/ElemExtensionCall.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemExtensionCall.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemExtensionCall.java
diff --git a/src/org/apache/xalan/templates/ElemExtensionDecl.java b/xalan/src/main/java/org/apache/xalan/templates/ElemExtensionDecl.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemExtensionDecl.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemExtensionDecl.java
diff --git a/src/org/apache/xalan/templates/ElemExtensionScript.java b/xalan/src/main/java/org/apache/xalan/templates/ElemExtensionScript.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemExtensionScript.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemExtensionScript.java
diff --git a/src/org/apache/xalan/templates/ElemFallback.java b/xalan/src/main/java/org/apache/xalan/templates/ElemFallback.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemFallback.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemFallback.java
diff --git a/src/org/apache/xalan/templates/ElemForEach.java b/xalan/src/main/java/org/apache/xalan/templates/ElemForEach.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemForEach.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemForEach.java
diff --git a/src/org/apache/xalan/templates/ElemIf.java b/xalan/src/main/java/org/apache/xalan/templates/ElemIf.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemIf.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemIf.java
diff --git a/src/org/apache/xalan/templates/ElemLiteralResult.java b/xalan/src/main/java/org/apache/xalan/templates/ElemLiteralResult.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemLiteralResult.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemLiteralResult.java
diff --git a/src/org/apache/xalan/templates/ElemMessage.java b/xalan/src/main/java/org/apache/xalan/templates/ElemMessage.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemMessage.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemMessage.java
diff --git a/src/org/apache/xalan/templates/ElemNumber.java b/xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemNumber.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java
diff --git a/src/org/apache/xalan/templates/ElemOtherwise.java b/xalan/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemOtherwise.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
diff --git a/src/org/apache/xalan/templates/ElemPI.java b/xalan/src/main/java/org/apache/xalan/templates/ElemPI.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemPI.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemPI.java
diff --git a/src/org/apache/xalan/templates/ElemParam.java b/xalan/src/main/java/org/apache/xalan/templates/ElemParam.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemParam.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemParam.java
diff --git a/src/org/apache/xalan/templates/ElemSort.java b/xalan/src/main/java/org/apache/xalan/templates/ElemSort.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemSort.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemSort.java
diff --git a/src/org/apache/xalan/templates/ElemTemplate.java b/xalan/src/main/java/org/apache/xalan/templates/ElemTemplate.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemTemplate.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemTemplate.java
diff --git a/src/org/apache/xalan/templates/ElemTemplateElement.java b/xalan/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemTemplateElement.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
diff --git a/src/org/apache/xalan/templates/ElemText.java b/xalan/src/main/java/org/apache/xalan/templates/ElemText.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemText.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemText.java
diff --git a/src/org/apache/xalan/templates/ElemTextLiteral.java b/xalan/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemTextLiteral.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
diff --git a/src/org/apache/xalan/templates/ElemUnknown.java b/xalan/src/main/java/org/apache/xalan/templates/ElemUnknown.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemUnknown.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemUnknown.java
diff --git a/src/org/apache/xalan/templates/ElemUse.java b/xalan/src/main/java/org/apache/xalan/templates/ElemUse.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemUse.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemUse.java
diff --git a/src/org/apache/xalan/templates/ElemValueOf.java b/xalan/src/main/java/org/apache/xalan/templates/ElemValueOf.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemValueOf.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemValueOf.java
diff --git a/src/org/apache/xalan/templates/ElemVariable.java b/xalan/src/main/java/org/apache/xalan/templates/ElemVariable.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemVariable.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemVariable.java
diff --git a/src/org/apache/xalan/templates/ElemVariablePsuedo.java b/xalan/src/main/java/org/apache/xalan/templates/ElemVariablePsuedo.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemVariablePsuedo.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemVariablePsuedo.java
diff --git a/src/org/apache/xalan/templates/ElemWhen.java b/xalan/src/main/java/org/apache/xalan/templates/ElemWhen.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemWhen.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemWhen.java
diff --git a/src/org/apache/xalan/templates/ElemWithParam.java b/xalan/src/main/java/org/apache/xalan/templates/ElemWithParam.java
similarity index 100%
rename from src/org/apache/xalan/templates/ElemWithParam.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemWithParam.java
diff --git a/src/org/apache/xalan/templates/FuncDocument.java b/xalan/src/main/java/org/apache/xalan/templates/FuncDocument.java
similarity index 100%
rename from src/org/apache/xalan/templates/FuncDocument.java
rename to xalan/src/main/java/org/apache/xalan/templates/FuncDocument.java
diff --git a/src/org/apache/xalan/templates/FuncFormatNumb.java b/xalan/src/main/java/org/apache/xalan/templates/FuncFormatNumb.java
similarity index 100%
rename from src/org/apache/xalan/templates/FuncFormatNumb.java
rename to xalan/src/main/java/org/apache/xalan/templates/FuncFormatNumb.java
diff --git a/src/org/apache/xalan/templates/FuncKey.java b/xalan/src/main/java/org/apache/xalan/templates/FuncKey.java
similarity index 100%
rename from src/org/apache/xalan/templates/FuncKey.java
rename to xalan/src/main/java/org/apache/xalan/templates/FuncKey.java
diff --git a/src/org/apache/xalan/templates/KeyDeclaration.java b/xalan/src/main/java/org/apache/xalan/templates/KeyDeclaration.java
similarity index 100%
rename from src/org/apache/xalan/templates/KeyDeclaration.java
rename to xalan/src/main/java/org/apache/xalan/templates/KeyDeclaration.java
diff --git a/src/org/apache/xalan/templates/NamespaceAlias.java b/xalan/src/main/java/org/apache/xalan/templates/NamespaceAlias.java
similarity index 100%
rename from src/org/apache/xalan/templates/NamespaceAlias.java
rename to xalan/src/main/java/org/apache/xalan/templates/NamespaceAlias.java
diff --git a/src/org/apache/xalan/templates/OutputProperties.java b/xalan/src/main/java/org/apache/xalan/templates/OutputProperties.java
similarity index 100%
rename from src/org/apache/xalan/templates/OutputProperties.java
rename to xalan/src/main/java/org/apache/xalan/templates/OutputProperties.java
diff --git a/src/org/apache/xalan/templates/RedundentExprEliminator.java b/xalan/src/main/java/org/apache/xalan/templates/RedundentExprEliminator.java
similarity index 100%
rename from src/org/apache/xalan/templates/RedundentExprEliminator.java
rename to xalan/src/main/java/org/apache/xalan/templates/RedundentExprEliminator.java
diff --git a/src/org/apache/xalan/templates/Stylesheet.java b/xalan/src/main/java/org/apache/xalan/templates/Stylesheet.java
similarity index 100%
rename from src/org/apache/xalan/templates/Stylesheet.java
rename to xalan/src/main/java/org/apache/xalan/templates/Stylesheet.java
diff --git a/src/org/apache/xalan/templates/StylesheetComposed.java b/xalan/src/main/java/org/apache/xalan/templates/StylesheetComposed.java
similarity index 100%
rename from src/org/apache/xalan/templates/StylesheetComposed.java
rename to xalan/src/main/java/org/apache/xalan/templates/StylesheetComposed.java
diff --git a/src/org/apache/xalan/templates/StylesheetRoot.java b/xalan/src/main/java/org/apache/xalan/templates/StylesheetRoot.java
similarity index 100%
rename from src/org/apache/xalan/templates/StylesheetRoot.java
rename to xalan/src/main/java/org/apache/xalan/templates/StylesheetRoot.java
diff --git a/src/org/apache/xalan/templates/TemplateList.java b/xalan/src/main/java/org/apache/xalan/templates/TemplateList.java
similarity index 100%
rename from src/org/apache/xalan/templates/TemplateList.java
rename to xalan/src/main/java/org/apache/xalan/templates/TemplateList.java
diff --git a/src/org/apache/xalan/templates/TemplateSubPatternAssociation.java b/xalan/src/main/java/org/apache/xalan/templates/TemplateSubPatternAssociation.java
similarity index 100%
rename from src/org/apache/xalan/templates/TemplateSubPatternAssociation.java
rename to xalan/src/main/java/org/apache/xalan/templates/TemplateSubPatternAssociation.java
diff --git a/src/org/apache/xalan/templates/VarNameCollector.java b/xalan/src/main/java/org/apache/xalan/templates/VarNameCollector.java
similarity index 100%
rename from src/org/apache/xalan/templates/VarNameCollector.java
rename to xalan/src/main/java/org/apache/xalan/templates/VarNameCollector.java
diff --git a/src/org/apache/xalan/templates/WhiteSpaceInfo.java b/xalan/src/main/java/org/apache/xalan/templates/WhiteSpaceInfo.java
similarity index 100%
rename from src/org/apache/xalan/templates/WhiteSpaceInfo.java
rename to xalan/src/main/java/org/apache/xalan/templates/WhiteSpaceInfo.java
diff --git a/src/org/apache/xalan/templates/XMLNSDecl.java b/xalan/src/main/java/org/apache/xalan/templates/XMLNSDecl.java
similarity index 100%
rename from src/org/apache/xalan/templates/XMLNSDecl.java
rename to xalan/src/main/java/org/apache/xalan/templates/XMLNSDecl.java
diff --git a/src/org/apache/xalan/templates/XSLTVisitable.java b/xalan/src/main/java/org/apache/xalan/templates/XSLTVisitable.java
similarity index 100%
rename from src/org/apache/xalan/templates/XSLTVisitable.java
rename to xalan/src/main/java/org/apache/xalan/templates/XSLTVisitable.java
diff --git a/src/org/apache/xalan/templates/XSLTVisitor.java b/xalan/src/main/java/org/apache/xalan/templates/XSLTVisitor.java
similarity index 100%
rename from src/org/apache/xalan/templates/XSLTVisitor.java
rename to xalan/src/main/java/org/apache/xalan/templates/XSLTVisitor.java
diff --git a/src/org/apache/xalan/templates/XUnresolvedVariable.java b/xalan/src/main/java/org/apache/xalan/templates/XUnresolvedVariable.java
similarity index 100%
rename from src/org/apache/xalan/templates/XUnresolvedVariable.java
rename to xalan/src/main/java/org/apache/xalan/templates/XUnresolvedVariable.java
diff --git a/src/org/apache/xalan/templates/XUnresolvedVariableSimple.java b/xalan/src/main/java/org/apache/xalan/templates/XUnresolvedVariableSimple.java
similarity index 100%
rename from src/org/apache/xalan/templates/XUnresolvedVariableSimple.java
rename to xalan/src/main/java/org/apache/xalan/templates/XUnresolvedVariableSimple.java
diff --git a/src/org/apache/xalan/templates/package.html b/xalan/src/main/java/org/apache/xalan/templates/package.html
similarity index 100%
rename from src/org/apache/xalan/templates/package.html
rename to xalan/src/main/java/org/apache/xalan/templates/package.html
diff --git a/src/org/apache/xalan/trace/EndSelectionEvent.java b/xalan/src/main/java/org/apache/xalan/trace/EndSelectionEvent.java
similarity index 100%
rename from src/org/apache/xalan/trace/EndSelectionEvent.java
rename to xalan/src/main/java/org/apache/xalan/trace/EndSelectionEvent.java
diff --git a/src/org/apache/xalan/trace/ExtensionEvent.java b/xalan/src/main/java/org/apache/xalan/trace/ExtensionEvent.java
similarity index 100%
rename from src/org/apache/xalan/trace/ExtensionEvent.java
rename to xalan/src/main/java/org/apache/xalan/trace/ExtensionEvent.java
diff --git a/src/org/apache/xalan/trace/GenerateEvent.java b/xalan/src/main/java/org/apache/xalan/trace/GenerateEvent.java
similarity index 100%
rename from src/org/apache/xalan/trace/GenerateEvent.java
rename to xalan/src/main/java/org/apache/xalan/trace/GenerateEvent.java
diff --git a/src/org/apache/xalan/trace/PrintTraceListener.java b/xalan/src/main/java/org/apache/xalan/trace/PrintTraceListener.java
similarity index 100%
rename from src/org/apache/xalan/trace/PrintTraceListener.java
rename to xalan/src/main/java/org/apache/xalan/trace/PrintTraceListener.java
diff --git a/src/org/apache/xalan/trace/SelectionEvent.java b/xalan/src/main/java/org/apache/xalan/trace/SelectionEvent.java
similarity index 100%
rename from src/org/apache/xalan/trace/SelectionEvent.java
rename to xalan/src/main/java/org/apache/xalan/trace/SelectionEvent.java
diff --git a/src/org/apache/xalan/trace/TraceListener.java b/xalan/src/main/java/org/apache/xalan/trace/TraceListener.java
similarity index 100%
rename from src/org/apache/xalan/trace/TraceListener.java
rename to xalan/src/main/java/org/apache/xalan/trace/TraceListener.java
diff --git a/src/org/apache/xalan/trace/TraceListenerEx.java b/xalan/src/main/java/org/apache/xalan/trace/TraceListenerEx.java
similarity index 100%
rename from src/org/apache/xalan/trace/TraceListenerEx.java
rename to xalan/src/main/java/org/apache/xalan/trace/TraceListenerEx.java
diff --git a/src/org/apache/xalan/trace/TraceListenerEx2.java b/xalan/src/main/java/org/apache/xalan/trace/TraceListenerEx2.java
similarity index 100%
rename from src/org/apache/xalan/trace/TraceListenerEx2.java
rename to xalan/src/main/java/org/apache/xalan/trace/TraceListenerEx2.java
diff --git a/src/org/apache/xalan/trace/TraceListenerEx3.java b/xalan/src/main/java/org/apache/xalan/trace/TraceListenerEx3.java
similarity index 100%
rename from src/org/apache/xalan/trace/TraceListenerEx3.java
rename to xalan/src/main/java/org/apache/xalan/trace/TraceListenerEx3.java
diff --git a/src/org/apache/xalan/trace/TraceManager.java b/xalan/src/main/java/org/apache/xalan/trace/TraceManager.java
similarity index 100%
rename from src/org/apache/xalan/trace/TraceManager.java
rename to xalan/src/main/java/org/apache/xalan/trace/TraceManager.java
diff --git a/src/org/apache/xalan/trace/TracerEvent.java b/xalan/src/main/java/org/apache/xalan/trace/TracerEvent.java
similarity index 100%
rename from src/org/apache/xalan/trace/TracerEvent.java
rename to xalan/src/main/java/org/apache/xalan/trace/TracerEvent.java
diff --git a/src/org/apache/xalan/trace/package.html b/xalan/src/main/java/org/apache/xalan/trace/package.html
similarity index 100%
rename from src/org/apache/xalan/trace/package.html
rename to xalan/src/main/java/org/apache/xalan/trace/package.html
diff --git a/src/org/apache/xalan/transformer/ClonerToResultTree.java b/xalan/src/main/java/org/apache/xalan/transformer/ClonerToResultTree.java
similarity index 100%
rename from src/org/apache/xalan/transformer/ClonerToResultTree.java
rename to xalan/src/main/java/org/apache/xalan/transformer/ClonerToResultTree.java
diff --git a/src/org/apache/xalan/transformer/Counter.java b/xalan/src/main/java/org/apache/xalan/transformer/Counter.java
similarity index 100%
rename from src/org/apache/xalan/transformer/Counter.java
rename to xalan/src/main/java/org/apache/xalan/transformer/Counter.java
diff --git a/src/org/apache/xalan/transformer/CountersTable.java b/xalan/src/main/java/org/apache/xalan/transformer/CountersTable.java
similarity index 100%
rename from src/org/apache/xalan/transformer/CountersTable.java
rename to xalan/src/main/java/org/apache/xalan/transformer/CountersTable.java
diff --git a/src/org/apache/xalan/transformer/DecimalToRoman.java b/xalan/src/main/java/org/apache/xalan/transformer/DecimalToRoman.java
similarity index 100%
rename from src/org/apache/xalan/transformer/DecimalToRoman.java
rename to xalan/src/main/java/org/apache/xalan/transformer/DecimalToRoman.java
diff --git a/src/org/apache/xalan/transformer/KeyIterator.java b/xalan/src/main/java/org/apache/xalan/transformer/KeyIterator.java
similarity index 100%
rename from src/org/apache/xalan/transformer/KeyIterator.java
rename to xalan/src/main/java/org/apache/xalan/transformer/KeyIterator.java
diff --git a/src/org/apache/xalan/transformer/KeyManager.java b/xalan/src/main/java/org/apache/xalan/transformer/KeyManager.java
similarity index 100%
rename from src/org/apache/xalan/transformer/KeyManager.java
rename to xalan/src/main/java/org/apache/xalan/transformer/KeyManager.java
diff --git a/src/org/apache/xalan/transformer/KeyRefIterator.java b/xalan/src/main/java/org/apache/xalan/transformer/KeyRefIterator.java
similarity index 100%
rename from src/org/apache/xalan/transformer/KeyRefIterator.java
rename to xalan/src/main/java/org/apache/xalan/transformer/KeyRefIterator.java
diff --git a/src/org/apache/xalan/transformer/KeyTable.java b/xalan/src/main/java/org/apache/xalan/transformer/KeyTable.java
similarity index 100%
rename from src/org/apache/xalan/transformer/KeyTable.java
rename to xalan/src/main/java/org/apache/xalan/transformer/KeyTable.java
diff --git a/src/org/apache/xalan/transformer/MsgMgr.java b/xalan/src/main/java/org/apache/xalan/transformer/MsgMgr.java
similarity index 100%
rename from src/org/apache/xalan/transformer/MsgMgr.java
rename to xalan/src/main/java/org/apache/xalan/transformer/MsgMgr.java
diff --git a/src/org/apache/xalan/transformer/NodeSortKey.java b/xalan/src/main/java/org/apache/xalan/transformer/NodeSortKey.java
similarity index 100%
rename from src/org/apache/xalan/transformer/NodeSortKey.java
rename to xalan/src/main/java/org/apache/xalan/transformer/NodeSortKey.java
diff --git a/src/org/apache/xalan/transformer/NodeSorter.java b/xalan/src/main/java/org/apache/xalan/transformer/NodeSorter.java
similarity index 100%
rename from src/org/apache/xalan/transformer/NodeSorter.java
rename to xalan/src/main/java/org/apache/xalan/transformer/NodeSorter.java
diff --git a/src/org/apache/xalan/transformer/NumeratorFormatter.java b/xalan/src/main/java/org/apache/xalan/transformer/NumeratorFormatter.java
similarity index 100%
rename from src/org/apache/xalan/transformer/NumeratorFormatter.java
rename to xalan/src/main/java/org/apache/xalan/transformer/NumeratorFormatter.java
diff --git a/src/org/apache/xalan/transformer/QueuedEvents.java b/xalan/src/main/java/org/apache/xalan/transformer/QueuedEvents.java
similarity index 100%
rename from src/org/apache/xalan/transformer/QueuedEvents.java
rename to xalan/src/main/java/org/apache/xalan/transformer/QueuedEvents.java
diff --git a/src/org/apache/xalan/transformer/ResultNameSpace.java b/xalan/src/main/java/org/apache/xalan/transformer/ResultNameSpace.java
similarity index 100%
rename from src/org/apache/xalan/transformer/ResultNameSpace.java
rename to xalan/src/main/java/org/apache/xalan/transformer/ResultNameSpace.java
diff --git a/src/org/apache/xalan/transformer/SerializerSwitcher.java b/xalan/src/main/java/org/apache/xalan/transformer/SerializerSwitcher.java
similarity index 100%
rename from src/org/apache/xalan/transformer/SerializerSwitcher.java
rename to xalan/src/main/java/org/apache/xalan/transformer/SerializerSwitcher.java
diff --git a/src/org/apache/xalan/transformer/StackGuard.java b/xalan/src/main/java/org/apache/xalan/transformer/StackGuard.java
similarity index 100%
rename from src/org/apache/xalan/transformer/StackGuard.java
rename to xalan/src/main/java/org/apache/xalan/transformer/StackGuard.java
diff --git a/src/org/apache/xalan/transformer/TrAXFilter.java b/xalan/src/main/java/org/apache/xalan/transformer/TrAXFilter.java
similarity index 100%
rename from src/org/apache/xalan/transformer/TrAXFilter.java
rename to xalan/src/main/java/org/apache/xalan/transformer/TrAXFilter.java
diff --git a/src/org/apache/xalan/transformer/TransformSnapshot.java b/xalan/src/main/java/org/apache/xalan/transformer/TransformSnapshot.java
similarity index 100%
rename from src/org/apache/xalan/transformer/TransformSnapshot.java
rename to xalan/src/main/java/org/apache/xalan/transformer/TransformSnapshot.java
diff --git a/src/org/apache/xalan/transformer/TransformSnapshotImpl.java b/xalan/src/main/java/org/apache/xalan/transformer/TransformSnapshotImpl.java
similarity index 100%
rename from src/org/apache/xalan/transformer/TransformSnapshotImpl.java
rename to xalan/src/main/java/org/apache/xalan/transformer/TransformSnapshotImpl.java
diff --git a/src/org/apache/xalan/transformer/TransformState.java b/xalan/src/main/java/org/apache/xalan/transformer/TransformState.java
similarity index 100%
rename from src/org/apache/xalan/transformer/TransformState.java
rename to xalan/src/main/java/org/apache/xalan/transformer/TransformState.java
diff --git a/src/org/apache/xalan/transformer/TransformerClient.java b/xalan/src/main/java/org/apache/xalan/transformer/TransformerClient.java
similarity index 100%
rename from src/org/apache/xalan/transformer/TransformerClient.java
rename to xalan/src/main/java/org/apache/xalan/transformer/TransformerClient.java
diff --git a/src/org/apache/xalan/transformer/TransformerHandlerImpl.java b/xalan/src/main/java/org/apache/xalan/transformer/TransformerHandlerImpl.java
similarity index 100%
rename from src/org/apache/xalan/transformer/TransformerHandlerImpl.java
rename to xalan/src/main/java/org/apache/xalan/transformer/TransformerHandlerImpl.java
diff --git a/src/org/apache/xalan/transformer/TransformerIdentityImpl.java b/xalan/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java
similarity index 100%
rename from src/org/apache/xalan/transformer/TransformerIdentityImpl.java
rename to xalan/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java
diff --git a/src/org/apache/xalan/transformer/TransformerImpl.java b/xalan/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
similarity index 100%
rename from src/org/apache/xalan/transformer/TransformerImpl.java
rename to xalan/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
diff --git a/src/org/apache/xalan/transformer/TreeWalker2Result.java b/xalan/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java
similarity index 100%
rename from src/org/apache/xalan/transformer/TreeWalker2Result.java
rename to xalan/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java
diff --git a/src/org/apache/xalan/transformer/XSLInfiniteLoopException.java b/xalan/src/main/java/org/apache/xalan/transformer/XSLInfiniteLoopException.java
similarity index 100%
rename from src/org/apache/xalan/transformer/XSLInfiniteLoopException.java
rename to xalan/src/main/java/org/apache/xalan/transformer/XSLInfiniteLoopException.java
diff --git a/src/org/apache/xalan/transformer/XalanProperties.java b/xalan/src/main/java/org/apache/xalan/transformer/XalanProperties.java
similarity index 100%
rename from src/org/apache/xalan/transformer/XalanProperties.java
rename to xalan/src/main/java/org/apache/xalan/transformer/XalanProperties.java
diff --git a/src/org/apache/xalan/transformer/XalanTransformState.java b/xalan/src/main/java/org/apache/xalan/transformer/XalanTransformState.java
similarity index 100%
rename from src/org/apache/xalan/transformer/XalanTransformState.java
rename to xalan/src/main/java/org/apache/xalan/transformer/XalanTransformState.java
diff --git a/src/org/apache/xalan/transformer/package.html b/xalan/src/main/java/org/apache/xalan/transformer/package.html
similarity index 100%
rename from src/org/apache/xalan/transformer/package.html
rename to xalan/src/main/java/org/apache/xalan/transformer/package.html
diff --git a/src/org/apache/xalan/xslt/EnvironmentCheck.java b/xalan/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java
similarity index 100%
rename from src/org/apache/xalan/xslt/EnvironmentCheck.java
rename to xalan/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java
diff --git a/src/org/apache/xalan/xslt/ObjectFactory.java b/xalan/src/main/java/org/apache/xalan/xslt/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xalan/xslt/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xalan/xslt/ObjectFactory.java
diff --git a/src/org/apache/xalan/xslt/Process.java b/xalan/src/main/java/org/apache/xalan/xslt/Process.java
similarity index 100%
rename from src/org/apache/xalan/xslt/Process.java
rename to xalan/src/main/java/org/apache/xalan/xslt/Process.java
diff --git a/src/org/apache/xalan/xslt/SecuritySupport.java b/xalan/src/main/java/org/apache/xalan/xslt/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xalan/xslt/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xalan/xslt/SecuritySupport.java
diff --git a/src/org/apache/xalan/xslt/package.html b/xalan/src/main/java/org/apache/xalan/xslt/package.html
similarity index 100%
rename from src/org/apache/xalan/xslt/package.html
rename to xalan/src/main/java/org/apache/xalan/xslt/package.html
diff --git a/src/org/apache/xalan/xslt/util/XslTransformErrorLocatorHelper.java b/xalan/src/main/java/org/apache/xalan/xslt/util/XslTransformErrorLocatorHelper.java
similarity index 100%
rename from src/org/apache/xalan/xslt/util/XslTransformErrorLocatorHelper.java
rename to xalan/src/main/java/org/apache/xalan/xslt/util/XslTransformErrorLocatorHelper.java
diff --git a/src/org/apache/xalan/xsltc/CollatorFactory.java b/xalan/src/main/java/org/apache/xalan/xsltc/CollatorFactory.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/CollatorFactory.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/CollatorFactory.java
diff --git a/src/org/apache/xalan/xsltc/DOM.java b/xalan/src/main/java/org/apache/xalan/xsltc/DOM.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/DOM.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/DOM.java
diff --git a/src/org/apache/xalan/xsltc/DOMCache.java b/xalan/src/main/java/org/apache/xalan/xsltc/DOMCache.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/DOMCache.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/DOMCache.java
diff --git a/src/org/apache/xalan/xsltc/DOMEnhancedForDTM.java b/xalan/src/main/java/org/apache/xalan/xsltc/DOMEnhancedForDTM.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/DOMEnhancedForDTM.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/DOMEnhancedForDTM.java
diff --git a/src/org/apache/xalan/xsltc/NodeIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/NodeIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/NodeIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/NodeIterator.java
diff --git a/src/org/apache/xalan/xsltc/ProcessorVersion.java b/xalan/src/main/java/org/apache/xalan/xsltc/ProcessorVersion.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/ProcessorVersion.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/ProcessorVersion.java
diff --git a/src/org/apache/xalan/xsltc/StripFilter.java b/xalan/src/main/java/org/apache/xalan/xsltc/StripFilter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/StripFilter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/StripFilter.java
diff --git a/src/org/apache/xalan/xsltc/Translet.java b/xalan/src/main/java/org/apache/xalan/xsltc/Translet.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/Translet.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/Translet.java
diff --git a/src/org/apache/xalan/xsltc/TransletException.java b/xalan/src/main/java/org/apache/xalan/xsltc/TransletException.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/TransletException.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/TransletException.java
diff --git a/src/org/apache/xalan/xsltc/cmdline/Compile.java b/xalan/src/main/java/org/apache/xalan/xsltc/cmdline/Compile.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/cmdline/Compile.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/cmdline/Compile.java
diff --git a/src/org/apache/xalan/xsltc/cmdline/ObjectFactory.java b/xalan/src/main/java/org/apache/xalan/xsltc/cmdline/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/cmdline/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/cmdline/ObjectFactory.java
diff --git a/src/org/apache/xalan/xsltc/cmdline/SecuritySupport.java b/xalan/src/main/java/org/apache/xalan/xsltc/cmdline/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/cmdline/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/cmdline/SecuritySupport.java
diff --git a/src/org/apache/xalan/xsltc/cmdline/Transform.java b/xalan/src/main/java/org/apache/xalan/xsltc/cmdline/Transform.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/cmdline/Transform.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/cmdline/Transform.java
diff --git a/src/org/apache/xalan/xsltc/cmdline/getopt/GetOpt.java b/xalan/src/main/java/org/apache/xalan/xsltc/cmdline/getopt/GetOpt.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/cmdline/getopt/GetOpt.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/cmdline/getopt/GetOpt.java
diff --git a/src/org/apache/xalan/xsltc/cmdline/getopt/GetOptsException.java b/xalan/src/main/java/org/apache/xalan/xsltc/cmdline/getopt/GetOptsException.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/cmdline/getopt/GetOptsException.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/cmdline/getopt/GetOptsException.java
diff --git a/src/org/apache/xalan/xsltc/cmdline/getopt/IllegalArgumentException.java b/xalan/src/main/java/org/apache/xalan/xsltc/cmdline/getopt/IllegalArgumentException.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/cmdline/getopt/IllegalArgumentException.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/cmdline/getopt/IllegalArgumentException.java
diff --git a/src/org/apache/xalan/xsltc/cmdline/getopt/MissingOptArgException.java b/xalan/src/main/java/org/apache/xalan/xsltc/cmdline/getopt/MissingOptArgException.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/cmdline/getopt/MissingOptArgException.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/cmdline/getopt/MissingOptArgException.java
diff --git a/src/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/AbsoluteLocationPath.java
diff --git a/src/org/apache/xalan/xsltc/compiler/AbsolutePathPattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AbsolutePathPattern.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/AbsolutePathPattern.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/AbsolutePathPattern.java
diff --git a/src/org/apache/xalan/xsltc/compiler/AlternativePattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AlternativePattern.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/AlternativePattern.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/AlternativePattern.java
diff --git a/src/org/apache/xalan/xsltc/compiler/AncestorPattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AncestorPattern.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/AncestorPattern.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/AncestorPattern.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ApplyImports.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ApplyImports.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ApplyImports.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ApplyImports.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ApplyTemplates.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ApplyTemplates.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ApplyTemplates.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ArgumentList.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ArgumentList.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ArgumentList.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ArgumentList.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Attribute.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Attribute.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Attribute.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Attribute.java
diff --git a/src/org/apache/xalan/xsltc/compiler/AttributeSet.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeSet.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/AttributeSet.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeSet.java
diff --git a/src/org/apache/xalan/xsltc/compiler/AttributeValue.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeValue.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/AttributeValue.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeValue.java
diff --git a/src/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/AttributeValueTemplate.java
diff --git a/src/org/apache/xalan/xsltc/compiler/BinOpExpr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/BinOpExpr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/BinOpExpr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/BinOpExpr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/BooleanCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/BooleanCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/BooleanCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/BooleanCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/BooleanExpr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/BooleanExpr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/BooleanExpr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/BooleanExpr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/CallTemplate.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/CallTemplate.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/CallTemplate.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/CallTemplate.java
diff --git a/src/org/apache/xalan/xsltc/compiler/CastCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/CastCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/CastCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/CastCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/CastExpr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/CastExpr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/CastExpr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/CastExpr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/CeilingCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/CeilingCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/CeilingCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/CeilingCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Choose.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Choose.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Choose.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Choose.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Closure.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Closure.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Closure.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Closure.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Comment.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Comment.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Comment.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Comment.java
diff --git a/src/org/apache/xalan/xsltc/compiler/CompilerException.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/CompilerException.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/CompilerException.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/CompilerException.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ConcatCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ConcatCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ConcatCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ConcatCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Constants.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Constants.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Constants.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Constants.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ContainsCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ContainsCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ContainsCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ContainsCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Copy.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Copy.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Copy.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Copy.java
diff --git a/src/org/apache/xalan/xsltc/compiler/CopyOf.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/CopyOf.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/CopyOf.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/CopyOf.java
diff --git a/src/org/apache/xalan/xsltc/compiler/CurrentCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/CurrentCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/CurrentCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/CurrentCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/DecimalFormatting.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/DecimalFormatting.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/DecimalFormatting.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/DecimalFormatting.java
diff --git a/src/org/apache/xalan/xsltc/compiler/DocumentCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/DocumentCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/DocumentCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/DocumentCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ElementAvailableCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ElementAvailableCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ElementAvailableCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ElementAvailableCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/EqualityExpr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/EqualityExpr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/EqualityExpr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/EqualityExpr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Expression.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Expression.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Expression.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Expression.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Fallback.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Fallback.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Fallback.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Fallback.java
diff --git a/src/org/apache/xalan/xsltc/compiler/FilterExpr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/FilterExpr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/FilterExpr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/FilterExpr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/FilterParentPath.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/FilterParentPath.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/FilterParentPath.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/FilterParentPath.java
diff --git a/src/org/apache/xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/FilteredAbsoluteLocationPath.java
diff --git a/src/org/apache/xalan/xsltc/compiler/FloorCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/FloorCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/FloorCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/FloorCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/FlowList.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/FlowList.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/FlowList.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/FlowList.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ForEach.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ForEach.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ForEach.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ForEach.java
diff --git a/src/org/apache/xalan/xsltc/compiler/FormatNumberCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/FormatNumberCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/FormatNumberCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/FormatNumberCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/FunctionCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/FunctionCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/FunctionCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/FunctionCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/GenerateIdCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/GenerateIdCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/GenerateIdCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/GenerateIdCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/IdKeyPattern.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/IdKeyPattern.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/IdKeyPattern.java
diff --git a/src/org/apache/xalan/xsltc/compiler/IdPattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/IdPattern.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/IdPattern.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/IdPattern.java
diff --git a/src/org/apache/xalan/xsltc/compiler/If.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/If.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/If.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/If.java
diff --git a/src/org/apache/xalan/xsltc/compiler/IllegalCharException.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/IllegalCharException.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/IllegalCharException.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/IllegalCharException.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Import.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Import.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Import.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Import.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Include.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Include.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Include.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Include.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Instruction.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Instruction.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Instruction.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Instruction.java
diff --git a/src/org/apache/xalan/xsltc/compiler/IntExpr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/IntExpr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/IntExpr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/IntExpr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Key.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Key.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Key.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Key.java
diff --git a/src/org/apache/xalan/xsltc/compiler/KeyCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/KeyCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/KeyCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/KeyCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/KeyPattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/KeyPattern.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/KeyPattern.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/KeyPattern.java
diff --git a/src/org/apache/xalan/xsltc/compiler/LangCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/LangCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/LangCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/LangCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/LastCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/LastCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/LastCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/LastCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/LiteralAttribute.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/LiteralAttribute.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/LiteralAttribute.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/LiteralAttribute.java
diff --git a/src/org/apache/xalan/xsltc/compiler/LiteralElement.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/LiteralElement.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/LiteralElement.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/LiteralElement.java
diff --git a/src/org/apache/xalan/xsltc/compiler/LiteralExpr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/LiteralExpr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/LiteralExpr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/LiteralExpr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/LocalNameCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/LocalNameCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/LocalNameCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/LocalNameCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/LocationPathPattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/LocationPathPattern.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/LocationPathPattern.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/LocationPathPattern.java
diff --git a/src/org/apache/xalan/xsltc/compiler/LogicalExpr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/LogicalExpr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/LogicalExpr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/LogicalExpr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Makefile.inc b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Makefile.inc
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Makefile.inc
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Makefile.inc
diff --git a/src/org/apache/xalan/xsltc/compiler/Message.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Message.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Message.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Message.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Mode.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Mode.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Mode.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Mode.java
diff --git a/src/org/apache/xalan/xsltc/compiler/NameBase.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/NameBase.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/NameBase.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/NameBase.java
diff --git a/src/org/apache/xalan/xsltc/compiler/NameCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/NameCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/NameCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/NameCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/NamespaceAlias.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/NamespaceAlias.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/NamespaceAlias.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/NamespaceAlias.java
diff --git a/src/org/apache/xalan/xsltc/compiler/NamespaceUriCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/NamespaceUriCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/NamespaceUriCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/NamespaceUriCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/NodeTest.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/NodeTest.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/NodeTest.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/NodeTest.java
diff --git a/src/org/apache/xalan/xsltc/compiler/NotCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/NotCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/NotCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/NotCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Number.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Number.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Number.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Number.java
diff --git a/src/org/apache/xalan/xsltc/compiler/NumberCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/NumberCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/NumberCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/NumberCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ObjectFactory.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ObjectFactory.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Otherwise.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Otherwise.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Otherwise.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Otherwise.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Output.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Output.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Output.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Output.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Param.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Param.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Param.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Param.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ParameterRef.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ParameterRef.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ParameterRef.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ParameterRef.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ParentLocationPath.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ParentLocationPath.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ParentLocationPath.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ParentPattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ParentPattern.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ParentPattern.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ParentPattern.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Parser.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Parser.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Parser.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Parser.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Pattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Pattern.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Pattern.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Pattern.java
diff --git a/src/org/apache/xalan/xsltc/compiler/PositionCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/PositionCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/PositionCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/PositionCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Predicate.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Predicate.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Predicate.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Predicate.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ProcessingInstruction.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ProcessingInstructionPattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ProcessingInstructionPattern.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ProcessingInstructionPattern.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ProcessingInstructionPattern.java
diff --git a/src/org/apache/xalan/xsltc/compiler/QName.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/QName.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/QName.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/QName.java
diff --git a/src/org/apache/xalan/xsltc/compiler/RealExpr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/RealExpr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/RealExpr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/RealExpr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/RelationalExpr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/RelationalExpr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/RelationalExpr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/RelationalExpr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/RelativeLocationPath.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/RelativeLocationPath.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/RelativeLocationPath.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/RelativeLocationPath.java
diff --git a/src/org/apache/xalan/xsltc/compiler/RelativePathPattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/RelativePathPattern.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/RelativePathPattern.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/RelativePathPattern.java
diff --git a/src/org/apache/xalan/xsltc/compiler/RoundCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/RoundCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/RoundCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/RoundCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/SecuritySupport.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/SecuritySupport.java
diff --git a/src/org/apache/xalan/xsltc/compiler/SimpleAttributeValue.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/SimpleAttributeValue.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/SimpleAttributeValue.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/SimpleAttributeValue.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Sort.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Sort.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Sort.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Sort.java
diff --git a/src/org/apache/xalan/xsltc/compiler/SourceLoader.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/SourceLoader.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/SourceLoader.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/SourceLoader.java
diff --git a/src/org/apache/xalan/xsltc/compiler/StartsWithCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/StartsWithCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/StartsWithCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/StartsWithCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Step.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Step.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Step.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Step.java
diff --git a/src/org/apache/xalan/xsltc/compiler/StepPattern.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/StepPattern.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/StepPattern.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/StepPattern.java
diff --git a/src/org/apache/xalan/xsltc/compiler/StringCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/StringCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/StringCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/StringCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/StringLengthCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/StringLengthCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/StringLengthCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/StringLengthCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Stylesheet.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Stylesheet.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Stylesheet.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Stylesheet.java
diff --git a/src/org/apache/xalan/xsltc/compiler/SymbolTable.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/SymbolTable.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/SymbolTable.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/SymbolTable.java
diff --git a/src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Template.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Template.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Template.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Template.java
diff --git a/src/org/apache/xalan/xsltc/compiler/TestSeq.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/TestSeq.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/TestSeq.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/TestSeq.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Text.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Text.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Text.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Text.java
diff --git a/src/org/apache/xalan/xsltc/compiler/TopLevelElement.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/TopLevelElement.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/TopLevelElement.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/TopLevelElement.java
diff --git a/src/org/apache/xalan/xsltc/compiler/TransletOutput.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/TransletOutput.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/TransletOutput.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/TransletOutput.java
diff --git a/src/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/UnaryOpExpr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/UnionPathExpr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/UnionPathExpr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/UnionPathExpr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/UnionPathExpr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/UnparsedEntityUriCall.java
diff --git a/src/org/apache/xalan/xsltc/compiler/UnresolvedRef.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/UnresolvedRef.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/UnresolvedRef.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/UnresolvedRef.java
diff --git a/src/org/apache/xalan/xsltc/compiler/UnsupportedElement.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/UnsupportedElement.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/UnsupportedElement.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/UnsupportedElement.java
diff --git a/src/org/apache/xalan/xsltc/compiler/UseAttributeSets.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/UseAttributeSets.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/UseAttributeSets.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/UseAttributeSets.java
diff --git a/src/org/apache/xalan/xsltc/compiler/ValueOf.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/ValueOf.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/ValueOf.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/ValueOf.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Variable.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Variable.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Variable.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Variable.java
diff --git a/src/org/apache/xalan/xsltc/compiler/VariableBase.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/VariableBase.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/VariableBase.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/VariableBase.java
diff --git a/src/org/apache/xalan/xsltc/compiler/VariableRef.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/VariableRef.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/VariableRef.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/VariableRef.java
diff --git a/src/org/apache/xalan/xsltc/compiler/VariableRefBase.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/VariableRefBase.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/VariableRefBase.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/VariableRefBase.java
diff --git a/src/org/apache/xalan/xsltc/compiler/When.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/When.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/When.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/When.java
diff --git a/src/org/apache/xalan/xsltc/compiler/Whitespace.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/Whitespace.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/Whitespace.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/Whitespace.java
diff --git a/src/org/apache/xalan/xsltc/compiler/WithParam.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/WithParam.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/WithParam.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/WithParam.java
diff --git a/src/org/apache/xalan/xsltc/compiler/XSLTC.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/XSLTC.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/XSLTC.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/XSLTC.java
diff --git a/src/org/apache/xalan/xsltc/compiler/XslAttribute.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/XslAttribute.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/XslAttribute.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/XslAttribute.java
diff --git a/src/org/apache/xalan/xsltc/compiler/XslElement.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/XslElement.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/XslElement.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/XslElement.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/AttributeSetMethodGenerator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/AttributeSetMethodGenerator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/AttributeSetMethodGenerator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/AttributeSetMethodGenerator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/BooleanType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/BooleanType.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/BooleanType.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/BooleanType.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ClassGenerator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ClassGenerator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ClassGenerator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ClassGenerator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/CompareGenerator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/CompareGenerator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/CompareGenerator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/CompareGenerator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ca.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ca.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ca.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ca.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_cs.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_cs.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_cs.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_cs.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_de.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_de.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_de.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_de.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_es.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_es.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_es.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_es.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_fr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_fr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_fr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_fr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_hu.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_hu.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_hu.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_hu.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_it.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_it.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_it.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_it.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ja.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ja.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ja.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ja.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ko.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ko.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ko.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ko.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_no.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_no.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_no.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_no.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pl.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pl.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pt_BR.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pt_BR.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pt_BR.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_pt_BR.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ru.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ru.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ru.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_ru.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sk.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sk.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sk.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sk.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sl.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_sl.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_tr.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_tr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_tr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_tr.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh_TW.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh_TW.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh_TW.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMessages_zh_TW.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ErrorMsg.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/FilterGenerator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/FilterGenerator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/FilterGenerator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/FilterGenerator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/IntType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/IntType.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/IntType.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/IntType.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/InternalError.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/InternalError.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/InternalError.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/InternalError.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/MarkerInstruction.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MarkerInstruction.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/MarkerInstruction.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MarkerInstruction.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/MatchGenerator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MatchGenerator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/MatchGenerator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MatchGenerator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/MethodGenerator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MethodGenerator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/MethodGenerator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MethodGenerator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/MethodType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MethodType.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/MethodType.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MethodType.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/MultiHashtable.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MultiHashtable.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/MultiHashtable.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/MultiHashtable.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/NamedMethodGenerator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NamedMethodGenerator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/NamedMethodGenerator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NamedMethodGenerator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/NodeCounterGenerator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NodeCounterGenerator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/NodeCounterGenerator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NodeCounterGenerator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/NodeSetType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NodeSetType.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/NodeSetType.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NodeSetType.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/NodeSortRecordFactGenerator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NodeSortRecordFactGenerator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/NodeSortRecordFactGenerator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NodeSortRecordFactGenerator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/NodeSortRecordGenerator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NodeSortRecordGenerator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/NodeSortRecordGenerator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NodeSortRecordGenerator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/NodeType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NodeType.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/NodeType.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NodeType.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/NumberType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NumberType.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/NumberType.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/NumberType.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ObjectType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ObjectType.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ObjectType.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ObjectType.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/OutlineableChunkEnd.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/OutlineableChunkEnd.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/OutlineableChunkEnd.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/OutlineableChunkEnd.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/OutlineableChunkStart.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/OutlineableChunkStart.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/OutlineableChunkStart.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/OutlineableChunkStart.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/RealType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/RealType.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/RealType.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/RealType.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ReferenceType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ReferenceType.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ReferenceType.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ReferenceType.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/ResultTreeType.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/RtMethodGenerator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/RtMethodGenerator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/RtMethodGenerator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/RtMethodGenerator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/SecuritySupport.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/SecuritySupport.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/SlotAllocator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/SlotAllocator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/SlotAllocator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/SlotAllocator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/StringStack.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/StringStack.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/StringStack.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/StringStack.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/StringType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/StringType.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/StringType.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/StringType.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/TestGenerator.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/TestGenerator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/TestGenerator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/TestGenerator.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/Type.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/Type.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/Type.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/Type.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/TypeCheckError.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/TypeCheckError.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/TypeCheckError.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/TypeCheckError.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/Util.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/Util.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/Util.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/Util.java
diff --git a/src/org/apache/xalan/xsltc/compiler/util/VoidType.java b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/VoidType.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/util/VoidType.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/util/VoidType.java
diff --git a/src/org/apache/xalan/xsltc/compiler/xpath.cup b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/xpath.cup
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/xpath.cup
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/xpath.cup
diff --git a/src/org/apache/xalan/xsltc/compiler/xpath.lex b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/xpath.lex
similarity index 100%
rename from src/org/apache/xalan/xsltc/compiler/xpath.lex
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/xpath.lex
diff --git a/src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/AbsoluteIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/AbsoluteIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/AbsoluteIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/AdaptiveResultTreeImpl.java
diff --git a/src/org/apache/xalan/xsltc/dom/AnyNodeCounter.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/AnyNodeCounter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/AnyNodeCounter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/AnyNodeCounter.java
diff --git a/src/org/apache/xalan/xsltc/dom/ArrayNodeListIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/ArrayNodeListIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/ArrayNodeListIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/ArrayNodeListIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/BitArray.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/BitArray.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/BitArray.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/BitArray.java
diff --git a/src/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/CachedNodeListIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/ClonedNodeListIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/CollatorFactoryBase.java
diff --git a/src/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/CurrentNodeListFilter.java
diff --git a/src/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/CurrentNodeListIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/DOMAdapter.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/DOMAdapter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/DOMAdapter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/DOMAdapter.java
diff --git a/src/org/apache/xalan/xsltc/dom/DOMBuilder.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/DOMBuilder.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/DOMBuilder.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/DOMBuilder.java
diff --git a/src/org/apache/xalan/xsltc/dom/DOMWSFilter.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/DOMWSFilter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/DOMWSFilter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/DOMWSFilter.java
diff --git a/src/org/apache/xalan/xsltc/dom/DocumentCache.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/DocumentCache.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/DocumentCache.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/DocumentCache.java
diff --git a/src/org/apache/xalan/xsltc/dom/DupFilterIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/DupFilterIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/DupFilterIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/DupFilterIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/EmptyFilter.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/EmptyFilter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/EmptyFilter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/EmptyFilter.java
diff --git a/src/org/apache/xalan/xsltc/dom/ExtendedSAX.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/ExtendedSAX.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/ExtendedSAX.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/ExtendedSAX.java
diff --git a/src/org/apache/xalan/xsltc/dom/Filter.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/Filter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/Filter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/Filter.java
diff --git a/src/org/apache/xalan/xsltc/dom/FilterIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/FilterIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/FilterIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/FilterIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/FilteredStepIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/FilteredStepIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/FilteredStepIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/FilteredStepIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/ForwardPositionIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/KeyIndex.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/KeyIndex.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/KeyIndex.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/KeyIndex.java
diff --git a/src/org/apache/xalan/xsltc/dom/LoadDocument.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/LoadDocument.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/LoadDocument.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/LoadDocument.java
diff --git a/src/org/apache/xalan/xsltc/dom/MatchingIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/MatchingIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/MatchingIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/MatchingIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/MultiDOM.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/MultiDOM.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/MultiDOM.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/MultiDOM.java
diff --git a/src/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/MultiValuedNodeHeapIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/MultipleNodeCounter.java
diff --git a/src/org/apache/xalan/xsltc/dom/NodeCounter.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/NodeCounter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/NodeCounter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/NodeCounter.java
diff --git a/src/org/apache/xalan/xsltc/dom/NodeIteratorBase.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/NodeIteratorBase.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/NodeIteratorBase.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/NodeIteratorBase.java
diff --git a/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/NodeSortRecord.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/NodeSortRecord.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/NodeSortRecord.java
diff --git a/src/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java
diff --git a/src/org/apache/xalan/xsltc/dom/NthIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/NthIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/NthIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/NthIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/ObjectFactory.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/ObjectFactory.java
diff --git a/src/org/apache/xalan/xsltc/dom/SAXImpl.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/SAXImpl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/SAXImpl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/SAXImpl.java
diff --git a/src/org/apache/xalan/xsltc/dom/SecuritySupport.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/SecuritySupport.java
diff --git a/src/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/SimpleResultTreeImpl.java
diff --git a/src/org/apache/xalan/xsltc/dom/SingleNodeCounter.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/SingleNodeCounter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/SingleNodeCounter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/SingleNodeCounter.java
diff --git a/src/org/apache/xalan/xsltc/dom/SingletonIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/SingletonIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/SingletonIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/SingletonIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/SortSettings.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/SortSettings.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/SortSettings.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/SortSettings.java
diff --git a/src/org/apache/xalan/xsltc/dom/SortingIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/SortingIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/SortingIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/SortingIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/StepIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/StepIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/StepIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/StepIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/StripWhitespaceFilter.java
diff --git a/src/org/apache/xalan/xsltc/dom/UnionIterator.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/UnionIterator.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/UnionIterator.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/UnionIterator.java
diff --git a/src/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java b/xalan/src/main/java/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java
diff --git a/src/org/apache/xalan/xsltc/javax.xml.transform.TransformerFactory b/xalan/src/main/java/org/apache/xalan/xsltc/javax.xml.transform.TransformerFactory
similarity index 100%
rename from src/org/apache/xalan/xsltc/javax.xml.transform.TransformerFactory
rename to xalan/src/main/java/org/apache/xalan/xsltc/javax.xml.transform.TransformerFactory
diff --git a/src/org/apache/xalan/xsltc/runtime/AbstractTranslet.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/AbstractTranslet.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/AbstractTranslet.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/AbstractTranslet.java
diff --git a/src/org/apache/xalan/xsltc/runtime/AttributeList.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/AttributeList.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/AttributeList.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/AttributeList.java
diff --git a/src/org/apache/xalan/xsltc/runtime/Attributes.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/Attributes.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/Attributes.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/Attributes.java
diff --git a/src/org/apache/xalan/xsltc/runtime/BasisLibrary.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/BasisLibrary.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/BasisLibrary.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/BasisLibrary.java
diff --git a/src/org/apache/xalan/xsltc/runtime/Constants.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/Constants.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/Constants.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/Constants.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_ca.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_ca.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_ca.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_ca.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_cs.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_cs.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_cs.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_cs.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_de.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_de.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_de.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_de.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_es.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_es.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_es.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_es.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_fr.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_fr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_fr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_fr.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_hu.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_hu.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_hu.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_hu.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_it.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_it.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_it.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_it.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_ja.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_ja.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_ja.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_ja.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_ko.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_ko.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_ko.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_ko.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_no.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_no.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_no.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_no.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_pl.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_pl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_pl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_pl.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_pt_BR.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_pt_BR.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_pt_BR.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_pt_BR.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_ru.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_ru.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_ru.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_ru.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_sk.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_sk.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_sk.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_sk.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_sl.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_sl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_sl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_sl.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_tr.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_tr.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_tr.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_tr.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_zh.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_zh.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_zh.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_zh.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ErrorMessages_zh_TW.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_zh_TW.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ErrorMessages_zh_TW.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ErrorMessages_zh_TW.java
diff --git a/src/org/apache/xalan/xsltc/runtime/Hashtable.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/Hashtable.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/Hashtable.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/Hashtable.java
diff --git a/src/org/apache/xalan/xsltc/runtime/InternalRuntimeError.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/InternalRuntimeError.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/InternalRuntimeError.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/InternalRuntimeError.java
diff --git a/src/org/apache/xalan/xsltc/runtime/MessageHandler.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/MessageHandler.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/MessageHandler.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/MessageHandler.java
diff --git a/src/org/apache/xalan/xsltc/runtime/Node.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/Node.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/Node.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/Node.java
diff --git a/src/org/apache/xalan/xsltc/runtime/ObjectFactory.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/ObjectFactory.java
diff --git a/src/org/apache/xalan/xsltc/runtime/Operators.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/Operators.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/Operators.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/Operators.java
diff --git a/src/org/apache/xalan/xsltc/runtime/Parameter.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/Parameter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/Parameter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/Parameter.java
diff --git a/src/org/apache/xalan/xsltc/runtime/SecuritySupport.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/SecuritySupport.java
diff --git a/src/org/apache/xalan/xsltc/runtime/StringValueHandler.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/StringValueHandler.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/StringValueHandler.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/StringValueHandler.java
diff --git a/src/org/apache/xalan/xsltc/runtime/output/OutputBuffer.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/output/OutputBuffer.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/output/OutputBuffer.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/output/OutputBuffer.java
diff --git a/src/org/apache/xalan/xsltc/runtime/output/StringOutputBuffer.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/output/StringOutputBuffer.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/output/StringOutputBuffer.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/output/StringOutputBuffer.java
diff --git a/src/org/apache/xalan/xsltc/runtime/output/TransletOutputHandlerFactory.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/output/TransletOutputHandlerFactory.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/output/TransletOutputHandlerFactory.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/output/TransletOutputHandlerFactory.java
diff --git a/src/org/apache/xalan/xsltc/runtime/output/WriterOutputBuffer.java b/xalan/src/main/java/org/apache/xalan/xsltc/runtime/output/WriterOutputBuffer.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/runtime/output/WriterOutputBuffer.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/runtime/output/WriterOutputBuffer.java
diff --git a/src/org/apache/xalan/xsltc/trax/DOM2SAX.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/DOM2SAX.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/DOM2SAX.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/DOM2SAX.java
diff --git a/src/org/apache/xalan/xsltc/trax/DOM2TO.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/DOM2TO.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/DOM2TO.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/DOM2TO.java
diff --git a/src/org/apache/xalan/xsltc/trax/ObjectFactory.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/ObjectFactory.java
diff --git a/src/org/apache/xalan/xsltc/trax/OutputSettings.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/OutputSettings.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/OutputSettings.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/OutputSettings.java
diff --git a/src/org/apache/xalan/xsltc/trax/SAX2DOM.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/SAX2DOM.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/SAX2DOM.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/SAX2DOM.java
diff --git a/src/org/apache/xalan/xsltc/trax/SecuritySupport.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/SecuritySupport.java
diff --git a/src/org/apache/xalan/xsltc/trax/SmartTransformerFactoryImpl.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/SmartTransformerFactoryImpl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/SmartTransformerFactoryImpl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/SmartTransformerFactoryImpl.java
diff --git a/src/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/TemplatesHandlerImpl.java
diff --git a/src/org/apache/xalan/xsltc/trax/TemplatesImpl.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/TemplatesImpl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/TemplatesImpl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/TemplatesImpl.java
diff --git a/src/org/apache/xalan/xsltc/trax/TrAXFilter.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/TrAXFilter.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/TrAXFilter.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/TrAXFilter.java
diff --git a/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java
diff --git a/src/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/TransformerHandlerImpl.java
diff --git a/src/org/apache/xalan/xsltc/trax/TransformerImpl.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/TransformerImpl.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/TransformerImpl.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/TransformerImpl.java
diff --git a/src/org/apache/xalan/xsltc/trax/Util.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/Util.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/Util.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/Util.java
diff --git a/src/org/apache/xalan/xsltc/trax/XSLTCSource.java b/xalan/src/main/java/org/apache/xalan/xsltc/trax/XSLTCSource.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/trax/XSLTCSource.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/trax/XSLTCSource.java
diff --git a/src/org/apache/xalan/xsltc/util/IntegerArray.java b/xalan/src/main/java/org/apache/xalan/xsltc/util/IntegerArray.java
similarity index 100%
rename from src/org/apache/xalan/xsltc/util/IntegerArray.java
rename to xalan/src/main/java/org/apache/xalan/xsltc/util/IntegerArray.java
diff --git a/src/org/apache/xml/dtm/Axis.java b/xalan/src/main/java/org/apache/xml/dtm/Axis.java
similarity index 100%
rename from src/org/apache/xml/dtm/Axis.java
rename to xalan/src/main/java/org/apache/xml/dtm/Axis.java
diff --git a/src/org/apache/xml/dtm/DTM.java b/xalan/src/main/java/org/apache/xml/dtm/DTM.java
similarity index 100%
rename from src/org/apache/xml/dtm/DTM.java
rename to xalan/src/main/java/org/apache/xml/dtm/DTM.java
diff --git a/src/org/apache/xml/dtm/DTMAxisIterator.java b/xalan/src/main/java/org/apache/xml/dtm/DTMAxisIterator.java
similarity index 100%
rename from src/org/apache/xml/dtm/DTMAxisIterator.java
rename to xalan/src/main/java/org/apache/xml/dtm/DTMAxisIterator.java
diff --git a/src/org/apache/xml/dtm/DTMAxisTraverser.java b/xalan/src/main/java/org/apache/xml/dtm/DTMAxisTraverser.java
similarity index 100%
rename from src/org/apache/xml/dtm/DTMAxisTraverser.java
rename to xalan/src/main/java/org/apache/xml/dtm/DTMAxisTraverser.java
diff --git a/src/org/apache/xml/dtm/DTMConfigurationException.java b/xalan/src/main/java/org/apache/xml/dtm/DTMConfigurationException.java
similarity index 100%
rename from src/org/apache/xml/dtm/DTMConfigurationException.java
rename to xalan/src/main/java/org/apache/xml/dtm/DTMConfigurationException.java
diff --git a/src/org/apache/xml/dtm/DTMDOMException.java b/xalan/src/main/java/org/apache/xml/dtm/DTMDOMException.java
similarity index 100%
rename from src/org/apache/xml/dtm/DTMDOMException.java
rename to xalan/src/main/java/org/apache/xml/dtm/DTMDOMException.java
diff --git a/src/org/apache/xml/dtm/DTMException.java b/xalan/src/main/java/org/apache/xml/dtm/DTMException.java
similarity index 100%
rename from src/org/apache/xml/dtm/DTMException.java
rename to xalan/src/main/java/org/apache/xml/dtm/DTMException.java
diff --git a/src/org/apache/xml/dtm/DTMFilter.java b/xalan/src/main/java/org/apache/xml/dtm/DTMFilter.java
similarity index 100%
rename from src/org/apache/xml/dtm/DTMFilter.java
rename to xalan/src/main/java/org/apache/xml/dtm/DTMFilter.java
diff --git a/src/org/apache/xml/dtm/DTMIterator.java b/xalan/src/main/java/org/apache/xml/dtm/DTMIterator.java
similarity index 100%
rename from src/org/apache/xml/dtm/DTMIterator.java
rename to xalan/src/main/java/org/apache/xml/dtm/DTMIterator.java
diff --git a/src/org/apache/xml/dtm/DTMManager.java b/xalan/src/main/java/org/apache/xml/dtm/DTMManager.java
similarity index 100%
rename from src/org/apache/xml/dtm/DTMManager.java
rename to xalan/src/main/java/org/apache/xml/dtm/DTMManager.java
diff --git a/src/org/apache/xml/dtm/DTMWSFilter.java b/xalan/src/main/java/org/apache/xml/dtm/DTMWSFilter.java
similarity index 100%
rename from src/org/apache/xml/dtm/DTMWSFilter.java
rename to xalan/src/main/java/org/apache/xml/dtm/DTMWSFilter.java
diff --git a/src/org/apache/xml/dtm/ObjectFactory.java b/xalan/src/main/java/org/apache/xml/dtm/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xml/dtm/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xml/dtm/ObjectFactory.java
diff --git a/src/org/apache/xml/dtm/SecuritySupport.java b/xalan/src/main/java/org/apache/xml/dtm/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xml/dtm/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xml/dtm/SecuritySupport.java
diff --git a/src/org/apache/xml/dtm/ref/ChunkedIntArray.java b/xalan/src/main/java/org/apache/xml/dtm/ref/ChunkedIntArray.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/ChunkedIntArray.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/ChunkedIntArray.java
diff --git a/src/org/apache/xml/dtm/ref/CoroutineManager.java b/xalan/src/main/java/org/apache/xml/dtm/ref/CoroutineManager.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/CoroutineManager.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/CoroutineManager.java
diff --git a/src/org/apache/xml/dtm/ref/CoroutineParser.java b/xalan/src/main/java/org/apache/xml/dtm/ref/CoroutineParser.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/CoroutineParser.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/CoroutineParser.java
diff --git a/src/org/apache/xml/dtm/ref/CustomStringPool.java b/xalan/src/main/java/org/apache/xml/dtm/ref/CustomStringPool.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/CustomStringPool.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/CustomStringPool.java
diff --git a/src/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java
diff --git a/src/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java
diff --git a/src/org/apache/xml/dtm/ref/DTMChildIterNodeList.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMChildIterNodeList.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMChildIterNodeList.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMChildIterNodeList.java
diff --git a/src/org/apache/xml/dtm/ref/DTMDefaultBase.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMDefaultBase.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java
diff --git a/src/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java
diff --git a/src/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
diff --git a/src/org/apache/xml/dtm/ref/DTMDocumentImpl.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMDocumentImpl.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMDocumentImpl.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMDocumentImpl.java
diff --git a/src/org/apache/xml/dtm/ref/DTMManagerDefault.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMManagerDefault.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java
diff --git a/src/org/apache/xml/dtm/ref/DTMNamedNodeMap.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMNamedNodeMap.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMNamedNodeMap.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMNamedNodeMap.java
diff --git a/src/org/apache/xml/dtm/ref/DTMNodeIterator.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMNodeIterator.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMNodeIterator.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMNodeIterator.java
diff --git a/src/org/apache/xml/dtm/ref/DTMNodeList.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMNodeList.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMNodeList.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMNodeList.java
diff --git a/src/org/apache/xml/dtm/ref/DTMNodeListBase.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMNodeListBase.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMNodeListBase.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMNodeListBase.java
diff --git a/src/org/apache/xml/dtm/ref/DTMNodeProxy.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMNodeProxy.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMNodeProxy.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMNodeProxy.java
diff --git a/src/org/apache/xml/dtm/ref/DTMSafeStringPool.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMSafeStringPool.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMSafeStringPool.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMSafeStringPool.java
diff --git a/src/org/apache/xml/dtm/ref/DTMStringPool.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMStringPool.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMStringPool.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMStringPool.java
diff --git a/src/org/apache/xml/dtm/ref/DTMTreeWalker.java b/xalan/src/main/java/org/apache/xml/dtm/ref/DTMTreeWalker.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/DTMTreeWalker.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/DTMTreeWalker.java
diff --git a/src/org/apache/xml/dtm/ref/EmptyIterator.java b/xalan/src/main/java/org/apache/xml/dtm/ref/EmptyIterator.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/EmptyIterator.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/EmptyIterator.java
diff --git a/src/org/apache/xml/dtm/ref/ExpandedNameTable.java b/xalan/src/main/java/org/apache/xml/dtm/ref/ExpandedNameTable.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/ExpandedNameTable.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/ExpandedNameTable.java
diff --git a/src/org/apache/xml/dtm/ref/ExtendedType.java b/xalan/src/main/java/org/apache/xml/dtm/ref/ExtendedType.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/ExtendedType.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/ExtendedType.java
diff --git a/src/org/apache/xml/dtm/ref/IncrementalSAXSource.java b/xalan/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/IncrementalSAXSource.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource.java
diff --git a/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java b/xalan/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java
diff --git a/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java b/xalan/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java
diff --git a/src/org/apache/xml/dtm/ref/NodeLocator.java b/xalan/src/main/java/org/apache/xml/dtm/ref/NodeLocator.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/NodeLocator.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/NodeLocator.java
diff --git a/src/org/apache/xml/dtm/ref/ObjectFactory.java b/xalan/src/main/java/org/apache/xml/dtm/ref/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/ObjectFactory.java
diff --git a/src/org/apache/xml/dtm/ref/SecuritySupport.java b/xalan/src/main/java/org/apache/xml/dtm/ref/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/SecuritySupport.java
diff --git a/src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java b/xalan/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
diff --git a/src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java b/xalan/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
diff --git a/src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java b/xalan/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
diff --git a/src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java b/xalan/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java
diff --git a/src/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java b/xalan/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java
similarity index 100%
rename from src/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java
rename to xalan/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java
diff --git a/src/org/apache/xml/res/XMLErrorResources.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_ca.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_ca.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_ca.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_ca.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_cs.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_cs.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_cs.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_cs.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_de.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_de.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_de.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_de.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_en.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_en.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_en.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_en.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_es.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_es.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_es.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_es.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_fr.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_fr.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_fr.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_fr.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_hu.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_hu.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_hu.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_hu.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_it.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_it.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_it.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_it.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_ja.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_ja.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_ja.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_ja.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_ko.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_ko.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_ko.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_ko.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_pl.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_pl.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_pl.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_pl.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_pt_BR.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_pt_BR.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_pt_BR.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_pt_BR.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_ru.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_ru.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_ru.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_ru.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_sk.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_sk.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_sk.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_sk.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_sl.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_sl.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_sl.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_sl.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_sv.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_sv.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_sv.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_sv.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_tr.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_tr.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_tr.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_tr.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_zh.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_zh.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_zh.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_zh.java
diff --git a/src/org/apache/xml/res/XMLErrorResources_zh_TW.java b/xalan/src/main/java/org/apache/xml/res/XMLErrorResources_zh_TW.java
similarity index 100%
rename from src/org/apache/xml/res/XMLErrorResources_zh_TW.java
rename to xalan/src/main/java/org/apache/xml/res/XMLErrorResources_zh_TW.java
diff --git a/src/org/apache/xml/res/XMLMessages.java b/xalan/src/main/java/org/apache/xml/res/XMLMessages.java
similarity index 100%
rename from src/org/apache/xml/res/XMLMessages.java
rename to xalan/src/main/java/org/apache/xml/res/XMLMessages.java
diff --git a/src/org/apache/xml/utils/AttList.java b/xalan/src/main/java/org/apache/xml/utils/AttList.java
similarity index 100%
rename from src/org/apache/xml/utils/AttList.java
rename to xalan/src/main/java/org/apache/xml/utils/AttList.java
diff --git a/src/org/apache/xml/utils/BoolStack.java b/xalan/src/main/java/org/apache/xml/utils/BoolStack.java
similarity index 100%
rename from src/org/apache/xml/utils/BoolStack.java
rename to xalan/src/main/java/org/apache/xml/utils/BoolStack.java
diff --git a/src/org/apache/xml/utils/Constants.java b/xalan/src/main/java/org/apache/xml/utils/Constants.java
similarity index 100%
rename from src/org/apache/xml/utils/Constants.java
rename to xalan/src/main/java/org/apache/xml/utils/Constants.java
diff --git a/src/org/apache/xml/utils/DOM2Helper.java b/xalan/src/main/java/org/apache/xml/utils/DOM2Helper.java
similarity index 100%
rename from src/org/apache/xml/utils/DOM2Helper.java
rename to xalan/src/main/java/org/apache/xml/utils/DOM2Helper.java
diff --git a/src/org/apache/xml/utils/DOMBuilder.java b/xalan/src/main/java/org/apache/xml/utils/DOMBuilder.java
similarity index 100%
rename from src/org/apache/xml/utils/DOMBuilder.java
rename to xalan/src/main/java/org/apache/xml/utils/DOMBuilder.java
diff --git a/src/org/apache/xml/utils/DOMHelper.java b/xalan/src/main/java/org/apache/xml/utils/DOMHelper.java
similarity index 100%
rename from src/org/apache/xml/utils/DOMHelper.java
rename to xalan/src/main/java/org/apache/xml/utils/DOMHelper.java
diff --git a/src/org/apache/xml/utils/DOMOrder.java b/xalan/src/main/java/org/apache/xml/utils/DOMOrder.java
similarity index 100%
rename from src/org/apache/xml/utils/DOMOrder.java
rename to xalan/src/main/java/org/apache/xml/utils/DOMOrder.java
diff --git a/src/org/apache/xml/utils/DefaultErrorHandler.java b/xalan/src/main/java/org/apache/xml/utils/DefaultErrorHandler.java
similarity index 100%
rename from src/org/apache/xml/utils/DefaultErrorHandler.java
rename to xalan/src/main/java/org/apache/xml/utils/DefaultErrorHandler.java
diff --git a/src/org/apache/xml/utils/ElemDesc.java b/xalan/src/main/java/org/apache/xml/utils/ElemDesc.java
similarity index 100%
rename from src/org/apache/xml/utils/ElemDesc.java
rename to xalan/src/main/java/org/apache/xml/utils/ElemDesc.java
diff --git a/src/org/apache/xml/utils/FastStringBuffer.java b/xalan/src/main/java/org/apache/xml/utils/FastStringBuffer.java
similarity index 100%
rename from src/org/apache/xml/utils/FastStringBuffer.java
rename to xalan/src/main/java/org/apache/xml/utils/FastStringBuffer.java
diff --git a/src/org/apache/xml/utils/Hashtree2Node.java b/xalan/src/main/java/org/apache/xml/utils/Hashtree2Node.java
similarity index 100%
rename from src/org/apache/xml/utils/Hashtree2Node.java
rename to xalan/src/main/java/org/apache/xml/utils/Hashtree2Node.java
diff --git a/src/org/apache/xml/utils/IntStack.java b/xalan/src/main/java/org/apache/xml/utils/IntStack.java
similarity index 100%
rename from src/org/apache/xml/utils/IntStack.java
rename to xalan/src/main/java/org/apache/xml/utils/IntStack.java
diff --git a/src/org/apache/xml/utils/IntVector.java b/xalan/src/main/java/org/apache/xml/utils/IntVector.java
similarity index 100%
rename from src/org/apache/xml/utils/IntVector.java
rename to xalan/src/main/java/org/apache/xml/utils/IntVector.java
diff --git a/src/org/apache/xml/utils/ListingErrorHandler.java b/xalan/src/main/java/org/apache/xml/utils/ListingErrorHandler.java
similarity index 100%
rename from src/org/apache/xml/utils/ListingErrorHandler.java
rename to xalan/src/main/java/org/apache/xml/utils/ListingErrorHandler.java
diff --git a/src/org/apache/xml/utils/LocaleUtility.java b/xalan/src/main/java/org/apache/xml/utils/LocaleUtility.java
similarity index 100%
rename from src/org/apache/xml/utils/LocaleUtility.java
rename to xalan/src/main/java/org/apache/xml/utils/LocaleUtility.java
diff --git a/src/org/apache/xml/utils/MutableAttrListImpl.java b/xalan/src/main/java/org/apache/xml/utils/MutableAttrListImpl.java
similarity index 100%
rename from src/org/apache/xml/utils/MutableAttrListImpl.java
rename to xalan/src/main/java/org/apache/xml/utils/MutableAttrListImpl.java
diff --git a/src/org/apache/xml/utils/NSInfo.java b/xalan/src/main/java/org/apache/xml/utils/NSInfo.java
similarity index 100%
rename from src/org/apache/xml/utils/NSInfo.java
rename to xalan/src/main/java/org/apache/xml/utils/NSInfo.java
diff --git a/src/org/apache/xml/utils/NameSpace.java b/xalan/src/main/java/org/apache/xml/utils/NameSpace.java
similarity index 100%
rename from src/org/apache/xml/utils/NameSpace.java
rename to xalan/src/main/java/org/apache/xml/utils/NameSpace.java
diff --git a/src/org/apache/xml/utils/NamespaceSupport2.java b/xalan/src/main/java/org/apache/xml/utils/NamespaceSupport2.java
similarity index 100%
rename from src/org/apache/xml/utils/NamespaceSupport2.java
rename to xalan/src/main/java/org/apache/xml/utils/NamespaceSupport2.java
diff --git a/src/org/apache/xml/utils/NodeConsumer.java b/xalan/src/main/java/org/apache/xml/utils/NodeConsumer.java
similarity index 100%
rename from src/org/apache/xml/utils/NodeConsumer.java
rename to xalan/src/main/java/org/apache/xml/utils/NodeConsumer.java
diff --git a/src/org/apache/xml/utils/NodeVector.java b/xalan/src/main/java/org/apache/xml/utils/NodeVector.java
similarity index 100%
rename from src/org/apache/xml/utils/NodeVector.java
rename to xalan/src/main/java/org/apache/xml/utils/NodeVector.java
diff --git a/src/org/apache/xml/utils/ObjectFactory.java b/xalan/src/main/java/org/apache/xml/utils/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xml/utils/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xml/utils/ObjectFactory.java
diff --git a/src/org/apache/xml/utils/ObjectPool.java b/xalan/src/main/java/org/apache/xml/utils/ObjectPool.java
similarity index 100%
rename from src/org/apache/xml/utils/ObjectPool.java
rename to xalan/src/main/java/org/apache/xml/utils/ObjectPool.java
diff --git a/src/org/apache/xml/utils/ObjectStack.java b/xalan/src/main/java/org/apache/xml/utils/ObjectStack.java
similarity index 100%
rename from src/org/apache/xml/utils/ObjectStack.java
rename to xalan/src/main/java/org/apache/xml/utils/ObjectStack.java
diff --git a/src/org/apache/xml/utils/ObjectVector.java b/xalan/src/main/java/org/apache/xml/utils/ObjectVector.java
similarity index 100%
rename from src/org/apache/xml/utils/ObjectVector.java
rename to xalan/src/main/java/org/apache/xml/utils/ObjectVector.java
diff --git a/src/org/apache/xml/utils/PrefixResolver.java b/xalan/src/main/java/org/apache/xml/utils/PrefixResolver.java
similarity index 100%
rename from src/org/apache/xml/utils/PrefixResolver.java
rename to xalan/src/main/java/org/apache/xml/utils/PrefixResolver.java
diff --git a/src/org/apache/xml/utils/PrefixResolverDefault.java b/xalan/src/main/java/org/apache/xml/utils/PrefixResolverDefault.java
similarity index 100%
rename from src/org/apache/xml/utils/PrefixResolverDefault.java
rename to xalan/src/main/java/org/apache/xml/utils/PrefixResolverDefault.java
diff --git a/src/org/apache/xml/utils/QName.java b/xalan/src/main/java/org/apache/xml/utils/QName.java
similarity index 100%
rename from src/org/apache/xml/utils/QName.java
rename to xalan/src/main/java/org/apache/xml/utils/QName.java
diff --git a/src/org/apache/xml/utils/RawCharacterHandler.java b/xalan/src/main/java/org/apache/xml/utils/RawCharacterHandler.java
similarity index 100%
rename from src/org/apache/xml/utils/RawCharacterHandler.java
rename to xalan/src/main/java/org/apache/xml/utils/RawCharacterHandler.java
diff --git a/src/org/apache/xml/utils/SAXSourceLocator.java b/xalan/src/main/java/org/apache/xml/utils/SAXSourceLocator.java
similarity index 100%
rename from src/org/apache/xml/utils/SAXSourceLocator.java
rename to xalan/src/main/java/org/apache/xml/utils/SAXSourceLocator.java
diff --git a/src/org/apache/xml/utils/SecuritySupport.java b/xalan/src/main/java/org/apache/xml/utils/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xml/utils/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xml/utils/SecuritySupport.java
diff --git a/src/org/apache/xml/utils/SerializableLocatorImpl.java b/xalan/src/main/java/org/apache/xml/utils/SerializableLocatorImpl.java
similarity index 100%
rename from src/org/apache/xml/utils/SerializableLocatorImpl.java
rename to xalan/src/main/java/org/apache/xml/utils/SerializableLocatorImpl.java
diff --git a/src/org/apache/xml/utils/StopParseException.java b/xalan/src/main/java/org/apache/xml/utils/StopParseException.java
similarity index 100%
rename from src/org/apache/xml/utils/StopParseException.java
rename to xalan/src/main/java/org/apache/xml/utils/StopParseException.java
diff --git a/src/org/apache/xml/utils/StringBufferPool.java b/xalan/src/main/java/org/apache/xml/utils/StringBufferPool.java
similarity index 100%
rename from src/org/apache/xml/utils/StringBufferPool.java
rename to xalan/src/main/java/org/apache/xml/utils/StringBufferPool.java
diff --git a/src/org/apache/xml/utils/StringComparable.java b/xalan/src/main/java/org/apache/xml/utils/StringComparable.java
similarity index 100%
rename from src/org/apache/xml/utils/StringComparable.java
rename to xalan/src/main/java/org/apache/xml/utils/StringComparable.java
diff --git a/src/org/apache/xml/utils/StringToIntTable.java b/xalan/src/main/java/org/apache/xml/utils/StringToIntTable.java
similarity index 100%
rename from src/org/apache/xml/utils/StringToIntTable.java
rename to xalan/src/main/java/org/apache/xml/utils/StringToIntTable.java
diff --git a/src/org/apache/xml/utils/StringToStringTable.java b/xalan/src/main/java/org/apache/xml/utils/StringToStringTable.java
similarity index 100%
rename from src/org/apache/xml/utils/StringToStringTable.java
rename to xalan/src/main/java/org/apache/xml/utils/StringToStringTable.java
diff --git a/src/org/apache/xml/utils/StringToStringTableVector.java b/xalan/src/main/java/org/apache/xml/utils/StringToStringTableVector.java
similarity index 100%
rename from src/org/apache/xml/utils/StringToStringTableVector.java
rename to xalan/src/main/java/org/apache/xml/utils/StringToStringTableVector.java
diff --git a/src/org/apache/xml/utils/StringVector.java b/xalan/src/main/java/org/apache/xml/utils/StringVector.java
similarity index 100%
rename from src/org/apache/xml/utils/StringVector.java
rename to xalan/src/main/java/org/apache/xml/utils/StringVector.java
diff --git a/src/org/apache/xml/utils/StylesheetPIHandler.java b/xalan/src/main/java/org/apache/xml/utils/StylesheetPIHandler.java
similarity index 100%
rename from src/org/apache/xml/utils/StylesheetPIHandler.java
rename to xalan/src/main/java/org/apache/xml/utils/StylesheetPIHandler.java
diff --git a/src/org/apache/xml/utils/SuballocatedByteVector.java b/xalan/src/main/java/org/apache/xml/utils/SuballocatedByteVector.java
similarity index 100%
rename from src/org/apache/xml/utils/SuballocatedByteVector.java
rename to xalan/src/main/java/org/apache/xml/utils/SuballocatedByteVector.java
diff --git a/src/org/apache/xml/utils/SuballocatedIntVector.java b/xalan/src/main/java/org/apache/xml/utils/SuballocatedIntVector.java
similarity index 100%
rename from src/org/apache/xml/utils/SuballocatedIntVector.java
rename to xalan/src/main/java/org/apache/xml/utils/SuballocatedIntVector.java
diff --git a/src/org/apache/xml/utils/SystemIDResolver.java b/xalan/src/main/java/org/apache/xml/utils/SystemIDResolver.java
similarity index 100%
rename from src/org/apache/xml/utils/SystemIDResolver.java
rename to xalan/src/main/java/org/apache/xml/utils/SystemIDResolver.java
diff --git a/src/org/apache/xml/utils/ThreadControllerWrapper.java b/xalan/src/main/java/org/apache/xml/utils/ThreadControllerWrapper.java
similarity index 100%
rename from src/org/apache/xml/utils/ThreadControllerWrapper.java
rename to xalan/src/main/java/org/apache/xml/utils/ThreadControllerWrapper.java
diff --git a/src/org/apache/xml/utils/TreeWalker.java b/xalan/src/main/java/org/apache/xml/utils/TreeWalker.java
similarity index 100%
rename from src/org/apache/xml/utils/TreeWalker.java
rename to xalan/src/main/java/org/apache/xml/utils/TreeWalker.java
diff --git a/src/org/apache/xml/utils/URI.java b/xalan/src/main/java/org/apache/xml/utils/URI.java
similarity index 100%
rename from src/org/apache/xml/utils/URI.java
rename to xalan/src/main/java/org/apache/xml/utils/URI.java
diff --git a/src/org/apache/xml/utils/UnImplNode.java b/xalan/src/main/java/org/apache/xml/utils/UnImplNode.java
similarity index 100%
rename from src/org/apache/xml/utils/UnImplNode.java
rename to xalan/src/main/java/org/apache/xml/utils/UnImplNode.java
diff --git a/src/org/apache/xml/utils/WrappedRuntimeException.java b/xalan/src/main/java/org/apache/xml/utils/WrappedRuntimeException.java
similarity index 100%
rename from src/org/apache/xml/utils/WrappedRuntimeException.java
rename to xalan/src/main/java/org/apache/xml/utils/WrappedRuntimeException.java
diff --git a/src/org/apache/xml/utils/WrongParserException.java b/xalan/src/main/java/org/apache/xml/utils/WrongParserException.java
similarity index 100%
rename from src/org/apache/xml/utils/WrongParserException.java
rename to xalan/src/main/java/org/apache/xml/utils/WrongParserException.java
diff --git a/src/org/apache/xml/utils/XML11Char.java b/xalan/src/main/java/org/apache/xml/utils/XML11Char.java
similarity index 100%
rename from src/org/apache/xml/utils/XML11Char.java
rename to xalan/src/main/java/org/apache/xml/utils/XML11Char.java
diff --git a/src/org/apache/xml/utils/XMLChar.java b/xalan/src/main/java/org/apache/xml/utils/XMLChar.java
similarity index 100%
rename from src/org/apache/xml/utils/XMLChar.java
rename to xalan/src/main/java/org/apache/xml/utils/XMLChar.java
diff --git a/src/org/apache/xml/utils/XMLCharacterRecognizer.java b/xalan/src/main/java/org/apache/xml/utils/XMLCharacterRecognizer.java
similarity index 100%
rename from src/org/apache/xml/utils/XMLCharacterRecognizer.java
rename to xalan/src/main/java/org/apache/xml/utils/XMLCharacterRecognizer.java
diff --git a/src/org/apache/xml/utils/XMLReaderManager.java b/xalan/src/main/java/org/apache/xml/utils/XMLReaderManager.java
similarity index 100%
rename from src/org/apache/xml/utils/XMLReaderManager.java
rename to xalan/src/main/java/org/apache/xml/utils/XMLReaderManager.java
diff --git a/src/org/apache/xml/utils/XMLString.java b/xalan/src/main/java/org/apache/xml/utils/XMLString.java
similarity index 100%
rename from src/org/apache/xml/utils/XMLString.java
rename to xalan/src/main/java/org/apache/xml/utils/XMLString.java
diff --git a/src/org/apache/xml/utils/XMLStringDefault.java b/xalan/src/main/java/org/apache/xml/utils/XMLStringDefault.java
similarity index 100%
rename from src/org/apache/xml/utils/XMLStringDefault.java
rename to xalan/src/main/java/org/apache/xml/utils/XMLStringDefault.java
diff --git a/src/org/apache/xml/utils/XMLStringFactory.java b/xalan/src/main/java/org/apache/xml/utils/XMLStringFactory.java
similarity index 100%
rename from src/org/apache/xml/utils/XMLStringFactory.java
rename to xalan/src/main/java/org/apache/xml/utils/XMLStringFactory.java
diff --git a/src/org/apache/xml/utils/XMLStringFactoryDefault.java b/xalan/src/main/java/org/apache/xml/utils/XMLStringFactoryDefault.java
similarity index 100%
rename from src/org/apache/xml/utils/XMLStringFactoryDefault.java
rename to xalan/src/main/java/org/apache/xml/utils/XMLStringFactoryDefault.java
diff --git a/src/org/apache/xml/utils/package.html b/xalan/src/main/java/org/apache/xml/utils/package.html
similarity index 100%
rename from src/org/apache/xml/utils/package.html
rename to xalan/src/main/java/org/apache/xml/utils/package.html
diff --git a/src/org/apache/xml/utils/res/CharArrayWrapper.java b/xalan/src/main/java/org/apache/xml/utils/res/CharArrayWrapper.java
similarity index 100%
rename from src/org/apache/xml/utils/res/CharArrayWrapper.java
rename to xalan/src/main/java/org/apache/xml/utils/res/CharArrayWrapper.java
diff --git a/src/org/apache/xml/utils/res/IntArrayWrapper.java b/xalan/src/main/java/org/apache/xml/utils/res/IntArrayWrapper.java
similarity index 100%
rename from src/org/apache/xml/utils/res/IntArrayWrapper.java
rename to xalan/src/main/java/org/apache/xml/utils/res/IntArrayWrapper.java
diff --git a/src/org/apache/xml/utils/res/LongArrayWrapper.java b/xalan/src/main/java/org/apache/xml/utils/res/LongArrayWrapper.java
similarity index 100%
rename from src/org/apache/xml/utils/res/LongArrayWrapper.java
rename to xalan/src/main/java/org/apache/xml/utils/res/LongArrayWrapper.java
diff --git a/src/org/apache/xml/utils/res/StringArrayWrapper.java b/xalan/src/main/java/org/apache/xml/utils/res/StringArrayWrapper.java
similarity index 100%
rename from src/org/apache/xml/utils/res/StringArrayWrapper.java
rename to xalan/src/main/java/org/apache/xml/utils/res/StringArrayWrapper.java
diff --git a/src/org/apache/xml/utils/res/XResourceBundle.java b/xalan/src/main/java/org/apache/xml/utils/res/XResourceBundle.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResourceBundle.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResourceBundle.java
diff --git a/src/org/apache/xml/utils/res/XResourceBundleBase.java b/xalan/src/main/java/org/apache/xml/utils/res/XResourceBundleBase.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResourceBundleBase.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResourceBundleBase.java
diff --git a/src/org/apache/xml/utils/res/XResources_cy.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_cy.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_cy.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_cy.java
diff --git a/src/org/apache/xml/utils/res/XResources_de.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_de.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_de.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_de.java
diff --git a/src/org/apache/xml/utils/res/XResources_el.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_el.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_el.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_el.java
diff --git a/src/org/apache/xml/utils/res/XResources_en.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_en.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_en.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_en.java
diff --git a/src/org/apache/xml/utils/res/XResources_es.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_es.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_es.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_es.java
diff --git a/src/org/apache/xml/utils/res/XResources_fr.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_fr.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_fr.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_fr.java
diff --git a/src/org/apache/xml/utils/res/XResources_he.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_he.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_he.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_he.java
diff --git a/src/org/apache/xml/utils/res/XResources_hy.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_hy.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_hy.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_hy.java
diff --git a/src/org/apache/xml/utils/res/XResources_it.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_it.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_it.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_it.java
diff --git a/src/org/apache/xml/utils/res/XResources_ja_JP_A.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_A.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_ja_JP_A.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_A.java
diff --git a/src/org/apache/xml/utils/res/XResources_ja_JP_HA.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HA.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_ja_JP_HA.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HA.java
diff --git a/src/org/apache/xml/utils/res/XResources_ja_JP_HI.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HI.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_ja_JP_HI.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HI.java
diff --git a/src/org/apache/xml/utils/res/XResources_ja_JP_I.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_I.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_ja_JP_I.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_I.java
diff --git a/src/org/apache/xml/utils/res/XResources_ka.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_ka.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_ka.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_ka.java
diff --git a/src/org/apache/xml/utils/res/XResources_ko.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_ko.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_ko.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_ko.java
diff --git a/src/org/apache/xml/utils/res/XResources_sv.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_sv.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_sv.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_sv.java
diff --git a/src/org/apache/xml/utils/res/XResources_zh_CN.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_zh_CN.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_zh_CN.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_zh_CN.java
diff --git a/src/org/apache/xml/utils/res/XResources_zh_TW.java b/xalan/src/main/java/org/apache/xml/utils/res/XResources_zh_TW.java
similarity index 100%
rename from src/org/apache/xml/utils/res/XResources_zh_TW.java
rename to xalan/src/main/java/org/apache/xml/utils/res/XResources_zh_TW.java
diff --git a/src/org/apache/xpath/Arg.java b/xalan/src/main/java/org/apache/xpath/Arg.java
similarity index 100%
rename from src/org/apache/xpath/Arg.java
rename to xalan/src/main/java/org/apache/xpath/Arg.java
diff --git a/src/org/apache/xpath/CachedXPathAPI.java b/xalan/src/main/java/org/apache/xpath/CachedXPathAPI.java
similarity index 100%
rename from src/org/apache/xpath/CachedXPathAPI.java
rename to xalan/src/main/java/org/apache/xpath/CachedXPathAPI.java
diff --git a/src/org/apache/xpath/Expression.java b/xalan/src/main/java/org/apache/xpath/Expression.java
similarity index 100%
rename from src/org/apache/xpath/Expression.java
rename to xalan/src/main/java/org/apache/xpath/Expression.java
diff --git a/src/org/apache/xpath/ExpressionNode.java b/xalan/src/main/java/org/apache/xpath/ExpressionNode.java
similarity index 100%
rename from src/org/apache/xpath/ExpressionNode.java
rename to xalan/src/main/java/org/apache/xpath/ExpressionNode.java
diff --git a/src/org/apache/xpath/ExpressionOwner.java b/xalan/src/main/java/org/apache/xpath/ExpressionOwner.java
similarity index 100%
rename from src/org/apache/xpath/ExpressionOwner.java
rename to xalan/src/main/java/org/apache/xpath/ExpressionOwner.java
diff --git a/src/org/apache/xpath/ExtensionsProvider.java b/xalan/src/main/java/org/apache/xpath/ExtensionsProvider.java
similarity index 100%
rename from src/org/apache/xpath/ExtensionsProvider.java
rename to xalan/src/main/java/org/apache/xpath/ExtensionsProvider.java
diff --git a/src/org/apache/xpath/FoundIndex.java b/xalan/src/main/java/org/apache/xpath/FoundIndex.java
similarity index 100%
rename from src/org/apache/xpath/FoundIndex.java
rename to xalan/src/main/java/org/apache/xpath/FoundIndex.java
diff --git a/src/org/apache/xpath/NodeSet.java b/xalan/src/main/java/org/apache/xpath/NodeSet.java
similarity index 100%
rename from src/org/apache/xpath/NodeSet.java
rename to xalan/src/main/java/org/apache/xpath/NodeSet.java
diff --git a/src/org/apache/xpath/NodeSetDTM.java b/xalan/src/main/java/org/apache/xpath/NodeSetDTM.java
similarity index 100%
rename from src/org/apache/xpath/NodeSetDTM.java
rename to xalan/src/main/java/org/apache/xpath/NodeSetDTM.java
diff --git a/src/org/apache/xpath/SourceTree.java b/xalan/src/main/java/org/apache/xpath/SourceTree.java
similarity index 100%
rename from src/org/apache/xpath/SourceTree.java
rename to xalan/src/main/java/org/apache/xpath/SourceTree.java
diff --git a/src/org/apache/xpath/SourceTreeManager.java b/xalan/src/main/java/org/apache/xpath/SourceTreeManager.java
similarity index 100%
rename from src/org/apache/xpath/SourceTreeManager.java
rename to xalan/src/main/java/org/apache/xpath/SourceTreeManager.java
diff --git a/src/org/apache/xpath/VariableStack.java b/xalan/src/main/java/org/apache/xpath/VariableStack.java
similarity index 100%
rename from src/org/apache/xpath/VariableStack.java
rename to xalan/src/main/java/org/apache/xpath/VariableStack.java
diff --git a/src/org/apache/xpath/WhitespaceStrippingElementMatcher.java b/xalan/src/main/java/org/apache/xpath/WhitespaceStrippingElementMatcher.java
similarity index 100%
rename from src/org/apache/xpath/WhitespaceStrippingElementMatcher.java
rename to xalan/src/main/java/org/apache/xpath/WhitespaceStrippingElementMatcher.java
diff --git a/src/org/apache/xpath/XPath.java b/xalan/src/main/java/org/apache/xpath/XPath.java
similarity index 100%
rename from src/org/apache/xpath/XPath.java
rename to xalan/src/main/java/org/apache/xpath/XPath.java
diff --git a/src/org/apache/xpath/XPathAPI.java b/xalan/src/main/java/org/apache/xpath/XPathAPI.java
similarity index 100%
rename from src/org/apache/xpath/XPathAPI.java
rename to xalan/src/main/java/org/apache/xpath/XPathAPI.java
diff --git a/src/org/apache/xpath/XPathContext.java b/xalan/src/main/java/org/apache/xpath/XPathContext.java
similarity index 100%
rename from src/org/apache/xpath/XPathContext.java
rename to xalan/src/main/java/org/apache/xpath/XPathContext.java
diff --git a/src/org/apache/xpath/XPathException.java b/xalan/src/main/java/org/apache/xpath/XPathException.java
similarity index 100%
rename from src/org/apache/xpath/XPathException.java
rename to xalan/src/main/java/org/apache/xpath/XPathException.java
diff --git a/src/org/apache/xpath/XPathFactory.java b/xalan/src/main/java/org/apache/xpath/XPathFactory.java
similarity index 100%
rename from src/org/apache/xpath/XPathFactory.java
rename to xalan/src/main/java/org/apache/xpath/XPathFactory.java
diff --git a/src/org/apache/xpath/XPathProcessorException.java b/xalan/src/main/java/org/apache/xpath/XPathProcessorException.java
similarity index 100%
rename from src/org/apache/xpath/XPathProcessorException.java
rename to xalan/src/main/java/org/apache/xpath/XPathProcessorException.java
diff --git a/src/org/apache/xpath/XPathVisitable.java b/xalan/src/main/java/org/apache/xpath/XPathVisitable.java
similarity index 100%
rename from src/org/apache/xpath/XPathVisitable.java
rename to xalan/src/main/java/org/apache/xpath/XPathVisitable.java
diff --git a/src/org/apache/xpath/XPathVisitor.java b/xalan/src/main/java/org/apache/xpath/XPathVisitor.java
similarity index 100%
rename from src/org/apache/xpath/XPathVisitor.java
rename to xalan/src/main/java/org/apache/xpath/XPathVisitor.java
diff --git a/src/org/apache/xpath/axes/AttributeIterator.java b/xalan/src/main/java/org/apache/xpath/axes/AttributeIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/AttributeIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/AttributeIterator.java
diff --git a/src/org/apache/xpath/axes/AxesWalker.java b/xalan/src/main/java/org/apache/xpath/axes/AxesWalker.java
similarity index 100%
rename from src/org/apache/xpath/axes/AxesWalker.java
rename to xalan/src/main/java/org/apache/xpath/axes/AxesWalker.java
diff --git a/src/org/apache/xpath/axes/BasicTestIterator.java b/xalan/src/main/java/org/apache/xpath/axes/BasicTestIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/BasicTestIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/BasicTestIterator.java
diff --git a/src/org/apache/xpath/axes/ChildIterator.java b/xalan/src/main/java/org/apache/xpath/axes/ChildIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/ChildIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/ChildIterator.java
diff --git a/src/org/apache/xpath/axes/ChildTestIterator.java b/xalan/src/main/java/org/apache/xpath/axes/ChildTestIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/ChildTestIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/ChildTestIterator.java
diff --git a/src/org/apache/xpath/axes/ContextNodeList.java b/xalan/src/main/java/org/apache/xpath/axes/ContextNodeList.java
similarity index 100%
rename from src/org/apache/xpath/axes/ContextNodeList.java
rename to xalan/src/main/java/org/apache/xpath/axes/ContextNodeList.java
diff --git a/src/org/apache/xpath/axes/DescendantIterator.java b/xalan/src/main/java/org/apache/xpath/axes/DescendantIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/DescendantIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/DescendantIterator.java
diff --git a/src/org/apache/xpath/axes/FilterExprIterator.java b/xalan/src/main/java/org/apache/xpath/axes/FilterExprIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/FilterExprIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/FilterExprIterator.java
diff --git a/src/org/apache/xpath/axes/FilterExprIteratorSimple.java b/xalan/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
similarity index 100%
rename from src/org/apache/xpath/axes/FilterExprIteratorSimple.java
rename to xalan/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
diff --git a/src/org/apache/xpath/axes/FilterExprWalker.java b/xalan/src/main/java/org/apache/xpath/axes/FilterExprWalker.java
similarity index 100%
rename from src/org/apache/xpath/axes/FilterExprWalker.java
rename to xalan/src/main/java/org/apache/xpath/axes/FilterExprWalker.java
diff --git a/src/org/apache/xpath/axes/HasPositionalPredChecker.java b/xalan/src/main/java/org/apache/xpath/axes/HasPositionalPredChecker.java
similarity index 100%
rename from src/org/apache/xpath/axes/HasPositionalPredChecker.java
rename to xalan/src/main/java/org/apache/xpath/axes/HasPositionalPredChecker.java
diff --git a/src/org/apache/xpath/axes/IteratorPool.java b/xalan/src/main/java/org/apache/xpath/axes/IteratorPool.java
similarity index 100%
rename from src/org/apache/xpath/axes/IteratorPool.java
rename to xalan/src/main/java/org/apache/xpath/axes/IteratorPool.java
diff --git a/src/org/apache/xpath/axes/LocPathIterator.java b/xalan/src/main/java/org/apache/xpath/axes/LocPathIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/LocPathIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/LocPathIterator.java
diff --git a/src/org/apache/xpath/axes/MatchPatternIterator.java b/xalan/src/main/java/org/apache/xpath/axes/MatchPatternIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/MatchPatternIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/MatchPatternIterator.java
diff --git a/src/org/apache/xpath/axes/NodeSequence.java b/xalan/src/main/java/org/apache/xpath/axes/NodeSequence.java
similarity index 100%
rename from src/org/apache/xpath/axes/NodeSequence.java
rename to xalan/src/main/java/org/apache/xpath/axes/NodeSequence.java
diff --git a/src/org/apache/xpath/axes/OneStepIterator.java b/xalan/src/main/java/org/apache/xpath/axes/OneStepIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/OneStepIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/OneStepIterator.java
diff --git a/src/org/apache/xpath/axes/OneStepIteratorForward.java b/xalan/src/main/java/org/apache/xpath/axes/OneStepIteratorForward.java
similarity index 100%
rename from src/org/apache/xpath/axes/OneStepIteratorForward.java
rename to xalan/src/main/java/org/apache/xpath/axes/OneStepIteratorForward.java
diff --git a/src/org/apache/xpath/axes/PathComponent.java b/xalan/src/main/java/org/apache/xpath/axes/PathComponent.java
similarity index 100%
rename from src/org/apache/xpath/axes/PathComponent.java
rename to xalan/src/main/java/org/apache/xpath/axes/PathComponent.java
diff --git a/src/org/apache/xpath/axes/PredicatedNodeTest.java b/xalan/src/main/java/org/apache/xpath/axes/PredicatedNodeTest.java
similarity index 100%
rename from src/org/apache/xpath/axes/PredicatedNodeTest.java
rename to xalan/src/main/java/org/apache/xpath/axes/PredicatedNodeTest.java
diff --git a/src/org/apache/xpath/axes/RTFIterator.java b/xalan/src/main/java/org/apache/xpath/axes/RTFIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/RTFIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/RTFIterator.java
diff --git a/src/org/apache/xpath/axes/ReverseAxesWalker.java b/xalan/src/main/java/org/apache/xpath/axes/ReverseAxesWalker.java
similarity index 100%
rename from src/org/apache/xpath/axes/ReverseAxesWalker.java
rename to xalan/src/main/java/org/apache/xpath/axes/ReverseAxesWalker.java
diff --git a/src/org/apache/xpath/axes/SelfIteratorNoPredicate.java b/xalan/src/main/java/org/apache/xpath/axes/SelfIteratorNoPredicate.java
similarity index 100%
rename from src/org/apache/xpath/axes/SelfIteratorNoPredicate.java
rename to xalan/src/main/java/org/apache/xpath/axes/SelfIteratorNoPredicate.java
diff --git a/src/org/apache/xpath/axes/SubContextList.java b/xalan/src/main/java/org/apache/xpath/axes/SubContextList.java
similarity index 100%
rename from src/org/apache/xpath/axes/SubContextList.java
rename to xalan/src/main/java/org/apache/xpath/axes/SubContextList.java
diff --git a/src/org/apache/xpath/axes/UnionChildIterator.java b/xalan/src/main/java/org/apache/xpath/axes/UnionChildIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/UnionChildIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/UnionChildIterator.java
diff --git a/src/org/apache/xpath/axes/UnionPathIterator.java b/xalan/src/main/java/org/apache/xpath/axes/UnionPathIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/UnionPathIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/UnionPathIterator.java
diff --git a/src/org/apache/xpath/axes/WalkerFactory.java b/xalan/src/main/java/org/apache/xpath/axes/WalkerFactory.java
similarity index 100%
rename from src/org/apache/xpath/axes/WalkerFactory.java
rename to xalan/src/main/java/org/apache/xpath/axes/WalkerFactory.java
diff --git a/src/org/apache/xpath/axes/WalkingIterator.java b/xalan/src/main/java/org/apache/xpath/axes/WalkingIterator.java
similarity index 100%
rename from src/org/apache/xpath/axes/WalkingIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/WalkingIterator.java
diff --git a/src/org/apache/xpath/axes/WalkingIteratorSorted.java b/xalan/src/main/java/org/apache/xpath/axes/WalkingIteratorSorted.java
similarity index 100%
rename from src/org/apache/xpath/axes/WalkingIteratorSorted.java
rename to xalan/src/main/java/org/apache/xpath/axes/WalkingIteratorSorted.java
diff --git a/src/org/apache/xpath/axes/package.html b/xalan/src/main/java/org/apache/xpath/axes/package.html
similarity index 100%
rename from src/org/apache/xpath/axes/package.html
rename to xalan/src/main/java/org/apache/xpath/axes/package.html
diff --git a/src/org/apache/xpath/compiler/Compiler.java b/xalan/src/main/java/org/apache/xpath/compiler/Compiler.java
similarity index 100%
rename from src/org/apache/xpath/compiler/Compiler.java
rename to xalan/src/main/java/org/apache/xpath/compiler/Compiler.java
diff --git a/src/org/apache/xpath/compiler/FunctionTable.java b/xalan/src/main/java/org/apache/xpath/compiler/FunctionTable.java
similarity index 100%
rename from src/org/apache/xpath/compiler/FunctionTable.java
rename to xalan/src/main/java/org/apache/xpath/compiler/FunctionTable.java
diff --git a/src/org/apache/xpath/compiler/Keywords.java b/xalan/src/main/java/org/apache/xpath/compiler/Keywords.java
similarity index 100%
rename from src/org/apache/xpath/compiler/Keywords.java
rename to xalan/src/main/java/org/apache/xpath/compiler/Keywords.java
diff --git a/src/org/apache/xpath/compiler/Lexer.java b/xalan/src/main/java/org/apache/xpath/compiler/Lexer.java
similarity index 100%
rename from src/org/apache/xpath/compiler/Lexer.java
rename to xalan/src/main/java/org/apache/xpath/compiler/Lexer.java
diff --git a/src/org/apache/xpath/compiler/OpCodes.java b/xalan/src/main/java/org/apache/xpath/compiler/OpCodes.java
similarity index 100%
rename from src/org/apache/xpath/compiler/OpCodes.java
rename to xalan/src/main/java/org/apache/xpath/compiler/OpCodes.java
diff --git a/src/org/apache/xpath/compiler/OpMap.java b/xalan/src/main/java/org/apache/xpath/compiler/OpMap.java
similarity index 100%
rename from src/org/apache/xpath/compiler/OpMap.java
rename to xalan/src/main/java/org/apache/xpath/compiler/OpMap.java
diff --git a/src/org/apache/xpath/compiler/OpMapVector.java b/xalan/src/main/java/org/apache/xpath/compiler/OpMapVector.java
similarity index 100%
rename from src/org/apache/xpath/compiler/OpMapVector.java
rename to xalan/src/main/java/org/apache/xpath/compiler/OpMapVector.java
diff --git a/src/org/apache/xpath/compiler/PsuedoNames.java b/xalan/src/main/java/org/apache/xpath/compiler/PsuedoNames.java
similarity index 100%
rename from src/org/apache/xpath/compiler/PsuedoNames.java
rename to xalan/src/main/java/org/apache/xpath/compiler/PsuedoNames.java
diff --git a/src/org/apache/xpath/compiler/XPathDumper.java b/xalan/src/main/java/org/apache/xpath/compiler/XPathDumper.java
similarity index 100%
rename from src/org/apache/xpath/compiler/XPathDumper.java
rename to xalan/src/main/java/org/apache/xpath/compiler/XPathDumper.java
diff --git a/src/org/apache/xpath/compiler/XPathParser.java b/xalan/src/main/java/org/apache/xpath/compiler/XPathParser.java
similarity index 100%
rename from src/org/apache/xpath/compiler/XPathParser.java
rename to xalan/src/main/java/org/apache/xpath/compiler/XPathParser.java
diff --git a/src/org/apache/xpath/compiler/package.html b/xalan/src/main/java/org/apache/xpath/compiler/package.html
similarity index 100%
rename from src/org/apache/xpath/compiler/package.html
rename to xalan/src/main/java/org/apache/xpath/compiler/package.html
diff --git a/src/org/apache/xpath/domapi/XPathEvaluatorImpl.java b/xalan/src/main/java/org/apache/xpath/domapi/XPathEvaluatorImpl.java
similarity index 100%
rename from src/org/apache/xpath/domapi/XPathEvaluatorImpl.java
rename to xalan/src/main/java/org/apache/xpath/domapi/XPathEvaluatorImpl.java
diff --git a/src/org/apache/xpath/domapi/XPathExpressionImpl.java b/xalan/src/main/java/org/apache/xpath/domapi/XPathExpressionImpl.java
similarity index 100%
rename from src/org/apache/xpath/domapi/XPathExpressionImpl.java
rename to xalan/src/main/java/org/apache/xpath/domapi/XPathExpressionImpl.java
diff --git a/src/org/apache/xpath/domapi/XPathNSResolverImpl.java b/xalan/src/main/java/org/apache/xpath/domapi/XPathNSResolverImpl.java
similarity index 100%
rename from src/org/apache/xpath/domapi/XPathNSResolverImpl.java
rename to xalan/src/main/java/org/apache/xpath/domapi/XPathNSResolverImpl.java
diff --git a/src/org/apache/xpath/domapi/XPathNamespaceImpl.java b/xalan/src/main/java/org/apache/xpath/domapi/XPathNamespaceImpl.java
similarity index 100%
rename from src/org/apache/xpath/domapi/XPathNamespaceImpl.java
rename to xalan/src/main/java/org/apache/xpath/domapi/XPathNamespaceImpl.java
diff --git a/src/org/apache/xpath/domapi/XPathResultImpl.java b/xalan/src/main/java/org/apache/xpath/domapi/XPathResultImpl.java
similarity index 100%
rename from src/org/apache/xpath/domapi/XPathResultImpl.java
rename to xalan/src/main/java/org/apache/xpath/domapi/XPathResultImpl.java
diff --git a/src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java b/xalan/src/main/java/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java
similarity index 100%
rename from src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java
rename to xalan/src/main/java/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java
diff --git a/src/org/apache/xpath/domapi/package.html b/xalan/src/main/java/org/apache/xpath/domapi/package.html
similarity index 100%
rename from src/org/apache/xpath/domapi/package.html
rename to xalan/src/main/java/org/apache/xpath/domapi/package.html
diff --git a/src/org/apache/xpath/functions/FuncBoolean.java b/xalan/src/main/java/org/apache/xpath/functions/FuncBoolean.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncBoolean.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncBoolean.java
diff --git a/src/org/apache/xpath/functions/FuncCeiling.java b/xalan/src/main/java/org/apache/xpath/functions/FuncCeiling.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncCeiling.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncCeiling.java
diff --git a/src/org/apache/xpath/functions/FuncConcat.java b/xalan/src/main/java/org/apache/xpath/functions/FuncConcat.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncConcat.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncConcat.java
diff --git a/src/org/apache/xpath/functions/FuncContains.java b/xalan/src/main/java/org/apache/xpath/functions/FuncContains.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncContains.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncContains.java
diff --git a/src/org/apache/xpath/functions/FuncCount.java b/xalan/src/main/java/org/apache/xpath/functions/FuncCount.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncCount.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncCount.java
diff --git a/src/org/apache/xpath/functions/FuncCurrent.java b/xalan/src/main/java/org/apache/xpath/functions/FuncCurrent.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncCurrent.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncCurrent.java
diff --git a/src/org/apache/xpath/functions/FuncDoclocation.java b/xalan/src/main/java/org/apache/xpath/functions/FuncDoclocation.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncDoclocation.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncDoclocation.java
diff --git a/src/org/apache/xpath/functions/FuncExtElementAvailable.java b/xalan/src/main/java/org/apache/xpath/functions/FuncExtElementAvailable.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncExtElementAvailable.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncExtElementAvailable.java
diff --git a/src/org/apache/xpath/functions/FuncExtFunction.java b/xalan/src/main/java/org/apache/xpath/functions/FuncExtFunction.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncExtFunction.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncExtFunction.java
diff --git a/src/org/apache/xpath/functions/FuncExtFunctionAvailable.java b/xalan/src/main/java/org/apache/xpath/functions/FuncExtFunctionAvailable.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncExtFunctionAvailable.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncExtFunctionAvailable.java
diff --git a/src/org/apache/xpath/functions/FuncFalse.java b/xalan/src/main/java/org/apache/xpath/functions/FuncFalse.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncFalse.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncFalse.java
diff --git a/src/org/apache/xpath/functions/FuncFloor.java b/xalan/src/main/java/org/apache/xpath/functions/FuncFloor.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncFloor.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncFloor.java
diff --git a/src/org/apache/xpath/functions/FuncGenerateId.java b/xalan/src/main/java/org/apache/xpath/functions/FuncGenerateId.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncGenerateId.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncGenerateId.java
diff --git a/src/org/apache/xpath/functions/FuncId.java b/xalan/src/main/java/org/apache/xpath/functions/FuncId.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncId.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncId.java
diff --git a/src/org/apache/xpath/functions/FuncLang.java b/xalan/src/main/java/org/apache/xpath/functions/FuncLang.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncLang.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncLang.java
diff --git a/src/org/apache/xpath/functions/FuncLast.java b/xalan/src/main/java/org/apache/xpath/functions/FuncLast.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncLast.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncLast.java
diff --git a/src/org/apache/xpath/functions/FuncLocalPart.java b/xalan/src/main/java/org/apache/xpath/functions/FuncLocalPart.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncLocalPart.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncLocalPart.java
diff --git a/src/org/apache/xpath/functions/FuncNamespace.java b/xalan/src/main/java/org/apache/xpath/functions/FuncNamespace.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncNamespace.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncNamespace.java
diff --git a/src/org/apache/xpath/functions/FuncNormalizeSpace.java b/xalan/src/main/java/org/apache/xpath/functions/FuncNormalizeSpace.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncNormalizeSpace.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncNormalizeSpace.java
diff --git a/src/org/apache/xpath/functions/FuncNot.java b/xalan/src/main/java/org/apache/xpath/functions/FuncNot.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncNot.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncNot.java
diff --git a/src/org/apache/xpath/functions/FuncNumber.java b/xalan/src/main/java/org/apache/xpath/functions/FuncNumber.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncNumber.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncNumber.java
diff --git a/src/org/apache/xpath/functions/FuncPosition.java b/xalan/src/main/java/org/apache/xpath/functions/FuncPosition.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncPosition.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncPosition.java
diff --git a/src/org/apache/xpath/functions/FuncQname.java b/xalan/src/main/java/org/apache/xpath/functions/FuncQname.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncQname.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncQname.java
diff --git a/src/org/apache/xpath/functions/FuncRound.java b/xalan/src/main/java/org/apache/xpath/functions/FuncRound.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncRound.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncRound.java
diff --git a/src/org/apache/xpath/functions/FuncStartsWith.java b/xalan/src/main/java/org/apache/xpath/functions/FuncStartsWith.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncStartsWith.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncStartsWith.java
diff --git a/src/org/apache/xpath/functions/FuncString.java b/xalan/src/main/java/org/apache/xpath/functions/FuncString.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncString.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncString.java
diff --git a/src/org/apache/xpath/functions/FuncStringLength.java b/xalan/src/main/java/org/apache/xpath/functions/FuncStringLength.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncStringLength.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncStringLength.java
diff --git a/src/org/apache/xpath/functions/FuncSubstring.java b/xalan/src/main/java/org/apache/xpath/functions/FuncSubstring.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncSubstring.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncSubstring.java
diff --git a/src/org/apache/xpath/functions/FuncSubstringAfter.java b/xalan/src/main/java/org/apache/xpath/functions/FuncSubstringAfter.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncSubstringAfter.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncSubstringAfter.java
diff --git a/src/org/apache/xpath/functions/FuncSubstringBefore.java b/xalan/src/main/java/org/apache/xpath/functions/FuncSubstringBefore.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncSubstringBefore.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncSubstringBefore.java
diff --git a/src/org/apache/xpath/functions/FuncSum.java b/xalan/src/main/java/org/apache/xpath/functions/FuncSum.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncSum.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncSum.java
diff --git a/src/org/apache/xpath/functions/FuncSystemProperty.java b/xalan/src/main/java/org/apache/xpath/functions/FuncSystemProperty.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncSystemProperty.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncSystemProperty.java
diff --git a/src/org/apache/xpath/functions/FuncTranslate.java b/xalan/src/main/java/org/apache/xpath/functions/FuncTranslate.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncTranslate.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncTranslate.java
diff --git a/src/org/apache/xpath/functions/FuncTrue.java b/xalan/src/main/java/org/apache/xpath/functions/FuncTrue.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncTrue.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncTrue.java
diff --git a/src/org/apache/xpath/functions/FuncUnparsedEntityURI.java b/xalan/src/main/java/org/apache/xpath/functions/FuncUnparsedEntityURI.java
similarity index 100%
rename from src/org/apache/xpath/functions/FuncUnparsedEntityURI.java
rename to xalan/src/main/java/org/apache/xpath/functions/FuncUnparsedEntityURI.java
diff --git a/src/org/apache/xpath/functions/Function.java b/xalan/src/main/java/org/apache/xpath/functions/Function.java
similarity index 100%
rename from src/org/apache/xpath/functions/Function.java
rename to xalan/src/main/java/org/apache/xpath/functions/Function.java
diff --git a/src/org/apache/xpath/functions/Function2Args.java b/xalan/src/main/java/org/apache/xpath/functions/Function2Args.java
similarity index 100%
rename from src/org/apache/xpath/functions/Function2Args.java
rename to xalan/src/main/java/org/apache/xpath/functions/Function2Args.java
diff --git a/src/org/apache/xpath/functions/Function3Args.java b/xalan/src/main/java/org/apache/xpath/functions/Function3Args.java
similarity index 100%
rename from src/org/apache/xpath/functions/Function3Args.java
rename to xalan/src/main/java/org/apache/xpath/functions/Function3Args.java
diff --git a/src/org/apache/xpath/functions/FunctionDef1Arg.java b/xalan/src/main/java/org/apache/xpath/functions/FunctionDef1Arg.java
similarity index 100%
rename from src/org/apache/xpath/functions/FunctionDef1Arg.java
rename to xalan/src/main/java/org/apache/xpath/functions/FunctionDef1Arg.java
diff --git a/src/org/apache/xpath/functions/FunctionMultiArgs.java b/xalan/src/main/java/org/apache/xpath/functions/FunctionMultiArgs.java
similarity index 100%
rename from src/org/apache/xpath/functions/FunctionMultiArgs.java
rename to xalan/src/main/java/org/apache/xpath/functions/FunctionMultiArgs.java
diff --git a/src/org/apache/xpath/functions/FunctionOneArg.java b/xalan/src/main/java/org/apache/xpath/functions/FunctionOneArg.java
similarity index 100%
rename from src/org/apache/xpath/functions/FunctionOneArg.java
rename to xalan/src/main/java/org/apache/xpath/functions/FunctionOneArg.java
diff --git a/src/org/apache/xpath/functions/ObjectFactory.java b/xalan/src/main/java/org/apache/xpath/functions/ObjectFactory.java
similarity index 100%
rename from src/org/apache/xpath/functions/ObjectFactory.java
rename to xalan/src/main/java/org/apache/xpath/functions/ObjectFactory.java
diff --git a/src/org/apache/xpath/functions/SecuritySupport.java b/xalan/src/main/java/org/apache/xpath/functions/SecuritySupport.java
similarity index 100%
rename from src/org/apache/xpath/functions/SecuritySupport.java
rename to xalan/src/main/java/org/apache/xpath/functions/SecuritySupport.java
diff --git a/src/org/apache/xpath/functions/WrongNumberArgsException.java b/xalan/src/main/java/org/apache/xpath/functions/WrongNumberArgsException.java
similarity index 100%
rename from src/org/apache/xpath/functions/WrongNumberArgsException.java
rename to xalan/src/main/java/org/apache/xpath/functions/WrongNumberArgsException.java
diff --git a/src/org/apache/xpath/functions/package.html b/xalan/src/main/java/org/apache/xpath/functions/package.html
similarity index 100%
rename from src/org/apache/xpath/functions/package.html
rename to xalan/src/main/java/org/apache/xpath/functions/package.html
diff --git a/src/org/apache/xpath/jaxp/JAXPExtensionsProvider.java b/xalan/src/main/java/org/apache/xpath/jaxp/JAXPExtensionsProvider.java
similarity index 100%
rename from src/org/apache/xpath/jaxp/JAXPExtensionsProvider.java
rename to xalan/src/main/java/org/apache/xpath/jaxp/JAXPExtensionsProvider.java
diff --git a/src/org/apache/xpath/jaxp/JAXPPrefixResolver.java b/xalan/src/main/java/org/apache/xpath/jaxp/JAXPPrefixResolver.java
similarity index 100%
rename from src/org/apache/xpath/jaxp/JAXPPrefixResolver.java
rename to xalan/src/main/java/org/apache/xpath/jaxp/JAXPPrefixResolver.java
diff --git a/src/org/apache/xpath/jaxp/JAXPVariableStack.java b/xalan/src/main/java/org/apache/xpath/jaxp/JAXPVariableStack.java
similarity index 100%
rename from src/org/apache/xpath/jaxp/JAXPVariableStack.java
rename to xalan/src/main/java/org/apache/xpath/jaxp/JAXPVariableStack.java
diff --git a/src/org/apache/xpath/jaxp/XPathExpressionImpl.java b/xalan/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java
similarity index 100%
rename from src/org/apache/xpath/jaxp/XPathExpressionImpl.java
rename to xalan/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java
diff --git a/src/org/apache/xpath/jaxp/XPathFactoryImpl.java b/xalan/src/main/java/org/apache/xpath/jaxp/XPathFactoryImpl.java
similarity index 100%
rename from src/org/apache/xpath/jaxp/XPathFactoryImpl.java
rename to xalan/src/main/java/org/apache/xpath/jaxp/XPathFactoryImpl.java
diff --git a/src/org/apache/xpath/jaxp/XPathImpl.java b/xalan/src/main/java/org/apache/xpath/jaxp/XPathImpl.java
similarity index 100%
rename from src/org/apache/xpath/jaxp/XPathImpl.java
rename to xalan/src/main/java/org/apache/xpath/jaxp/XPathImpl.java
diff --git a/src/org/apache/xpath/objects/DTMXRTreeFrag.java b/xalan/src/main/java/org/apache/xpath/objects/DTMXRTreeFrag.java
similarity index 100%
rename from src/org/apache/xpath/objects/DTMXRTreeFrag.java
rename to xalan/src/main/java/org/apache/xpath/objects/DTMXRTreeFrag.java
diff --git a/src/org/apache/xpath/objects/XBoolean.java b/xalan/src/main/java/org/apache/xpath/objects/XBoolean.java
similarity index 100%
rename from src/org/apache/xpath/objects/XBoolean.java
rename to xalan/src/main/java/org/apache/xpath/objects/XBoolean.java
diff --git a/src/org/apache/xpath/objects/XBooleanStatic.java b/xalan/src/main/java/org/apache/xpath/objects/XBooleanStatic.java
similarity index 100%
rename from src/org/apache/xpath/objects/XBooleanStatic.java
rename to xalan/src/main/java/org/apache/xpath/objects/XBooleanStatic.java
diff --git a/src/org/apache/xpath/objects/XMLStringFactoryImpl.java b/xalan/src/main/java/org/apache/xpath/objects/XMLStringFactoryImpl.java
similarity index 100%
rename from src/org/apache/xpath/objects/XMLStringFactoryImpl.java
rename to xalan/src/main/java/org/apache/xpath/objects/XMLStringFactoryImpl.java
diff --git a/src/org/apache/xpath/objects/XNodeSet.java b/xalan/src/main/java/org/apache/xpath/objects/XNodeSet.java
similarity index 100%
rename from src/org/apache/xpath/objects/XNodeSet.java
rename to xalan/src/main/java/org/apache/xpath/objects/XNodeSet.java
diff --git a/src/org/apache/xpath/objects/XNodeSetForDOM.java b/xalan/src/main/java/org/apache/xpath/objects/XNodeSetForDOM.java
similarity index 100%
rename from src/org/apache/xpath/objects/XNodeSetForDOM.java
rename to xalan/src/main/java/org/apache/xpath/objects/XNodeSetForDOM.java
diff --git a/src/org/apache/xpath/objects/XNull.java b/xalan/src/main/java/org/apache/xpath/objects/XNull.java
similarity index 100%
rename from src/org/apache/xpath/objects/XNull.java
rename to xalan/src/main/java/org/apache/xpath/objects/XNull.java
diff --git a/src/org/apache/xpath/objects/XNumber.java b/xalan/src/main/java/org/apache/xpath/objects/XNumber.java
similarity index 100%
rename from src/org/apache/xpath/objects/XNumber.java
rename to xalan/src/main/java/org/apache/xpath/objects/XNumber.java
diff --git a/src/org/apache/xpath/objects/XObject.java b/xalan/src/main/java/org/apache/xpath/objects/XObject.java
similarity index 100%
rename from src/org/apache/xpath/objects/XObject.java
rename to xalan/src/main/java/org/apache/xpath/objects/XObject.java
diff --git a/src/org/apache/xpath/objects/XObjectFactory.java b/xalan/src/main/java/org/apache/xpath/objects/XObjectFactory.java
similarity index 100%
rename from src/org/apache/xpath/objects/XObjectFactory.java
rename to xalan/src/main/java/org/apache/xpath/objects/XObjectFactory.java
diff --git a/src/org/apache/xpath/objects/XRTreeFrag.java b/xalan/src/main/java/org/apache/xpath/objects/XRTreeFrag.java
similarity index 100%
rename from src/org/apache/xpath/objects/XRTreeFrag.java
rename to xalan/src/main/java/org/apache/xpath/objects/XRTreeFrag.java
diff --git a/src/org/apache/xpath/objects/XRTreeFragSelectWrapper.java b/xalan/src/main/java/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
similarity index 100%
rename from src/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
rename to xalan/src/main/java/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
diff --git a/src/org/apache/xpath/objects/XString.java b/xalan/src/main/java/org/apache/xpath/objects/XString.java
similarity index 100%
rename from src/org/apache/xpath/objects/XString.java
rename to xalan/src/main/java/org/apache/xpath/objects/XString.java
diff --git a/src/org/apache/xpath/objects/XStringForChars.java b/xalan/src/main/java/org/apache/xpath/objects/XStringForChars.java
similarity index 100%
rename from src/org/apache/xpath/objects/XStringForChars.java
rename to xalan/src/main/java/org/apache/xpath/objects/XStringForChars.java
diff --git a/src/org/apache/xpath/objects/XStringForFSB.java b/xalan/src/main/java/org/apache/xpath/objects/XStringForFSB.java
similarity index 100%
rename from src/org/apache/xpath/objects/XStringForFSB.java
rename to xalan/src/main/java/org/apache/xpath/objects/XStringForFSB.java
diff --git a/src/org/apache/xpath/objects/package.html b/xalan/src/main/java/org/apache/xpath/objects/package.html
similarity index 100%
rename from src/org/apache/xpath/objects/package.html
rename to xalan/src/main/java/org/apache/xpath/objects/package.html
diff --git a/src/org/apache/xpath/operations/And.java b/xalan/src/main/java/org/apache/xpath/operations/And.java
similarity index 100%
rename from src/org/apache/xpath/operations/And.java
rename to xalan/src/main/java/org/apache/xpath/operations/And.java
diff --git a/src/org/apache/xpath/operations/Bool.java b/xalan/src/main/java/org/apache/xpath/operations/Bool.java
similarity index 100%
rename from src/org/apache/xpath/operations/Bool.java
rename to xalan/src/main/java/org/apache/xpath/operations/Bool.java
diff --git a/src/org/apache/xpath/operations/Div.java b/xalan/src/main/java/org/apache/xpath/operations/Div.java
similarity index 100%
rename from src/org/apache/xpath/operations/Div.java
rename to xalan/src/main/java/org/apache/xpath/operations/Div.java
diff --git a/src/org/apache/xpath/operations/Equals.java b/xalan/src/main/java/org/apache/xpath/operations/Equals.java
similarity index 100%
rename from src/org/apache/xpath/operations/Equals.java
rename to xalan/src/main/java/org/apache/xpath/operations/Equals.java
diff --git a/src/org/apache/xpath/operations/Gt.java b/xalan/src/main/java/org/apache/xpath/operations/Gt.java
similarity index 100%
rename from src/org/apache/xpath/operations/Gt.java
rename to xalan/src/main/java/org/apache/xpath/operations/Gt.java
diff --git a/src/org/apache/xpath/operations/Gte.java b/xalan/src/main/java/org/apache/xpath/operations/Gte.java
similarity index 100%
rename from src/org/apache/xpath/operations/Gte.java
rename to xalan/src/main/java/org/apache/xpath/operations/Gte.java
diff --git a/src/org/apache/xpath/operations/Lt.java b/xalan/src/main/java/org/apache/xpath/operations/Lt.java
similarity index 100%
rename from src/org/apache/xpath/operations/Lt.java
rename to xalan/src/main/java/org/apache/xpath/operations/Lt.java
diff --git a/src/org/apache/xpath/operations/Lte.java b/xalan/src/main/java/org/apache/xpath/operations/Lte.java
similarity index 100%
rename from src/org/apache/xpath/operations/Lte.java
rename to xalan/src/main/java/org/apache/xpath/operations/Lte.java
diff --git a/src/org/apache/xpath/operations/Minus.java b/xalan/src/main/java/org/apache/xpath/operations/Minus.java
similarity index 100%
rename from src/org/apache/xpath/operations/Minus.java
rename to xalan/src/main/java/org/apache/xpath/operations/Minus.java
diff --git a/src/org/apache/xpath/operations/Mod.java b/xalan/src/main/java/org/apache/xpath/operations/Mod.java
similarity index 100%
rename from src/org/apache/xpath/operations/Mod.java
rename to xalan/src/main/java/org/apache/xpath/operations/Mod.java
diff --git a/src/org/apache/xpath/operations/Mult.java b/xalan/src/main/java/org/apache/xpath/operations/Mult.java
similarity index 100%
rename from src/org/apache/xpath/operations/Mult.java
rename to xalan/src/main/java/org/apache/xpath/operations/Mult.java
diff --git a/src/org/apache/xpath/operations/Neg.java b/xalan/src/main/java/org/apache/xpath/operations/Neg.java
similarity index 100%
rename from src/org/apache/xpath/operations/Neg.java
rename to xalan/src/main/java/org/apache/xpath/operations/Neg.java
diff --git a/src/org/apache/xpath/operations/NotEquals.java b/xalan/src/main/java/org/apache/xpath/operations/NotEquals.java
similarity index 100%
rename from src/org/apache/xpath/operations/NotEquals.java
rename to xalan/src/main/java/org/apache/xpath/operations/NotEquals.java
diff --git a/src/org/apache/xpath/operations/Number.java b/xalan/src/main/java/org/apache/xpath/operations/Number.java
similarity index 100%
rename from src/org/apache/xpath/operations/Number.java
rename to xalan/src/main/java/org/apache/xpath/operations/Number.java
diff --git a/src/org/apache/xpath/operations/Operation.java b/xalan/src/main/java/org/apache/xpath/operations/Operation.java
similarity index 100%
rename from src/org/apache/xpath/operations/Operation.java
rename to xalan/src/main/java/org/apache/xpath/operations/Operation.java
diff --git a/src/org/apache/xpath/operations/Or.java b/xalan/src/main/java/org/apache/xpath/operations/Or.java
similarity index 100%
rename from src/org/apache/xpath/operations/Or.java
rename to xalan/src/main/java/org/apache/xpath/operations/Or.java
diff --git a/src/org/apache/xpath/operations/Plus.java b/xalan/src/main/java/org/apache/xpath/operations/Plus.java
similarity index 100%
rename from src/org/apache/xpath/operations/Plus.java
rename to xalan/src/main/java/org/apache/xpath/operations/Plus.java
diff --git a/src/org/apache/xpath/operations/Quo.java b/xalan/src/main/java/org/apache/xpath/operations/Quo.java
similarity index 100%
rename from src/org/apache/xpath/operations/Quo.java
rename to xalan/src/main/java/org/apache/xpath/operations/Quo.java
diff --git a/src/org/apache/xpath/operations/String.java b/xalan/src/main/java/org/apache/xpath/operations/String.java
similarity index 100%
rename from src/org/apache/xpath/operations/String.java
rename to xalan/src/main/java/org/apache/xpath/operations/String.java
diff --git a/src/org/apache/xpath/operations/UnaryOperation.java b/xalan/src/main/java/org/apache/xpath/operations/UnaryOperation.java
similarity index 100%
rename from src/org/apache/xpath/operations/UnaryOperation.java
rename to xalan/src/main/java/org/apache/xpath/operations/UnaryOperation.java
diff --git a/src/org/apache/xpath/operations/Variable.java b/xalan/src/main/java/org/apache/xpath/operations/Variable.java
similarity index 100%
rename from src/org/apache/xpath/operations/Variable.java
rename to xalan/src/main/java/org/apache/xpath/operations/Variable.java
diff --git a/src/org/apache/xpath/operations/VariableSafeAbsRef.java b/xalan/src/main/java/org/apache/xpath/operations/VariableSafeAbsRef.java
similarity index 100%
rename from src/org/apache/xpath/operations/VariableSafeAbsRef.java
rename to xalan/src/main/java/org/apache/xpath/operations/VariableSafeAbsRef.java
diff --git a/src/org/apache/xpath/operations/package.html b/xalan/src/main/java/org/apache/xpath/operations/package.html
similarity index 100%
rename from src/org/apache/xpath/operations/package.html
rename to xalan/src/main/java/org/apache/xpath/operations/package.html
diff --git a/src/org/apache/xpath/package.html b/xalan/src/main/java/org/apache/xpath/package.html
similarity index 100%
rename from src/org/apache/xpath/package.html
rename to xalan/src/main/java/org/apache/xpath/package.html
diff --git a/src/org/apache/xpath/patterns/ContextMatchStepPattern.java b/xalan/src/main/java/org/apache/xpath/patterns/ContextMatchStepPattern.java
similarity index 100%
rename from src/org/apache/xpath/patterns/ContextMatchStepPattern.java
rename to xalan/src/main/java/org/apache/xpath/patterns/ContextMatchStepPattern.java
diff --git a/src/org/apache/xpath/patterns/FunctionPattern.java b/xalan/src/main/java/org/apache/xpath/patterns/FunctionPattern.java
similarity index 100%
rename from src/org/apache/xpath/patterns/FunctionPattern.java
rename to xalan/src/main/java/org/apache/xpath/patterns/FunctionPattern.java
diff --git a/src/org/apache/xpath/patterns/NodeTest.java b/xalan/src/main/java/org/apache/xpath/patterns/NodeTest.java
similarity index 100%
rename from src/org/apache/xpath/patterns/NodeTest.java
rename to xalan/src/main/java/org/apache/xpath/patterns/NodeTest.java
diff --git a/src/org/apache/xpath/patterns/NodeTestFilter.java b/xalan/src/main/java/org/apache/xpath/patterns/NodeTestFilter.java
similarity index 100%
rename from src/org/apache/xpath/patterns/NodeTestFilter.java
rename to xalan/src/main/java/org/apache/xpath/patterns/NodeTestFilter.java
diff --git a/src/org/apache/xpath/patterns/StepPattern.java b/xalan/src/main/java/org/apache/xpath/patterns/StepPattern.java
similarity index 100%
rename from src/org/apache/xpath/patterns/StepPattern.java
rename to xalan/src/main/java/org/apache/xpath/patterns/StepPattern.java
diff --git a/src/org/apache/xpath/patterns/UnionPattern.java b/xalan/src/main/java/org/apache/xpath/patterns/UnionPattern.java
similarity index 100%
rename from src/org/apache/xpath/patterns/UnionPattern.java
rename to xalan/src/main/java/org/apache/xpath/patterns/UnionPattern.java
diff --git a/src/org/apache/xpath/patterns/package.html b/xalan/src/main/java/org/apache/xpath/patterns/package.html
similarity index 100%
rename from src/org/apache/xpath/patterns/package.html
rename to xalan/src/main/java/org/apache/xpath/patterns/package.html
diff --git a/src/org/apache/xpath/res/XPATHErrorResources.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_ca.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_ca.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_ca.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_ca.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_cs.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_cs.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_cs.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_cs.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_de.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_de.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_de.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_de.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_en.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_en.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_en.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_en.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_es.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_es.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_es.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_es.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_fr.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_fr.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_fr.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_fr.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_hu.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_hu.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_hu.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_hu.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_it.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_it.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_it.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_it.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_ja.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_ja.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_ja.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_ja.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_ko.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_ko.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_ko.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_ko.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_pl.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_pl.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_pl.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_pl.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_pt_BR.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_pt_BR.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_pt_BR.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_pt_BR.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_ru.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_ru.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_ru.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_ru.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_sk.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_sk.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_sk.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_sk.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_sl.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_sl.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_sl.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_sl.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_sv.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_sv.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_sv.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_sv.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_tr.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_tr.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_tr.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_tr.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_zh.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_zh.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_zh.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_zh.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_zh_CN.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_zh_CN.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_zh_CN.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_zh_CN.java
diff --git a/src/org/apache/xpath/res/XPATHErrorResources_zh_TW.java b/xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_zh_TW.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHErrorResources_zh_TW.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHErrorResources_zh_TW.java
diff --git a/src/org/apache/xpath/res/XPATHMessages.java b/xalan/src/main/java/org/apache/xpath/res/XPATHMessages.java
similarity index 100%
rename from src/org/apache/xpath/res/XPATHMessages.java
rename to xalan/src/main/java/org/apache/xpath/res/XPATHMessages.java
diff --git a/src/org/apache/xpath/res/package.html b/xalan/src/main/java/org/apache/xpath/res/package.html
similarity index 100%
rename from src/org/apache/xpath/res/package.html
rename to xalan/src/main/java/org/apache/xpath/res/package.html
diff --git a/src/org/apache/xalan/res/XSLTInfo.properties b/xalan/src/main/resources/org/apache/xalan/res/XSLTInfo.properties
similarity index 100%
rename from src/org/apache/xalan/res/XSLTInfo.properties
rename to xalan/src/main/resources/org/apache/xalan/res/XSLTInfo.properties
diff --git a/src/trax/trax.properties b/xalan/src/main/resources/trax/trax.properties
similarity index 100%
rename from src/trax/trax.properties
rename to xalan/src/main/resources/trax/trax.properties
diff --git a/src/javadocOverview.html b/xalan/src/site/xhtml/javadocOverview.xhtml
similarity index 100%
rename from src/javadocOverview.html
rename to xalan/src/site/xhtml/javadocOverview.xhtml


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org


[xalan-java] 02/02: Deletions, additions, and modifications to complete Maven cut-over.

Posted by jk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jkesselm pushed a commit to branch xalan-java-mvn-refactored
in repository https://gitbox.apache.org/repos/asf/xalan-java.git

commit beb73389025828731a776d3e10de6cecd6bab1fd
Author: kubycsolutions <ke...@kubyc.solutions>
AuthorDate: Sun Oct 22 18:58:13 2023 -0400

    Deletions, additions, and modifications to complete Maven cut-over.
---
 README                                             | 213 +++++++---
 build.bat                                          |  70 ----
 build.sh                                           |  90 -----
 deprecated_build.sh                                |  73 ----
 lib/bcel-6.7.0.jar                                 | Bin 716107 -> 0 bytes
 lib/bsf.jar                                        | Bin 113369 -> 0 bytes
 lib/commons-logging-1.2.jar                        | Bin 61829 -> 0 bytes
 lib/endorsed/xercesImpl.jar                        | Bin 1446149 -> 0 bytes
 lib/endorsed/xml-apis.jar                          | Bin 228394 -> 0 bytes
 lib/javaee-api-5.0-2.jar                           | Bin 753070 -> 0 bytes
 lib/regexp.jar                                     | Bin 29871 -> 0 bytes
 lib/rhino-1.7.14.jar                               | Bin 1383644 -> 0 bytes
 lib/runtime.jar                                    | Bin 7820 -> 0 bytes
 lib/servlet-api-2.5.jar                            | Bin 134133 -> 0 bytes
 mvnbuild.bat                                       |   4 +
 mvnbuild.sh                                        |   4 +
 pom.xml                                            | 217 ++++++++++
 samples/pom.xml                                    | 127 ++++++
 samples/src/main/java/org/apache/xalan/App.java    |  13 +
 .../xalan/samples/ApplyXPath/ApplyXPath.java       |   1 +
 .../xalan/samples/ApplyXPathDOM/ApplyXPathDOM.java |   3 +
 .../samples/CompiledApplet/TransformApplet.java    |   1 +
 .../samples/CompiledBrazil/TransformHandler.java   |   1 +
 .../xalan/samples/CompiledEJB/TransformBean.java   |   1 +
 .../xalan/samples/CompiledEJB/TransformHome.java   |   2 +
 .../xalan/samples/CompiledEJB/TransformRemote.java |   2 +
 .../samples/CompiledEJB/TransformServlet.java      |   2 +
 .../apache/xalan/samples/CompiledJAXP/Compile.java |   1 +
 .../xalan/samples/CompiledJAXP/Transform.java      |   1 +
 .../samples/CompiledServlet/CompileServlet.java    |   2 +
 .../CompiledServlet/TransformationServlet.java     |   3 +-
 .../org/apache/xalan/samples/DOM2DOM/DOM2DOM.java  |   1 +
 .../java/org/apache/xalan/samples/Pipe/Pipe.java   |   1 +
 .../org/apache/xalan/samples/SAX2SAX/SAX2SAX.java  |   1 +
 .../samples/SimpleTransform/SimpleTransform.java   |   1 +
 .../java/org/apache/xalan/samples/Trace/Trace.java |   2 +
 .../samples/TransformThread/TransformThread.java   |   1 +
 .../samples/UseStylesheetPI/UseStylesheetPI.java   |   1 +
 .../UseStylesheetParam/UseStylesheetParam.java     |   2 +-
 .../xalan/samples/UseXMLFilters/UseXMLFilters.java |   1 +
 .../apache/xalan/samples/Validate/Validate.java    |   1 +
 .../xalan/samples/Validate/ValidateXMLInput.java   |   2 +
 .../xalan/samples/XPathAPI/ApplyXPathJAXP.java     |   1 +
 .../XPathAPI/ExtensionFunctionResolver.java        |   1 +
 .../xalan/samples/XPathAPI/ExtensionTest.java      |   1 +
 .../xalan/samples/XPathAPI/XPathResolver.java      |   1 +
 .../apache/xalan/samples/extensions/IntDate.java   |   1 +
 .../apache/xalan/samples/extensions/MyCounter.java |   1 +
 .../sql/extConnection/ExternalConnection.java      |   2 +
 .../apache/xalan/samples/servlet/ApplyXSLT.java    |   2 +-
 .../xalan/samples/servlet/ApplyXSLTException.java  |   2 +-
 .../xalan/samples/servlet/ApplyXSLTListener.java   |   3 +-
 .../xalan/samples/servlet/ApplyXSLTProperties.java |   2 +-
 .../servlet/DefaultApplyXSLTProperties.java        |   2 +-
 .../xalan/samples/servlet/SimpleXSLTServlet.java   |   2 +-
 .../samples/servlet/UseStylesheetParamServlet.java |   2 +-
 .../samples/servlet/XSLTServletWithParams.java     |   3 +-
 .../JAXPTransletMultipleTransformations.java       |   3 +
 .../translets/JAXPTransletOneTransformation.java   |   2 +
 .../xalan/samples/trax/ExampleContentHandler.java  |   2 +
 .../org/apache/xalan/samples/trax/Examples.java    |   2 +
 .../src/site/xhtml/AppletXMLtoHTML/README.xhtml    |   6 +-
 .../xhtml/AppletXMLtoHTML/appletXMLtoHTML.xhtml    |  13 +-
 .../src/site/xhtml/AppletXMLtoHTML/client.xhtml    |  19 +-
 samples/src/site/xhtml/CompiledApplet/index.xhtml  |  12 +-
 samples/src/site/xhtml/CompiledApplet/menu.xhtml   |  23 +-
 .../xhtml/CompiledApplet/singleTransform.xhtml     |   7 +-
 .../src/site/xhtml/CompiledEJB/bottom_frame.xhtml  |   3 +-
 samples/src/site/xhtml/CompiledEJB/index.xhtml     |  12 +-
 samples/src/site/xhtml/CompiledEJB/top_frame.xhtml |  70 ++--
 .../src/test/java/org/apache/xalan/AppTest.java    |  20 +
 samples/tools/xalan2jdoc.jar                       | Bin 0 -> 124095 bytes
 serializer/.classpath                              |  22 +
 serializer/.gitignore                              |   1 +
 serializer/.project                                |  23 ++
 .../.settings/org.eclipse.core.resources.prefs     |   5 +
 serializer/.settings/org.eclipse.jdt.core.prefs    |   8 +
 serializer/.settings/org.eclipse.m2e.core.prefs    |   4 +
 serializer/pom.xml                                 | 110 +++++
 .../org/apache/xml/serializer/Encodings.properties |   0
 .../apache/xml/serializer/HTMLEntities.properties  |   0
 .../org/apache/xml/serializer/Version.src          |   0
 .../apache/xml/serializer/XMLEntities.properties   |   0
 .../apache/xml/serializer/output_html.properties   |   0
 .../apache/xml/serializer/output_text.properties   |   0
 .../xml/serializer/output_unknown.properties       |   0
 .../apache/xml/serializer/output_xml.properties    |   0
 .../org/apache/xml/serializer/package.html         |   0
 .../org/apache/xml/serializer/DOM3Serializer.java  |   5 +-
 .../org/apache/xml/serializer/EmptySerializer.java |  51 ++-
 .../org/apache/xml/serializer/EncodingInfo.java    |  22 +-
 .../xml/serializer/ExtendedContentHandler.java     |  29 +-
 .../xml/serializer/ExtendedLexicalHandler.java     |   2 +-
 .../apache/xml/serializer/NamespaceMappings.java   |  25 +-
 .../xml/serializer/SerializationHandler.java       |  13 +-
 .../java/org/apache/xml/serializer/Serializer.java |   2 +-
 .../org/apache/xml/serializer/SerializerBase.java  |  51 ++-
 .../apache/xml/serializer/SerializerConstants.java |   8 +-
 .../apache/xml/serializer/SerializerFactory.java   |  20 +-
 .../apache/xml/serializer/ToHTMLSAXHandler.java    |  28 +-
 .../org/apache/xml/serializer/ToHTMLStream.java    |  48 +--
 .../org/apache/xml/serializer/ToSAXHandler.java    |   8 +-
 .../java/org/apache/xml/serializer/ToStream.java   |  77 ++--
 .../apache/xml/serializer/ToTextSAXHandler.java    |  10 +-
 .../org/apache/xml/serializer/ToTextStream.java    |  18 +-
 .../org/apache/xml/serializer/ToUnknownStream.java |   4 +-
 .../org/apache/xml/serializer/ToXMLSAXHandler.java |  18 +-
 .../org/apache/xml/serializer/ToXMLStream.java     |  21 +-
 .../xml/serializer/TransformStateSetter.java       |   4 +-
 .../java/org/apache/xml/serializer/TreeWalker.java |  15 +-
 .../org/apache/xml/serializer/Version.java}        |  22 +-
 .../apache/xml/serializer/XSLOutputAttributes.java |   6 +-
 .../xml/serializer/dom3/DOM3SerializerImpl.java    |   2 +-
 .../xml/serializer/dom3/LSSerializerImpl.java      |   4 +-
 .../xml/serializer/dom3/NamespaceSupport.java      |  93 +++--
 .../org/apache/xml/serializer/package.html         |   0
 .../org/apache/xml/serializer/utils/BoolStack.java |   2 +-
 .../org/apache/xml/serializer/utils/XML11Char.java |  22 +-
 .../org/apache/xml/serializer/utils/XMLChar.java   |  36 +-
 serializer/tools/xalan2jdoc.jar                    | Bin 0 -> 124095 bytes
 serializer/tools/xalan2jtaglet.jar                 | Bin 0 -> 2701 bytes
 .../org/apache/xalan/Version.java                  |  29 +-
 .../apache/xalan/xsltc/util/JavaCupRedirect.java   |  97 -----
 src/xml-commons-external-1.3.02-src.tar.gz         | Bin 311599 -> 0 bytes
 stylebook/sources/entities.src                     | 117 ++++++
 stylebook/sources/xalan/DONE                       |   0
 stylebook/sources/xalan/xalan-collate.xml          | 107 +++++
 stylebook/style/dtd/blocks.ent                     |  40 ++
 stylebook/style/dtd/book.dtd                       |  49 +++
 stylebook/style/dtd/changes.dtd                    |  24 ++
 stylebook/style/dtd/characters.ent                 | 297 ++++++++++++++
 stylebook/style/dtd/document.dtd                   |  19 +
 stylebook/style/dtd/faqs.dtd                       |  19 +
 stylebook/style/dtd/links.ent                      |  24 ++
 stylebook/style/dtd/markup.ent                     |  21 +
 stylebook/style/graphics/button-a.gif              | Bin 0 -> 179 bytes
 stylebook/style/graphics/button-b.gif              | Bin 0 -> 154 bytes
 stylebook/style/loader.xml                         |   9 +
 stylebook/style/resources/bottom.gif               | Bin 0 -> 1075 bytes
 stylebook/style/resources/button-asf-hi.gif        | Bin 0 -> 1535 bytes
 stylebook/style/resources/button-asf-lo.gif        | Bin 0 -> 1519 bytes
 stylebook/style/resources/button-w3c-hi.gif        | Bin 0 -> 1503 bytes
 stylebook/style/resources/button-w3c-lo.gif        | Bin 0 -> 1495 bytes
 stylebook/style/resources/button-xml-hi.gif        | Bin 0 -> 1464 bytes
 stylebook/style/resources/button-xml-lo.gif        | Bin 0 -> 1458 bytes
 stylebook/style/resources/close.gif                | Bin 0 -> 498 bytes
 stylebook/style/resources/dot.gif                  | Bin 0 -> 49 bytes
 stylebook/style/resources/join.gif                 | Bin 0 -> 1268 bytes
 stylebook/style/resources/line.gif                 | Bin 0 -> 924 bytes
 stylebook/style/resources/logo.gif                 | Bin 0 -> 3223 bytes
 stylebook/style/resources/note.gif                 | Bin 0 -> 295 bytes
 stylebook/style/resources/right.gif                | Bin 0 -> 1202 bytes
 stylebook/style/resources/script.js                |  21 +
 stylebook/style/resources/separator.gif            | Bin 0 -> 110 bytes
 stylebook/style/resources/void.gif                 | Bin 0 -> 49 bytes
 stylebook/style/stylesheets/any2header.xsl         |  29 ++
 stylebook/style/stylesheets/any2project.xsl        |  21 +
 stylebook/style/stylesheets/book2group.xsl         |  34 ++
 stylebook/style/stylesheets/book2project.xsl       | 257 ++++++++++++
 stylebook/style/stylesheets/changes2document.xsl   |  43 ++
 stylebook/style/stylesheets/context2footer.xsl     |  29 ++
 stylebook/style/stylesheets/context2label.xsl      |  25 ++
 stylebook/style/stylesheets/directory2project.xsl  |  34 ++
 stylebook/style/stylesheets/document2html.xsl      | 445 +++++++++++++++++++++
 stylebook/style/stylesheets/done.xsl               | 132 +++---
 stylebook/style/stylesheets/faqs2document.xsl      |  65 +++
 stylebook/style/stylesheets/group2document.xsl     |  31 ++
 stylebook_docgen.bat                               |  56 +++
 stylebook_docgen.sh                                |  55 +++
 tools/JLex.jar                                     | Bin 54603 -> 0 bytes
 tools/ant.jar                                      | Bin 717666 -> 0 bytes
 tools/antRun                                       |   9 -
 tools/antRun.bat                                   |  36 --
 tools/java_cup.jar                                 | Bin 62365 -> 0 bytes
 xalan/.classpath                                   |  33 ++
 xalan/.gitignore                                   |   1 +
 xalan/.project                                     |  23 ++
 xalan/.settings/org.eclipse.core.resources.prefs   |   7 +
 xalan/.settings/org.eclipse.jdt.core.prefs         |   8 +
 xalan/.settings/org.eclipse.m2e.core.prefs         |   4 +
 xalan/pom.xml                                      | 225 +++++++++++
 xalan/src/main/java/MANIFEST.SERIALIZER            |  20 +
 .../src/main/java/org/apache/xalan/Version.java    |  29 +-
 .../java/org/apache/xalan/lib/ExsltStrings.java    |  20 +-
 .../main/java/org/apache/xalan/lib/Extensions.java |   4 +-
 .../java/org/apache/xalan/lib/PipeDocument.java    |   4 +-
 .../main/java/org/apache/xalan/lib/Redirect.java   |  54 +--
 .../xalan/processor/ProcessorExsltFunction.java    |  11 +-
 .../org/apache/xalan/processor/ProcessorKey.java   |   6 +-
 .../org/apache/xalan/processor/ProcessorLRE.java   |   1 +
 .../xalan/processor/ProcessorNamespaceAlias.java   |   6 +-
 .../xalan/processor/ProcessorPreserveSpace.java    |   4 +-
 .../xalan/processor/ProcessorStripSpace.java       |   4 +-
 .../processor/ProcessorStylesheetElement.java      |   1 +
 .../apache/xalan/processor/StylesheetHandler.java  |   3 +-
 .../xalan/processor/TransformerFactoryImpl.java    |  10 +-
 .../xalan/processor/XSLTElementProcessor.java      |  13 +-
 .../org/apache/xalan/res/XSLTErrorResources.java   |   2 +-
 .../apache/xalan/res/XSLTErrorResources_ca.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_cs.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_de.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_es.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_fr.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_hu.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_it.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_ja.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_ko.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_pl.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_pt_BR.java |   2 +-
 .../apache/xalan/res/XSLTErrorResources_ru.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_sk.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_sl.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_tr.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_zh.java    |   2 +-
 .../apache/xalan/res/XSLTErrorResources_zh_TW.java |   2 +-
 .../apache/xalan/serialize/SerializerFactory.java  |   2 +-
 .../apache/xalan/serialize/SerializerUtils.java    |  30 +-
 .../xalan/templates/DecimalFormatProperties.java   |   8 +-
 .../apache/xalan/templates/ElemApplyImport.java    |   4 +-
 .../org/apache/xalan/templates/ElemAttribute.java  |   6 +-
 .../apache/xalan/templates/ElemAttributeSet.java   |   6 +-
 .../apache/xalan/templates/ElemCallTemplate.java   |   6 +-
 .../org/apache/xalan/templates/ElemChoose.java     |   4 +-
 .../org/apache/xalan/templates/ElemComment.java    |   4 +-
 .../java/org/apache/xalan/templates/ElemCopy.java  |   6 +-
 .../org/apache/xalan/templates/ElemCopyOf.java     |   4 +-
 .../org/apache/xalan/templates/ElemElement.java    |   6 +-
 .../org/apache/xalan/templates/ElemFallback.java   |   4 +-
 .../org/apache/xalan/templates/ElemForEach.java    |  14 +-
 .../java/org/apache/xalan/templates/ElemIf.java    |   6 +-
 .../org/apache/xalan/templates/ElemMessage.java    |   6 +-
 .../org/apache/xalan/templates/ElemNumber.java     |   6 +-
 .../org/apache/xalan/templates/ElemOtherwise.java  |   4 +-
 .../java/org/apache/xalan/templates/ElemPI.java    |   6 +-
 .../java/org/apache/xalan/templates/ElemParam.java |   6 +-
 .../java/org/apache/xalan/templates/ElemSort.java  |  10 +-
 .../org/apache/xalan/templates/ElemTemplate.java   |   8 +-
 .../xalan/templates/ElemTemplateElement.java       |  38 +-
 .../java/org/apache/xalan/templates/ElemText.java  |  10 +-
 .../apache/xalan/templates/ElemTextLiteral.java    |   4 +-
 .../org/apache/xalan/templates/ElemValueOf.java    |  10 +-
 .../org/apache/xalan/templates/ElemVariable.java   |   6 +-
 .../java/org/apache/xalan/templates/ElemWhen.java  |   6 +-
 .../org/apache/xalan/templates/ElemWithParam.java  |   6 +-
 .../org/apache/xalan/templates/Stylesheet.java     |  16 +-
 .../xalan/transformer/TreeWalker2Result.java       |   1 +
 .../java/org/apache/xalan/xsltc/compiler/xpath.lex | 118 +++---
 .../main/java/org/apache/xml/res/XMLMessages.java  |   2 +-
 .../main/java/org/apache/xml/utils/BoolStack.java  |   2 +-
 .../main/java/org/apache/xml/utils/IntStack.java   |   1 -
 .../java/org/apache/xml/utils/ObjectStack.java     |   1 -
 .../main/java/org/apache/xml/utils/UnImplNode.java | 185 +++++----
 .../main/java/org/apache/xpath/ExpressionNode.java |  18 +-
 .../xpath/WhitespaceStrippingElementMatcher.java   |   2 +-
 .../org/apache/xpath/axes/LocPathIterator.java     |   2 +-
 .../apache/xpath/axes/OneStepIteratorForward.java  |   2 +-
 xalan/src/site/resources/images/compilation.gif    | Bin 0 -> 13454 bytes
 xalan/src/site/resources/images/conceptual.gif     | Bin 0 -> 45017 bytes
 xalan/src/site/resources/images/data.gif           | Bin 0 -> 59498 bytes
 xalan/src/site/resources/images/org_apache.gif     | Bin 0 -> 976 bytes
 xalan/src/site/resources/images/trax.gif           | Bin 0 -> 11435 bytes
 xalan/src/site/resources/images/xalan1_1x1.gif     | Bin 0 -> 12782 bytes
 xalan/src/site/resources/images/xmllogo.gif        | Bin 0 -> 2367 bytes
 xalan/src/site/resources/images/xpath.gif          | Bin 0 -> 9798 bytes
 xalan/src/site/resources/images/xslt_abstract.gif  | Bin 0 -> 9036 bytes
 xalan/src/site/xhtml/design2_0_0.xhtml             | 277 +++++++++++++
 xalan/src/site/xhtml/javadocOverview.xhtml         |   4 +-
 .../xhtml/org/apache/xalan/client/package.xhtml    |   8 +-
 .../org/apache/xalan/extensions/package.xhtml      |   8 +-
 .../site/xhtml/org/apache/xalan/lib/package.xhtml  |   7 +-
 .../xhtml/org/apache/xalan/lib/sql/package.xhtml   |  91 +++++
 .../xhtml/org/apache/xalan/processor/package.xhtml |  41 ++
 .../site/xhtml/org/apache/xalan/res/package.xhtml  |   8 +-
 .../xhtml/org/apache/xalan/templates/package.xhtml |  43 ++
 .../xhtml/org/apache/xalan/trace/package.xhtml     |   8 +-
 .../org/apache/xalan/transformer/package.xhtml     |  39 ++
 .../site/xhtml/org/apache/xalan/xslt/package.xhtml |   8 +-
 .../site/xhtml/org/apache/xml/utils/package.xhtml  |   9 +-
 .../site/xhtml/org/apache/xpath/axes/package.xhtml |   9 +-
 .../xhtml/org/apache/xpath/compiler/package.xhtml  |   8 +-
 .../xhtml/org/apache/xpath/domapi/package.xhtml    |   8 +-
 .../xhtml/org/apache/xpath/functions/package.xhtml |  11 +-
 .../xhtml/org/apache/xpath/objects/package.xhtml   |   9 +-
 .../org/apache/xpath/operations/package.xhtml      |   8 +-
 .../src/site/xhtml/org/apache/xpath/package.xhtml  |   9 +-
 .../xhtml/org/apache/xpath/patterns/package.xhtml  |   8 +-
 .../site/xhtml/org/apache/xpath/res/package.xhtml  |   8 +-
 xalan/tools/xalan2jdoc.jar                         | Bin 0 -> 124095 bytes
 xalan/tools/xalan2jtaglet.jar                      | Bin 0 -> 2701 bytes
 xalan2jtaglet/pom.xml                              |  80 ++++
 .../src/main/java/xalan2jtaglet/XSLUsage.java      |  49 +++
 .../src/main/java/xalan2jtaglet/XSLUsageTag.java   |  89 +++++
 292 files changed, 4701 insertions(+), 1337 deletions(-)

diff --git a/README b/README
index 0fd73e9d..59b949ae 100644
--- a/README
+++ b/README
@@ -14,110 +14,201 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-
+Apache Xalan-Java Build, Test, and Release Notes
 Copyright 1999-2023 The Apache Software Foundation
 
 Authors:
    Gary Gregory <gg...@apache.org>
-   Joe Kesselman
+   Joe Kesselman <jk...@apache.org>
    Mukul Gandhi <mu...@apache.org>
 
-This file primarily, contains instructions to the person(s) who shall be making an Apache XalanJ 
-release for distribution, along with the instructions about how to test XalanJ release before 
-recommending the release for distribution.
+This document's primarily focused on building artifacts for production
+releases of the Apache Xalan-J XSLT processor, but may be helpful for
+others working with Xalan's source.
+
+(0) Prerequisites
+
+Official Xalan builds are currently being performed using Maven
+version 6.3.6 and a Java 1.8 Development Kit. We recommend Eclipse
+Temurun for the latter; it is available from
+https://adoptium.net/temurin/releases/?version=8. Be sure to install
+the JDK, not just the JRE.
+
+The xalan tests, however, are still relying on Apache Ant. You can
+obtain this from https://ant.apache.org/bindownload.cgi. I have been
+testing with Ant 1.10.12, but have successfully built with 1.9.16 as
+well.
 
-The details mentioned within this file, may also be used, by XalanJ source distribution users to 
-build and test XalanJ from the source distribution (except that, "git clone" steps as mentioned 
-within this file, might not be required to be run by XalanJ source distribution users).
 
 (1) Steps to build the XalanJ release
 
-1) Do a git clone, of the relevant XalanJ branches:
+1.1) Obtain the source for XalanJ and its test package.
+
+"Source Distribution" jarfiles are available which contain a snapshot
+of a particular release of the source code; extracting them with "jar
+-xf" will yield the xalan-java and xalan-test directories.
+
+Or (usually preferred) you can use "git clone" to obtain these from
+either github.com. or gitbox.apache.org. New development takes place
+on the branch currently called "master", which git will fetch by default:
+
+  git clone https://github.com/apache/xalan-java.git
+  git clone https://github.com/apache/xalan-test.git
+
+(In the past this code was hosted at gitbox.apache.org, but that now
+redirects to the github copy.)
+
+If you want to build a specific release rather than the development
+version, you can obtain that by adding the release's branch name to
+the git clone operation. For example, to get the code released as
+version 2.7.1, you would issue the command
+
+  git clone https://github.com/apache/xalan-java.git --single-branch --branch xalan-j_2_7_1
+
+There will also usually be a _maint branch, which is used for development and testing of "hot fixes" that will be made available as new point releases (for example, 2.7.1.1). You would access this as
+
+  git clone https://github.com/apache/xalan-java.git --single-branch --branch xalan-j_2_7_1_maint
 
-git clone --single-branch https://gitbox.apache.org/repos/asf/xalan-java.git -b xalan-j_2_7_1_maint
+Whether you perform the git clone operations or unpack the source
+distribution jarfiles, each produces its own folder: xalan-java and
+xalan-test. Since xalan-test looks for code to be tested via the path
+../xalan-java, these will need to be children of the same parent
+directory for the tests to run.
 
-git clone https://gitbox.apache.org/repos/asf/xalan-test.git
 
-This creates two folders: xalan-java and xalan-test. These folders need to be parallel to
-each other, to be able to follow the XalanJ build and tests steps as described in this document,
-for making a XalanJ release for distribution.
+1.2) Set JAVA_HOME and ANT_HOME environment variable. On Linux, assuming
+a standard installation of the JDK with the "alternatives" tooling,
+the easiest way to be sure you have the right JDK may be to use the
+command
 
-2) Set JAVA_HOME and ANT_HOME environment variables, for example on Windows:
+  export ANT_HOME=/usr/share/ant	
+  export JAVA_HOME=$(readlink -f /etc/alternatives/java_sdk_1.8.0)
 
-set JAVA_HOME=C:\Program Files\Eclipse Adoptium\jdk-8.0.352.8-hotspot\
+On Windows, you will probably need to set these more explicitly, and add them to your PATH:
 
-set ANT_HOME=C:\java\apache-ant-1.10.12
+  set ANT_HOME=C:\path\to\your\installed\apache-ant-
+  set JAVA_HOME=C:\Program Files\Eclipse Adoptium\jdk-8.0.352.8-hotspot\
+  set PATH=%JAVA_HOME%;%ANT_HOME%;%PATH%
 
-3) Run the command, "build clean fulldist" from folder xalan-java.
 
-For XalanJ source distribution users, this command needs to be run from, the root 
-of the XalanJ source distribution folder (i.e, from the source distribution folder, 
-which contains folders "src", "tools" etc).
+1.3) Go to the xalan-java source directory (i.e, from the source
+distribution folder, which contains folders "src", "tools" etc), and
+from there run the clean-and-distribution-build command:
 
-(2) Steps to run the XalanJ tests, on XalanJ implementation
+   On Linux, run ./mvnbuild.sh
+   On Windows, run ./mvnbuild.bat
 
-Note that, for XalanJ source distribution users, XalanJ implementation shall be 
-produced (that XalanJ source distribution users, might want to test) by running 
-the build command "build clean fulldist" from the root of the XalanJ source 
-distribution folder.
+This will build:
+   ./target/site/apidocs: Javadoc for the Xalan code base
 
-1) Go to the XalanJ tests repos's, local git clone folder:
-cd ..\xalan-test
+   ./target/site/design: Architecture documentation for Xalan
+     (probably outdated)
 
-For XalanJ source distribution users, xalan-test folder is located at the root of the XalanJ 
-source distribution folder (i.e, parallel to folders "src", "tools" etc within the main XalanJ 
-codebase folder location), from where XalanJ source distribution users may run XalanJ 
-tests, by using the "build" script located at this folder location.
+   ./target/site/xsltc: Architecture documentation for the Xalan bytecode
+     compilation operations (probably outdated)
 
-2) Set JAVA_HOME and ANT_HOME environment variables, for example:
+   ./build/*.jar: Executable jarfiles for the XML Serializer, the Xalan
+     XSLT Processor, some old xsltc samples and the @xsl.usage taglet
+     we used in producing the Javadoc/apidocs (see above).
 
-set JAVA_HOME=C:\Program Files\Eclipse Adoptium\jdk-8.0.352.8-hotspot\
+1.4) IMPORTANT: Until we get xalan-test updated, you will need to go to the
+xalan-java/build directory and manually copy or rename the jarfiles to
+remove the version number:
 
-set ANT_HOME=C:\java\apache-ant-1.10.12
+       Linux: 
+           mv xalan-*.jar xalan.jar
+	   mv serializer-*.jar serializer.jar
+       Windows: 
+           ren xalan-*.jar xalan.jar
+	   ren serializer-*.jar serializer.jar
 
-3) Run the command "build clean jar" from folder xalan-test. This produces
-the file testxsl.jar that acts as main XalanJ test driver, within folder xalan-test/java/build.
 
-4) Run the necessary XalanJ tests as follows,
+(2) Steps to run the XalanJ tests, assuming you have already build
+xalan-java as discussed above:
 
-The tests described below within points 4.1, 4.2, 4.3 need to be run from folder xalan-test. 
+2.1) Go to the xalan-tests local folder. If you have cloned xalan-java
+and xalan-test from Git, it will be a sibling of xalan-java.
 
-4.1 Run the ant target "smoketest", using following two commands in sequence shown below
+BUT: For XalanJ source distribution users, the xalan-test folder is
+shipped as a child of the xalan-java source folder (i.e, parallel to
+folders "src", "tools" etc within the main XalanJ codebase folder
+location). In theory you *should* be able to run the tests directly
+from here, but if you run into trouble try moving xalan-test up to be
+a sibling of xalan-java.
 
-build extensions.classes
+2.2) Ensure the JAVA_HOME, ANT_HOME, and (on Windows) PATH environment
+variables have been set as discussed above.
 
-build smoketest
+2.3) Go to the xalan-test folder, and from there run a clean source
+build. Unfortunately we don't currently have a single target for this,
+so you need to spell out some of the supporting packages:
 
-The final result of the command "build smoketest" should be following,
+  Linux: ./build.sh clean jar extensions.classes bugzilla.classes jira.classes
+  Windows: build clean jar extensions.classes bugzilla.classes jira.classes
+
+The jar target builds the main XalanJ test driver, testxsl.jar, which
+acts as main XalanJ test driver. The .classes targets build supporting
+code specific to testing XSLT Extensions or some old issues reported
+via Bugzilla or (more recently) Jira.
+
+
+2.4) From the xalan-test directory, you can run the necessary XalanJ
+tests as follows:
+
+2.4.1) The most important test set is smoketest. This exercises all
+the testcases known to work in Apache Xalan-J, while avoiding some
+which have open issues against them.
+
+Make sure you have built the jar and extensions.classes, as
+above. Then, from the xalan-test directory:
+
+  Linux: ./build.sh smoketest
+  Windows: build smoketest
+
+At the end of the test run, smoketest should report:
 
 smoketest-pass:
      [echo]  [minitest] CONGRATULATIONS! The Smoketest passed!
-     
-4.2 Run the ant target "apitest", using following command
 
-build apitest
 
-The final result of the command "build apitest" should be following,
+2.4.2) Run the ant target "apitest", using following command
+
+  Linux: ./build.sh apitest
+  Windows: build apitest
+
+At the end of the test run, apitest should report:
 
 apitest-pass-file-check:
      [echo]  [minitest] CONGRATULATIONS! The api tests passed!     
 
-4.3 Run the ant target "conf.xsltc", using the following command 
 
-build conf.xsltc
+2.4.3) Run the ant target "conf.xsltc", using the following command 
 
-The final result of the command "build conf.xsltc" should be following,
+  Linux: ./build.sh conf.xsltc
+  Windows: build conf.xsltc
 
-[echo]  [minitest] CONGRATULATIONS! The conf.xsltc tests passed!
-
-The XalanJ XSLTC processor, producing compiled translets, is known to have certain issues 
-as summarized by the following jira tickets, for the respective mentioned XalanJ conf.xsltc 
-test cases as mentioned below (users shall currently see, these xalanj test cases as failing, 
-within the test build conf.xsltc's output).
+At the end of the test run, conf.xsltc should report:
 
-1) output63         https://issues.apache.org/jira/browse/XALANJ-2642
-2) idkey49          https://issues.apache.org/jira/browse/XALANJ-2640
-3) math111          https://issues.apache.org/jira/browse/XALANJ-2641
-4) whitespace35     https://issues.apache.org/jira/browse/XALANJ-2643
+[echo]  [minitest] CONGRATULATIONS! The conf.xsltc tests passed!
 
-These XSLT transformation issues, do not exist with the XalanJ interpretive processor.
+PLEASE NOTE that XSLTC has some known issues, which will cause FAIL
+reports during this test. These are not considered regressions, and
+are specialcased so conf.xsltc reports "passed" despite them. There
+are Jira tickets open to address these bugs, and when fixes become
+available we will again insist that these tests pass.
+
+   output63         https://issues.apache.org/jira/browse/XALANJ-2642
+   idkey49          https://issues.apache.org/jira/browse/XALANJ-2640
+   math111          https://issues.apache.org/jira/browse/XALANJ-2641
+   whitespace35     https://issues.apache.org/jira/browse/XALANJ-2643
+
+2.4.4) Other test targets exist, which are either subsets of the above
+or are considered less essential for regression testing. You may want
+to read through the build.xml file to find them. NOTE that one target,
+"api", is currently missing, which causes the "all" target to fail; we
+need to clean that up at some point.
+
+2.5) When bugs are reported, tests should be added (at least to the
+jira test set) to demonstrate the problem. When bugs are fixed, those
+tests should be migrated either to the appropriate category or to the
+"contrib" bucket if they don't fit nicely anywhere else. If the bug report was in error, the test demonstrating the (correct but unexpected) behavior may be either discarded, or moved as above if we think it's a useful illustration.
\ No newline at end of file
diff --git a/build.bat b/build.bat
deleted file mode 100644
index 25c89b86..00000000
--- a/build.bat
+++ /dev/null
@@ -1,70 +0,0 @@
-@echo off
-rem
-rem ==========================================================================
-rem = Licensed to the Apache Software Foundation (ASF) under one or more
-rem = contributor license agreements.  See the NOTICE file distributed with
-rem = this work for additional information regarding copyright ownership.
-rem = The ASF licenses this file to You under the Apache License, Version 2.0
-rem = (the "License"); you may not use this file except in compliance with
-rem = the License.  You may obtain a copy of the License at
-rem =
-rem =     http://www.apache.org/licenses/LICENSE-2.0
-rem =
-rem = Unless required by applicable law or agreed to in writing, software
-rem = distributed under the License is distributed on an "AS IS" BASIS,
-rem = WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem = See the License for the specific language governing permissions and
-rem = limitations under the License.
-rem ==========================================================================
-rem
-rem     build.bat: Build Xalan-J 2.x using Ant
-rem     Author: XalanJ team
-rem 
-rem     Usage: build [ant-options] [targets]
-rem
-rem     Setup:
-rem        1) You must set JAVA_HOME
-rem
-rem        2) You can set ANT_HOME if you use your own Ant install
-
-echo.
-echo Xalan-J 2.x Build
-echo -----------------
-
-if "%JAVA_HOME%"=="" goto noJavaHome
-
-if exist "%JAVA_HOME%\lib\tools.jar" (
-   set _CLASSPATH=%JAVA_HOME%\lib\tools.jar
-)
-
-set _JAVACMD=%JAVA_HOME%\bin\java
-
-rem Default ANT_HOME to the one what user has set
-if not "%ANT_HOME%"=="" set _ANT_HOME=%ANT_HOME%
-if "%ANT_HOME%"=="" set _ANT_HOME=.
-
-if exist "%_ANT_HOME%\tools\ant.jar" (
-   set _ANT_JARS=%_ANT_HOME%\tools\ant.jar
-) else (
-   set _ANT_JARS=%_ANT_HOME%\lib\ant.jar;%_ANT_HOME%\lib\ant-launcher.jar
-)
-
-set _CLASSPATH=%_CLASSPATH%;%_ANT_JARS%
-
-set XERCES_ENDORSED_DIR_PATH=lib\endorsed
-
-@echo on
-"%_JAVACMD%" -mx1024m -Djava.endorsed.dirs=%XERCES_ENDORSED_DIR_PATH% -classpath "%_CLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
-@echo off
-
-goto end
-
-:noJavaHome
-echo Warning: JAVA_HOME environment variable is not set
-
-:end
-rem Cleanup environment variables
-set _JAVACMD=
-set _CLASSPATH=
-set _ANT_HOME=
-set _ANT_JARS=
diff --git a/build.sh b/build.sh
deleted file mode 100644
index 4f7ac97c..00000000
--- a/build.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-#
-#=========================================================================
-# Copyright 2001-2023 The Apache Software Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=========================================================================
-#
-#	Name:   build.sh
-#	Author: Joe Kesselman
-#		Fresh port from Mukul Gandhi's revised build.bat.
-#		WARNING: This currently does not include the hooks needed
-#		to make the script compatable with cygwin (unix/Linux shell
-#		and commands ported to run under Windows). See 
-#		deprecated_build.sh to see how we handled the cygwin
-#		syntax differences back in 2001. These days, Windows users
-#		are more likely to use WSL, which simplifies matters.
-
-#	See:	build.xml
-
-#	Setup:
-#          1) You must set JAVA_HOME, for example,
-#	      $ export JAVA_HOME=/etc/alternatives/java_sdk
-
-#          2) You can set ANT_HOME if you use your own Ant install, for example,
-#	      $ export ANT_HOME=/usr/share/ant
-
-echo
-echo Xalan-J test automation build
-echo -----------------------------
-
-if [ "$1" = "-h" ]; then 
-    echo build.sh - executes Xalan Java-based test automation
-    echo   Usage:   build [target] [-D options]
-    echo   Example: build api -DtestClass=TransformerAPITest -Dqetest.loggingLevel=30
-    echo
-    echo You MUST export the JAVA_HOME environment variable to point to the JDK
-    echo You CAN export ANT_HOME environment variable if you use your own Ant install
-
-    exit 1
-fi
-
-if [ "$JAVA_HOME" = "" ]; then 
-    echo Warning: JAVA_HOME environment variable is not exported
-    echo You may have meant to set it to /etc/alternatives/java_sdk
-    exit 1
-fi
-
-if [ -f "$JAVA_HOME/lib/tools.jar" ]; then
-    CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/tools.jar
-fi
-
-JAVACMD=$JAVA_HOME/bin/java
-
-CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/tools.jar
-
-# Since Linux has scoped environments, we don't need explicit temporary vars.
-# Default is to use a copy of ant bundled with xalan-java.
-if [ "$ANT_HOME" = "" ]; then 
-    ANT_HOME=.
-fi
-
-# Check user's ANT_HOME to make sure it actually has what we need
-if [ -f "$ANT_HOME/tools/ant.jar" ]; then
-    ANT_JARS=$ANT_HOME/tools/ant.jar
-else
-    ANT_JARS=$ANT_HOME/lib/ant.jar:$ANT_HOME/lib/ant-launcher.jar
-fi
-
-CLASSPATH=$CLASSPATH:$ANT_JARS
-
-XERCES_ENDORSED_DIR_PATH=lib/endorsed
-
-XALAN_BUILD_DIR_PATH=../xalan-java/build:../build
-
-# Reminder: Note $* versus $@ distinction
-echo Running:$JAVACMD  -mx1024m -Djava.endorsed.dirs=$XERCES_ENDORSED_DIR_PATH -classpath "$CLASSPATH" org.apache.tools.ant.Main "$@"
-$JAVACMD  -mx1024m -Djava.endorsed.dirs=$XERCES_ENDORSED_DIR_PATH -classpath "$CLASSPATH" org.apache.tools.ant.Main "$@"
-
-echo "build.sh complete!"
diff --git a/deprecated_build.sh b/deprecated_build.sh
deleted file mode 100644
index e21d6e13..00000000
--- a/deprecated_build.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-#=========================================================================
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=========================================================================
-#
-#	Name:   build.sh Build Xalan-J 2.x using Ant
-#	Author: Shane Curcuru
-
-# Alternatively, you can just call "ant" 
-
-echo "Xalan-J 2.x Build"
-echo "-------------"
-
-_JAVACMD=$JAVA_HOME/bin/java
-if [ "$JAVA_HOME" = "" ] ; then
-    echo "Warning: JAVA_HOME environment variable is not set."
-    _JAVACMD=java
-fi
-
-# Default locations of jars we depend on to run Ant on our build.xml file
-if [ "$ANT_HOME" = "" ] ; then
-    ANT_HOME=.
-fi
-if [ "$ANT_JAR" = "" ] ; then
-    ANT_JAR=./tools/ant.jar
-fi
-if [ "$PARSER_JAR" = "" ] ; then
-    PARSER_JAR=./lib/endorsed/xercesImpl.jar
-fi
-
-if [ "$XML_APIS_JAR" = "" ] ; then
-    XML_APIS_JAR=./lib/endorsed/xml-apis.jar
-fi
-
-# Use _underscore prefix to not conflict with user's settings
-# Default to UNIX-style pathing
-CLPATHSEP=:
-# if we're on a Windows box make it ;
-uname | grep WIN && CLPATHSEP=\;
-_CLASSPATH="$ANT_JAR${CLPATHSEP}$XML_APIS_JAR${CLPATHSEP}$PARSER_JAR${CLPATHSEP}$CLASSPATH"
-
-# Attempt to automatically add system classes to _CLASSPATH
-if [ -f $JAVA_HOME/lib/tools.jar ] ; then
-  _CLASSPATH=${_CLASSPATH}${CLPATHSEP}${JAVA_HOME}/lib/tools.jar
-fi
-
-if [ -f $JAVA_HOME/lib/classes.zip ] ; then
-  _CLASSPATH=${_CLASSPATH}${CLPATHSEP}${JAVA_HOME}/lib/classes.zip
-fi
-
-
-echo "Starting Ant with targets: $@"
-echo "        ...with classpath: $_CLASSPATH"
-
-"$_JAVACMD" $JAVA_OPTS -Dant.home=$ANT_HOME -classpath "$_CLASSPATH" org.apache.tools.ant.Main $@
-
-
-
-
diff --git a/lib/bcel-6.7.0.jar b/lib/bcel-6.7.0.jar
deleted file mode 100644
index fb36e1d3..00000000
Binary files a/lib/bcel-6.7.0.jar and /dev/null differ
diff --git a/lib/bsf.jar b/lib/bsf.jar
deleted file mode 100644
index 30289673..00000000
Binary files a/lib/bsf.jar and /dev/null differ
diff --git a/lib/commons-logging-1.2.jar b/lib/commons-logging-1.2.jar
deleted file mode 100644
index 93a3b9f6..00000000
Binary files a/lib/commons-logging-1.2.jar and /dev/null differ
diff --git a/lib/endorsed/xercesImpl.jar b/lib/endorsed/xercesImpl.jar
deleted file mode 100644
index ccbae9f4..00000000
Binary files a/lib/endorsed/xercesImpl.jar and /dev/null differ
diff --git a/lib/endorsed/xml-apis.jar b/lib/endorsed/xml-apis.jar
deleted file mode 100644
index 4f677fc8..00000000
Binary files a/lib/endorsed/xml-apis.jar and /dev/null differ
diff --git a/lib/javaee-api-5.0-2.jar b/lib/javaee-api-5.0-2.jar
deleted file mode 100644
index 65acd770..00000000
Binary files a/lib/javaee-api-5.0-2.jar and /dev/null differ
diff --git a/lib/regexp.jar b/lib/regexp.jar
deleted file mode 100644
index 713441c5..00000000
Binary files a/lib/regexp.jar and /dev/null differ
diff --git a/lib/rhino-1.7.14.jar b/lib/rhino-1.7.14.jar
deleted file mode 100644
index ad47a201..00000000
Binary files a/lib/rhino-1.7.14.jar and /dev/null differ
diff --git a/lib/runtime.jar b/lib/runtime.jar
deleted file mode 100644
index c74baf19..00000000
Binary files a/lib/runtime.jar and /dev/null differ
diff --git a/lib/servlet-api-2.5.jar b/lib/servlet-api-2.5.jar
deleted file mode 100644
index b0537c4d..00000000
Binary files a/lib/servlet-api-2.5.jar and /dev/null differ
diff --git a/mvnbuild.bat b/mvnbuild.bat
new file mode 100755
index 00000000..c55ac9c9
--- /dev/null
+++ b/mvnbuild.bat
@@ -0,0 +1,4 @@
+call mvn clean package site source:jar source:test-jar
+call ./stylebook_docgen.bat
+rem move stylebook_docgen into toplevel pom.xml?
+
diff --git a/mvnbuild.sh b/mvnbuild.sh
new file mode 100755
index 00000000..13bbe0d1
--- /dev/null
+++ b/mvnbuild.sh
@@ -0,0 +1,4 @@
+mvn clean package site source:jar source:test-jar
+./stylebook_docgen.sh
+# move stylebook_docgen into toplevel pom.xml?
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..6753a37e
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <packaging>pom</packaging>
+  <!-- KNOWN ISSUES:
+	"Production" jar/tar files?
+	stylebook (currenly, see stylebook.docgen.sh)
+       
+       xalan-test compatibility/success/submodule
+
+       NOTE: To get dependency tree from a multi-module project, use the 
+       command "mvn compile dependency:tree" so everything is in scope.
+  -->
+  
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>xalan</groupId>
+  <artifactId>xalan-project</artifactId>
+  <version>2.7.3</version>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <modules>
+    <module>serializer</module>
+    <module>xalan</module>
+    <module>samples</module>
+    <module>xalan2jtaglet</module>
+  </modules>
+
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <resources>
+      <resource>
+	<directory>META-INF</directory>
+	<includes>
+	  <include>LICENSE.txt</include>
+	  <include>NOTICE.txt</include>
+	</includes>
+      </resource>
+      <resource>
+	<directory>resources</directory>
+	<includes>
+	  <include>**/*.properties</include>
+	</includes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+	<artifactId>maven-compiler-plugin</artifactId>
+	<version>3.8.1</version>
+	<configuration>
+	  <source>1.8</source>
+	  <target>1.8</target>
+	</configuration>
+      </plugin>
+
+      <!--
+	  https://maven.apache.org/plugins/maven-shade-plugin/examples/includes-excludes.html -->
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-shade-plugin</artifactId>
+	<version>3.5.0</version>
+	<executions>
+	  <execution>
+	    <phase>package</phase>
+	    <goals>
+	      <goal>shade</goal>
+	    </goals>
+	    <configuration>
+	      <artifactSet>
+		<excludes>
+		  <!-- Their examples -->
+		  <exclude>junit:junit</exclude>
+		  <exclude>jmock:*</exclude>
+		  <exclude>*:xml-apis</exclude>
+		  <exclude>org.apache.maven:lib:tests</exclude>
+		  <!-- What I think I need to exclude -->
+		  <exclude>com.github.vbmacher:java-cup</exclude>
+		  <exclude>commons-logging:commons-logging</exclude>
+		  <!-- Fighting to excluse javax/script/... -->
+		  <exclude>javax:*</exclude>
+		</excludes>
+	      </artifactSet>
+	    </configuration>
+	  </execution>
+	</executions>
+      </plugin>
+
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-site-plugin</artifactId>
+	<version>3.7.1</version>
+      </plugin>
+
+      <!-- Maven finds this without assistance, but grumbles about
+	   unspecified plugin version, so... -->
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-project-info-reports-plugin</artifactId>
+	<version>3.4.5</version>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>             
+            <id>copy-artifact</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>${project.artifactId}</artifactId>
+                  <version>${project.version}</version>
+                  <type>${project.packaging}</type>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>../build</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.6.0</version>
+	<configuration>
+
+	  <!-- Mute "missing" javadoc errors. We have lots of 'em, and
+	       they're a distraction from simply getting the Maven
+	       build up and running. Open a jira task to fix this
+	       later. GONK. -->
+	  <doclint>none</doclint>
+
+	  <groups>
+            <group>
+	      <title>XPath</title>
+	      <packages>org.apache.xpath*</packages>
+	    </group>
+            <group>
+	      <title>Document Table Model (DTM)</title>
+	      <packages>org.apache.xml.dtm*</packages>
+	    </group>          
+            <group>
+	      <title>Utilities</title>
+	      <packages>org.apache.xml.utils*</packages>
+	    </group>
+            <group>
+	      <title>Xalan Other</title>
+	      <packages>org.apache.xalan.client:org:org.apache.xalan.extensions:org.apache.xalan.res:org.apache.xalan.stree:org.apache.xalan.trace:org.apache.xalan.xslt</packages>
+	    </group>
+            <group>
+	      <title>Xalan Extensions</title>
+	      <packages>org.apache.xalan.lib*</packages>
+	    </group>
+            <group>
+	      <title>Serializers</title>
+	      <packages>org.apache.xml.serialize*:org.apache.xalan.serialize</packages>
+	    </group>
+            <group>
+	      <title>SAX 2</title>
+	      <packages>org.xml.sax*</packages>
+	    </group>
+            <group>
+	      <title>DOM 2</title>
+	      <packages>org.w3c.dom*</packages>
+	    </group>
+            <group>
+	      <title>XSLTC Core</title>
+	      <packages>org.apache.xalan.xsltc*</packages>
+	    </group>
+	  </groups>
+
+	  <!-- Locally provided taglet; see xalan2jtaglet module -->
+	  <taglets>
+            <taglet>
+	      <tagletClass>xalan2jtaglet.XSLUsageTag</tagletClass>
+	    </taglet>
+	  </taglets>
+	  <tagletArtifact>
+	    <groupId>xalan</groupId>
+	    <artifactId>xalan2jtaglet</artifactId>
+	    <version>2.7.3</version>
+	  </tagletArtifact>
+
+	</configuration>
+
+        <reportSets>
+          <reportSet>
+            <id>aggregate</id>
+            <inherited>false</inherited>        
+            <reports>
+              <report>aggregate</report>
+            </reports>
+          </reportSet>
+          <reportSet>
+            <id>default</id>
+            <reports>
+              <report>javadoc</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+</project>
diff --git a/samples/pom.xml b/samples/pom.xml
new file mode 100644
index 00000000..2fce6e67
--- /dev/null
+++ b/samples/pom.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>xalan-project</artifactId>
+    <groupId>xalan</groupId>
+    <version>2.7.3</version>
+  </parent>
+
+  <artifactId>samples</artifactId>
+  <name>Apache Xalan-Java Samples</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>serializer</artifactId>
+      <version>2.7.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.3</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- https://mvnrepository.com/artifact/javax.servlet/servlet-api -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version> <!-- jakata servlet is at 6.0 -->
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- https://mvnrepository.com/artifact/javax.ejb/ejb-api -->
+    <dependency>
+      <groupId>javax.ejb</groupId>
+      <artifactId>ejb-api</artifactId>
+      <version>3.0</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- https://mvnrepository.com/artifact/xerces/xercesImpl -->
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- It isn't clear whether, or where, the Brazil server code
+	 is avalable on Maven. And I suspect the right answer is
+	 really to eliminate use of it in favor of more modern
+	 solutions. But Sun used it in their XSLTC samples, and
+	 for now I'll just continue carrying a local (ugh) copy.
+	 -->
+    <dependency>
+      <groupId>sunlabs</groupId>
+      <artifactId>brazil</artifactId>
+      <version>2.1</version>
+      <scope>system</scope>
+      <systemPath>${basedir}/lib/brazil-2.1.jar</systemPath>
+    </dependency>
+
+    <!-- https://mvnrepository.com/artifact/org.jboss.spec.javax.rmi/jboss-rmi-api_1.0_spec -->
+    <dependency>
+      <groupId>org.jboss.spec.javax.rmi</groupId>
+      <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+      <version>1.0.6.Final</version>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!--
+	  https://maven.apache.org/plugins/maven-shade-plugin/examples/includes-excludes.html -->
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-shade-plugin</artifactId>
+	<version>3.5.0</version>
+	<executions>
+	  <execution>
+	    <phase>package</phase>
+	    <goals>
+	      <goal>shade</goal>
+	    </goals>
+	    <configuration>
+	      <artifactSet>
+		<excludes>
+		  <!-- Their examples (testing) -->
+		  <exclude>junit:junit</exclude>
+		  <exclude>jmock:*</exclude>
+		  <exclude>org.apache.maven:lib:tests</exclude>
+		  <!-- What I think I need to exclude.
+		       Some are direct dependencies, some come in
+		       via maven packages. -->
+		  <exclude>com.github.vbmacher:java-cup</exclude>
+		  <exclude>commons-logging:commons-logging</exclude>
+		  <exclude>org.apache.commons:commons-lang3</exclude>
+		  <exclude>org.apache.ant:ant</exclude>
+		  <exclude>org.apache.ant:ant-launcher</exclude>
+		  <exclude>xalan:serializer</exclude>
+		  <exclude>de.jflex:jflex</exclude>	
+		</excludes>
+	      </artifactSet>
+	    </configuration>
+	  </execution>
+	</executions>
+      </plugin>
+  </plugins>
+  </build>
+</project>
diff --git a/samples/src/main/java/org/apache/xalan/App.java b/samples/src/main/java/org/apache/xalan/App.java
new file mode 100644
index 00000000..b1d7b04e
--- /dev/null
+++ b/samples/src/main/java/org/apache/xalan/App.java
@@ -0,0 +1,13 @@
+package org.apache.xalan.samples;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}
diff --git a/samples/src/main/java/org/apache/xalan/samples/ApplyXPath/ApplyXPath.java b/samples/src/main/java/org/apache/xalan/samples/ApplyXPath/ApplyXPath.java
index fe8478f9..222cfe4e 100644
--- a/samples/src/main/java/org/apache/xalan/samples/ApplyXPath/ApplyXPath.java
+++ b/samples/src/main/java/org/apache/xalan/samples/ApplyXPath/ApplyXPath.java
@@ -19,6 +19,7 @@
  * $Id$
  */
 // This file uses 4 space indents, no tabs.
+package org.apache.xalan.samples.ApplyXPath;
 
 import java.io.FileInputStream;
 import java.io.OutputStreamWriter;
diff --git a/samples/src/main/java/org/apache/xalan/samples/ApplyXPathDOM/ApplyXPathDOM.java b/samples/src/main/java/org/apache/xalan/samples/ApplyXPathDOM/ApplyXPathDOM.java
index 7ebb1d26..244eff06 100644
--- a/samples/src/main/java/org/apache/xalan/samples/ApplyXPathDOM/ApplyXPathDOM.java
+++ b/samples/src/main/java/org/apache/xalan/samples/ApplyXPathDOM/ApplyXPathDOM.java
@@ -20,6 +20,9 @@
  */
 // This file uses 4 space indents, no tabs.
 
+package org.apache.xalan.samples.ApplyXPathDOM;
+
+
 import java.io.FileInputStream;
 import java.io.OutputStreamWriter;
 
diff --git a/samples/src/main/java/org/apache/xalan/samples/CompiledApplet/TransformApplet.java b/samples/src/main/java/org/apache/xalan/samples/CompiledApplet/TransformApplet.java
index 52baa1b1..b1cc0433 100644
--- a/samples/src/main/java/org/apache/xalan/samples/CompiledApplet/TransformApplet.java
+++ b/samples/src/main/java/org/apache/xalan/samples/CompiledApplet/TransformApplet.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.CompiledApplet;
 
 import java.applet.Applet;
 
diff --git a/samples/src/main/java/org/apache/xalan/samples/CompiledBrazil/TransformHandler.java b/samples/src/main/java/org/apache/xalan/samples/CompiledBrazil/TransformHandler.java
index 530f6bce..23f354b6 100644
--- a/samples/src/main/java/org/apache/xalan/samples/CompiledBrazil/TransformHandler.java
+++ b/samples/src/main/java/org/apache/xalan/samples/CompiledBrazil/TransformHandler.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.CompiledBrazil;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformBean.java b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformBean.java
index 592fc99e..c2da697a 100644
--- a/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformBean.java
+++ b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformBean.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.CompiledEJB;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformHome.java b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformHome.java
index 9451c1c6..c2404c17 100644
--- a/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformHome.java
+++ b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformHome.java
@@ -18,6 +18,8 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.CompiledEJB;
+
 
 import java.rmi.RemoteException;
 
diff --git a/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformRemote.java b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformRemote.java
index 14b29947..71622dfd 100644
--- a/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformRemote.java
+++ b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformRemote.java
@@ -18,6 +18,8 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.CompiledEJB;
+
 
 import java.rmi.RemoteException;
 
diff --git a/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformServlet.java b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformServlet.java
index 55391709..79fd09b4 100644
--- a/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformServlet.java
+++ b/samples/src/main/java/org/apache/xalan/samples/CompiledEJB/TransformServlet.java
@@ -18,6 +18,8 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.CompiledEJB;
+
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/Compile.java b/samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/Compile.java
index a2c08b35..64c0ee1c 100644
--- a/samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/Compile.java
+++ b/samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/Compile.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.CompiledJAXP;
 
 import javax.xml.transform.Templates;
 import javax.xml.transform.TransformerFactory;
diff --git a/samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/Transform.java b/samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/Transform.java
index da9ac396..fb3a7c60 100644
--- a/samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/Transform.java
+++ b/samples/src/main/java/org/apache/xalan/samples/CompiledJAXP/Transform.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.CompiledJAXP;
 
 import java.io.OutputStreamWriter;
 
diff --git a/samples/src/main/java/org/apache/xalan/samples/CompiledServlet/CompileServlet.java b/samples/src/main/java/org/apache/xalan/samples/CompiledServlet/CompileServlet.java
index 0f2dca8c..24c2f321 100644
--- a/samples/src/main/java/org/apache/xalan/samples/CompiledServlet/CompileServlet.java
+++ b/samples/src/main/java/org/apache/xalan/samples/CompiledServlet/CompileServlet.java
@@ -18,6 +18,8 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.CompiledServlet;
+
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/samples/src/main/java/org/apache/xalan/samples/CompiledServlet/TransformationServlet.java b/samples/src/main/java/org/apache/xalan/samples/CompiledServlet/TransformationServlet.java
index 67c13da1..b95cf2d2 100644
--- a/samples/src/main/java/org/apache/xalan/samples/CompiledServlet/TransformationServlet.java
+++ b/samples/src/main/java/org/apache/xalan/samples/CompiledServlet/TransformationServlet.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.CompiledServlet;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -48,7 +49,7 @@ import org.xml.sax.SAXException;
  * @author Morten Jorgensen
  * @author Jacek Ambroziak
  */
-public final class TransformServlet extends HttpServlet {
+public final class TransformationServlet extends HttpServlet {
 
     /**
      * Main servlet entry point
diff --git a/samples/src/main/java/org/apache/xalan/samples/DOM2DOM/DOM2DOM.java b/samples/src/main/java/org/apache/xalan/samples/DOM2DOM/DOM2DOM.java
index 8e9c82a4..afb0e0fd 100644
--- a/samples/src/main/java/org/apache/xalan/samples/DOM2DOM/DOM2DOM.java
+++ b/samples/src/main/java/org/apache/xalan/samples/DOM2DOM/DOM2DOM.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.DOM2DOM;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/samples/src/main/java/org/apache/xalan/samples/Pipe/Pipe.java b/samples/src/main/java/org/apache/xalan/samples/Pipe/Pipe.java
index 798c243f..c783581d 100644
--- a/samples/src/main/java/org/apache/xalan/samples/Pipe/Pipe.java
+++ b/samples/src/main/java/org/apache/xalan/samples/Pipe/Pipe.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.Pipe;
 
 import java.io.IOException;
 
diff --git a/samples/src/main/java/org/apache/xalan/samples/SAX2SAX/SAX2SAX.java b/samples/src/main/java/org/apache/xalan/samples/SAX2SAX/SAX2SAX.java
index bbcd4022..0f878dd9 100644
--- a/samples/src/main/java/org/apache/xalan/samples/SAX2SAX/SAX2SAX.java
+++ b/samples/src/main/java/org/apache/xalan/samples/SAX2SAX/SAX2SAX.java
@@ -24,6 +24,7 @@
  *  Replicate the SimpleTransform sample, explicitly using the SAX model to handle the
  *  stylesheet, the XML input, and the transformation.
  */
+package org.apache.xalan.samples.SAX2SAX;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/samples/src/main/java/org/apache/xalan/samples/SimpleTransform/SimpleTransform.java b/samples/src/main/java/org/apache/xalan/samples/SimpleTransform/SimpleTransform.java
index fbb1ca0c..33679f50 100644
--- a/samples/src/main/java/org/apache/xalan/samples/SimpleTransform/SimpleTransform.java
+++ b/samples/src/main/java/org/apache/xalan/samples/SimpleTransform/SimpleTransform.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.SimpleTransform;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
diff --git a/samples/src/main/java/org/apache/xalan/samples/Trace/Trace.java b/samples/src/main/java/org/apache/xalan/samples/Trace/Trace.java
index 05d90e77..dd621c32 100644
--- a/samples/src/main/java/org/apache/xalan/samples/Trace/Trace.java
+++ b/samples/src/main/java/org/apache/xalan/samples/Trace/Trace.java
@@ -18,6 +18,8 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.Trace;
+
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
diff --git a/samples/src/main/java/org/apache/xalan/samples/TransformThread/TransformThread.java b/samples/src/main/java/org/apache/xalan/samples/TransformThread/TransformThread.java
index 3146fb42..e65e0ebf 100644
--- a/samples/src/main/java/org/apache/xalan/samples/TransformThread/TransformThread.java
+++ b/samples/src/main/java/org/apache/xalan/samples/TransformThread/TransformThread.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.TransformThread;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/samples/src/main/java/org/apache/xalan/samples/UseStylesheetPI/UseStylesheetPI.java b/samples/src/main/java/org/apache/xalan/samples/UseStylesheetPI/UseStylesheetPI.java
index 0e2ee982..c8dff306 100644
--- a/samples/src/main/java/org/apache/xalan/samples/UseStylesheetPI/UseStylesheetPI.java
+++ b/samples/src/main/java/org/apache/xalan/samples/UseStylesheetPI/UseStylesheetPI.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.UseStylesheetPI;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
diff --git a/samples/src/main/java/org/apache/xalan/samples/UseStylesheetParam/UseStylesheetParam.java b/samples/src/main/java/org/apache/xalan/samples/UseStylesheetParam/UseStylesheetParam.java
index 24b655c1..9a74f7c7 100644
--- a/samples/src/main/java/org/apache/xalan/samples/UseStylesheetParam/UseStylesheetParam.java
+++ b/samples/src/main/java/org/apache/xalan/samples/UseStylesheetParam/UseStylesheetParam.java
@@ -18,7 +18,7 @@
 /*
  * $Id$
  */
-
+package org.apache.xalan.samples.UseStylesheetParam;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
diff --git a/samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/UseXMLFilters.java b/samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/UseXMLFilters.java
index 10b90939..2767a394 100644
--- a/samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/UseXMLFilters.java
+++ b/samples/src/main/java/org/apache/xalan/samples/UseXMLFilters/UseXMLFilters.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.UseXMLFilters;
 
 import java.io.IOException;
 
diff --git a/samples/src/main/java/org/apache/xalan/samples/Validate/Validate.java b/samples/src/main/java/org/apache/xalan/samples/Validate/Validate.java
index 5756d0f4..0413372d 100644
--- a/samples/src/main/java/org/apache/xalan/samples/Validate/Validate.java
+++ b/samples/src/main/java/org/apache/xalan/samples/Validate/Validate.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.Validate;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/samples/src/main/java/org/apache/xalan/samples/Validate/ValidateXMLInput.java b/samples/src/main/java/org/apache/xalan/samples/Validate/ValidateXMLInput.java
index bbf3dc7b..1ea39bf9 100644
--- a/samples/src/main/java/org/apache/xalan/samples/Validate/ValidateXMLInput.java
+++ b/samples/src/main/java/org/apache/xalan/samples/Validate/ValidateXMLInput.java
@@ -18,6 +18,8 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.Validate;
+
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
diff --git a/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ApplyXPathJAXP.java b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ApplyXPathJAXP.java
index 0bba26fa..e74b14cb 100644
--- a/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ApplyXPathJAXP.java
+++ b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ApplyXPathJAXP.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.xalan.samples.XPathAPI;
 
 import java.io.OutputStreamWriter;
 
diff --git a/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ExtensionFunctionResolver.java b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ExtensionFunctionResolver.java
index f3ebf3ff..1f2e7075 100644
--- a/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ExtensionFunctionResolver.java
+++ b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ExtensionFunctionResolver.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.xalan.samples.XPathAPI;
 
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
diff --git a/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ExtensionTest.java b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ExtensionTest.java
index a97a2c0e..2a7f1975 100644
--- a/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ExtensionTest.java
+++ b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/ExtensionTest.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.xalan.samples.XPathAPI;
 
 public class ExtensionTest
 {
diff --git a/samples/src/main/java/org/apache/xalan/samples/XPathAPI/XPathResolver.java b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/XPathResolver.java
index 50cbddab..7330a539 100644
--- a/samples/src/main/java/org/apache/xalan/samples/XPathAPI/XPathResolver.java
+++ b/samples/src/main/java/org/apache/xalan/samples/XPathAPI/XPathResolver.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.xalan.samples.XPathAPI;
 
 import javax.xml.namespace.*;
 import javax.xml.xpath.*;
diff --git a/samples/src/main/java/org/apache/xalan/samples/extensions/IntDate.java b/samples/src/main/java/org/apache/xalan/samples/extensions/IntDate.java
index 41c29fa2..52d743bc 100644
--- a/samples/src/main/java/org/apache/xalan/samples/extensions/IntDate.java
+++ b/samples/src/main/java/org/apache/xalan/samples/extensions/IntDate.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.exptensions;
 import java.util.Calendar;
 import java.util.Date;
 
diff --git a/samples/src/main/java/org/apache/xalan/samples/extensions/MyCounter.java b/samples/src/main/java/org/apache/xalan/samples/extensions/MyCounter.java
index 6accf7df..79accdfd 100644
--- a/samples/src/main/java/org/apache/xalan/samples/extensions/MyCounter.java
+++ b/samples/src/main/java/org/apache/xalan/samples/extensions/MyCounter.java
@@ -18,6 +18,7 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.extensions;
 import java.util.Hashtable;
 
 public class MyCounter {
diff --git a/samples/src/main/java/org/apache/xalan/samples/extensions/sql/extConnection/ExternalConnection.java b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/extConnection/ExternalConnection.java
index 0558f05c..1115da14 100644
--- a/samples/src/main/java/org/apache/xalan/samples/extensions/sql/extConnection/ExternalConnection.java
+++ b/samples/src/main/java/org/apache/xalan/samples/extensions/sql/extConnection/ExternalConnection.java
@@ -18,6 +18,8 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.extensions.sql.extConnection;
+
 // Imported TraX classes
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.Transformer;
diff --git a/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLT.java b/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLT.java
index 50c4d807..ff553737 100644
--- a/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLT.java
+++ b/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLT.java
@@ -18,7 +18,7 @@
 /*
  * $Id$
  */
-package servlet;
+package org.apache.xalan.samples.servlet;
 
 import java.io.*;
 import java.util.*;
diff --git a/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTException.java b/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTException.java
index 023b3c94..e8188095 100644
--- a/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTException.java
+++ b/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTException.java
@@ -25,7 +25,7 @@
  * @author Tom Rowe (trowe@us.ibm.com)
  *
  *****************************************************************************************************/
-package servlet;
+package org.apache.xalan.samples.servlet;
 
 public class ApplyXSLTException extends Exception {
 
diff --git a/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTListener.java b/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTListener.java
index 7e0f95bd..1961a742 100644
--- a/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTListener.java
+++ b/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTListener.java
@@ -18,11 +18,12 @@
 /*
  * $Id$
  */
-package servlet;
+package org.apache.xalan.samples.servlet;
 
 import java.io.*;
 import org.xml.sax.*;
 import org.apache.xml.utils.DefaultErrorHandler;
+import org.xml.sax.SAXException;
 
 /*****************************************************************************************************
  * ApplyXSLTListener provides a buffered listener essential for capturing, and then subsequently
diff --git a/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTProperties.java b/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTProperties.java
index c62a2d2b..daa716bc 100644
--- a/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTProperties.java
+++ b/samples/src/main/java/org/apache/xalan/samples/servlet/ApplyXSLTProperties.java
@@ -18,7 +18,7 @@
 /*
  * $Id$
  */
-package servlet;
+package org.apache.xalan.samples.servlet;
 
 import java.net.MalformedURLException;
 import javax.servlet.*;
diff --git a/samples/src/main/java/org/apache/xalan/samples/servlet/DefaultApplyXSLTProperties.java b/samples/src/main/java/org/apache/xalan/samples/servlet/DefaultApplyXSLTProperties.java
index b3b72610..7639ed27 100644
--- a/samples/src/main/java/org/apache/xalan/samples/servlet/DefaultApplyXSLTProperties.java
+++ b/samples/src/main/java/org/apache/xalan/samples/servlet/DefaultApplyXSLTProperties.java
@@ -18,7 +18,7 @@
 /*
  * $Id$
  */
-package servlet;
+package org.apache.xalan.samples.servlet;
 
 import java.net.*;
 import javax.servlet.*;
diff --git a/samples/src/main/java/org/apache/xalan/samples/servlet/SimpleXSLTServlet.java b/samples/src/main/java/org/apache/xalan/samples/servlet/SimpleXSLTServlet.java
index 82c9ef6e..58b0c836 100644
--- a/samples/src/main/java/org/apache/xalan/samples/servlet/SimpleXSLTServlet.java
+++ b/samples/src/main/java/org/apache/xalan/samples/servlet/SimpleXSLTServlet.java
@@ -18,7 +18,7 @@
 /*
  * $Id$
  */
-package servlet;
+package org.apache.xalan.samples.servlet;
 
 import javax.servlet.*;
 import javax.servlet.http.*;
diff --git a/samples/src/main/java/org/apache/xalan/samples/servlet/UseStylesheetParamServlet.java b/samples/src/main/java/org/apache/xalan/samples/servlet/UseStylesheetParamServlet.java
index fdbcc54c..792cc0e0 100644
--- a/samples/src/main/java/org/apache/xalan/samples/servlet/UseStylesheetParamServlet.java
+++ b/samples/src/main/java/org/apache/xalan/samples/servlet/UseStylesheetParamServlet.java
@@ -22,7 +22,7 @@
 /*
 Simple Servlet Example using a stylesheet parameter
  */
-package servlet;
+package org.apache.xalan.samples.servlet;
 // Imported TraX classes
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.Transformer;
diff --git a/samples/src/main/java/org/apache/xalan/samples/servlet/XSLTServletWithParams.java b/samples/src/main/java/org/apache/xalan/samples/servlet/XSLTServletWithParams.java
index eb60e47d..d0ec377c 100644
--- a/samples/src/main/java/org/apache/xalan/samples/servlet/XSLTServletWithParams.java
+++ b/samples/src/main/java/org/apache/xalan/samples/servlet/XSLTServletWithParams.java
@@ -18,7 +18,8 @@
 /*
  * $Id$
  */
-package servlet;
+package org.apache.xalan.samples.servlet;
+
 import javax.servlet.*;
 import javax.servlet.http.*;
 import java.io.*;
diff --git a/samples/src/main/java/org/apache/xalan/samples/translets/JAXPTransletMultipleTransformations.java b/samples/src/main/java/org/apache/xalan/samples/translets/JAXPTransletMultipleTransformations.java
index ffe82a0f..282ff05f 100644
--- a/samples/src/main/java/org/apache/xalan/samples/translets/JAXPTransletMultipleTransformations.java
+++ b/samples/src/main/java/org/apache/xalan/samples/translets/JAXPTransletMultipleTransformations.java
@@ -18,6 +18,9 @@
 /*
  * $Id$
  */
+
+package org.apache.xalan.samples.translets;
+
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 
diff --git a/samples/src/main/java/org/apache/xalan/samples/translets/JAXPTransletOneTransformation.java b/samples/src/main/java/org/apache/xalan/samples/translets/JAXPTransletOneTransformation.java
index 45614e23..07c907db 100644
--- a/samples/src/main/java/org/apache/xalan/samples/translets/JAXPTransletOneTransformation.java
+++ b/samples/src/main/java/org/apache/xalan/samples/translets/JAXPTransletOneTransformation.java
@@ -18,6 +18,8 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.translets;
+
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/samples/src/main/java/org/apache/xalan/samples/trax/ExampleContentHandler.java b/samples/src/main/java/org/apache/xalan/samples/trax/ExampleContentHandler.java
index 1d4cfc84..19b7422a 100644
--- a/samples/src/main/java/org/apache/xalan/samples/trax/ExampleContentHandler.java
+++ b/samples/src/main/java/org/apache/xalan/samples/trax/ExampleContentHandler.java
@@ -18,6 +18,8 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.trax;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
diff --git a/samples/src/main/java/org/apache/xalan/samples/trax/Examples.java b/samples/src/main/java/org/apache/xalan/samples/trax/Examples.java
index c0be1259..6def70a1 100644
--- a/samples/src/main/java/org/apache/xalan/samples/trax/Examples.java
+++ b/samples/src/main/java/org/apache/xalan/samples/trax/Examples.java
@@ -18,6 +18,8 @@
 /*
  * $Id$
  */
+package org.apache.xalan.samples.trax;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/samples/src/site/xhtml/AppletXMLtoHTML/README.xhtml b/samples/src/site/xhtml/AppletXMLtoHTML/README.xhtml
index 29975774..77e95cfe 100644
--- a/samples/src/site/xhtml/AppletXMLtoHTML/README.xhtml
+++ b/samples/src/site/xhtml/AppletXMLtoHTML/README.xhtml
@@ -19,16 +19,16 @@
 
 <html>
 <head>
-	<title></title>Xalan Sample Applet</title>
+	<title>Xalan Sample Applet</title>
 </head>
 <body bgcolor="#808080" text="#ffffff">
   <table>
     <tr>
-      <td><img border="0" hspace="0" vspace="0" align="left" src="rabbitwhorn.jpg"></td>
+      <td><img border="0" hspace="0" vspace="0" align="left" src="rabbitwhorn.jpg"/></td>
       <td><h2>&nbsp;Running the Xalan sample applet</h2></td>
     </tr>
   </table>
-  <hr>
+  <hr/>
   <ul>
   <li>appletXMLtoHTML.html transforms XML into HTML, and displays the XML document and XSL stylesheet as well as the HTML transformation result.<br/><br/></li>
   <p>The applet looks for xalan.jar, xercesImpl.jar, xml-apis.jar and serializer.jar in the bin directory. If the JAR files are elsewhere, you must move them or adjust the applet archive setting in client.html.</p>
diff --git a/samples/src/site/xhtml/AppletXMLtoHTML/appletXMLtoHTML.xhtml b/samples/src/site/xhtml/AppletXMLtoHTML/appletXMLtoHTML.xhtml
index c8a6c731..6944d724 100644
--- a/samples/src/site/xhtml/AppletXMLtoHTML/appletXMLtoHTML.xhtml
+++ b/samples/src/site/xhtml/AppletXMLtoHTML/appletXMLtoHTML.xhtml
@@ -21,13 +21,14 @@
 <head>
 	<title>Using an applet to perform XSL transformations</title>
 </head>
-  <FRAMESET ROWS="125,*" >
-    <FRAME NAME="processor" SRC="client.html" SCROLLING="auto" >
+  <frameset ROWS="125,*" >
+    <frame NAME="processor" SRC="client.html" SCROLLING="auto" >
       <frameset cols="33%, 33%, *">
-        <FRAME NAME="targetArea0" SRC="target.html" >
-        <FRAME NAME="targetArea1" SRC="target.html" >
-        <FRAME NAME="targetArea2" SRC="target.html" >        
+        <frame NAME="targetArea0" SRC="target.html" />
+        <frame NAME="targetArea1" SRC="target.html" />
+        <frame NAME="targetArea2" SRC="target.html" />        
       </frameset>
-  </FRAMESET>
+      </frame>
+  </frameset>
 
 </html>
diff --git a/samples/src/site/xhtml/AppletXMLtoHTML/client.xhtml b/samples/src/site/xhtml/AppletXMLtoHTML/client.xhtml
index 2e8b76ac..a9facfe3 100644
--- a/samples/src/site/xhtml/AppletXMLtoHTML/client.xhtml
+++ b/samples/src/site/xhtml/AppletXMLtoHTML/client.xhtml
@@ -15,14 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<!doctype HTML public "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
   <head>
-	  <title>Untitled</title>
+	  <title>AppletXMLtoHTML</title>
   </head>
   <script language="JavaScript">
-
-    
+    <![CDATA[
     function writeSource(sourceString)
     {
 
@@ -94,10 +92,11 @@
       writeStylesheet(styleString);
       writeTarget(targetString);
     }
+    ]]>
   </script>
   <body onLoad="clearFrames();" bgcolor="#808080" text="#ffffff">
     <form name="xmlTransform" action="" method="POST">
-      <h2><img border="0" hspace="0" vspace="0" align="left" src="rabbitwhorn.jpg">&nbsp;Transform XML Document</h2>
+      <h2><img border="0" hspace="0" vspace="0" align="left" src="rabbitwhorn.jpg"/>&nbsp;Transform XML Document</h2>
         <table>
           <tr>
             <td width="50"></td>
@@ -108,17 +107,17 @@
           <td></td>
           <td align="center">
             <select name="xmlSourceList">
-              <option value="xalanApplets.xml" selected>&nbsp;xalanApplets.xml&nbsp;
-              <option value="foo-s1.xml">&nbsp;foo-s1.xml&nbsp;
+              <option value="xalanApplets.xml" selected="true">&nbsp;xalanApplets.xml&nbsp;</option>
+              <option value="foo-s1.xml">&nbsp;foo-s1.xml&nbsp;</option>
             </select>
           </td>
           <td align="center">
-            <input type="radio" name="displayMode" checked>HTML&nbsp;&nbsp;
-            <input type="radio" name="displayMode">HTML Source
+            <input type="radio" name="displayMode" checked="true">HTML&nbsp;&nbsp;</input>
+            <input type="radio" name="displayMode">HTML Source</input>
           </td>
           <td>&nbsp;&nbsp;&nbsp;&nbsp;
             <input type="button" name="transformButton" value="Transform" 
-            onClick="transform();">
+            onClick="transform();"/>
           </td>
         </tr>
       </table>
diff --git a/samples/src/site/xhtml/CompiledApplet/index.xhtml b/samples/src/site/xhtml/CompiledApplet/index.xhtml
index 4130c3a7..a55208f0 100644
--- a/samples/src/site/xhtml/CompiledApplet/index.xhtml
+++ b/samples/src/site/xhtml/CompiledApplet/index.xhtml
@@ -18,11 +18,11 @@
 <html>
 <head><title>XSLT Applet Demonstration</title></head>
 
-<backgroundcolor=#ffffff>
-
-<frameset border="1" cols="25%,*">
-<frame src="menu.html" name="demo_ctrl">
-<frame src="about:blank" name="demo_output">
-</frameset>
+<body bgcolor="#ffffff">
+  <frameset border="1" cols="25%,*">
+    <frame src="menu.html" name="demo_ctrl"/>
+    <frame src="about:blank" name="demo_output"/>
+  </frameset>
+</body>
 
 </html>
diff --git a/samples/src/site/xhtml/CompiledApplet/menu.xhtml b/samples/src/site/xhtml/CompiledApplet/menu.xhtml
index 7567946a..59b9f5de 100644
--- a/samples/src/site/xhtml/CompiledApplet/menu.xhtml
+++ b/samples/src/site/xhtml/CompiledApplet/menu.xhtml
@@ -17,16 +17,17 @@
 -->
 <html>
 <head></head>
-<body bgcolor=#ffffff>
-<hr>
+<body bgcolor="#ffffff">
+<hr/>
 
 <center><h3>Xalan/XSLTC Applet Demo</h3></center>
+<p>
 Each of these examples illustrate the use of translets
 within a Java applet:
-<p>
+</p>
 
   <script language="JavaScript">
-
+    <![CDATA[
     function run_transform(form) {
       /* Get the input document and translet class name from input form */
       var translet = form.translet.value;
@@ -41,16 +42,15 @@ within a Java applet:
       output_frame.close();
       return(true);
     }
-
+    ]]>
   </script>
 
   <form name="xslt_form" onSubmit="run_transform(this.form)">
     <p>Select translet:</p>
-    <p><input name="translet" width="64"></p>
+    <p><input name="translet" width="64"/></p>
     <p>Select XML source document:</p>
-    <p><input name="doc" width="64"></p>
-    <p><input type="button" value="Run" onClick="run_transform(this.form)"></p>
-
+    <p><input name="doc" width="64"/></p>
+    <p><input type="button" value="Run" onClick="run_transform(this.form)"/></p>
   </form>
 
   <!--
@@ -61,7 +61,8 @@ within a Java applet:
           code="TransformApplet"
           name="TransformApplet"
           width="10"
-          height="10">
-  </applet>
+          height="10"
+	  />
 
 </body>
+</html>
diff --git a/samples/src/site/xhtml/CompiledApplet/singleTransform.xhtml b/samples/src/site/xhtml/CompiledApplet/singleTransform.xhtml
index 54696bbd..4ce8824d 100644
--- a/samples/src/site/xhtml/CompiledApplet/singleTransform.xhtml
+++ b/samples/src/site/xhtml/CompiledApplet/singleTransform.xhtml
@@ -17,9 +17,10 @@
 -->
 <html>
 <head></head>
-<body bgcolor=#ffffff>
+<body bgcolor="#ffffff">
   <applet archive="mytranslet.jar, xalan.jar, xercesImpl.jar, xml-apis.jar, xsltcapplet.jar" code="TransformApplet" width="500" height="500">
-    <param name="input-document" value="ns.xml">
-    <param name="stylesheet-name" value="ns.xsl">
+    <param name="input-document" value="ns.xml"/>
+    <param name="stylesheet-name" value="ns.xsl"/>
   </applet>
 </body>
+</html>
diff --git a/samples/src/site/xhtml/CompiledEJB/bottom_frame.xhtml b/samples/src/site/xhtml/CompiledEJB/bottom_frame.xhtml
index 3f93e07e..3fdbdf42 100644
--- a/samples/src/site/xhtml/CompiledEJB/bottom_frame.xhtml
+++ b/samples/src/site/xhtml/CompiledEJB/bottom_frame.xhtml
@@ -17,8 +17,7 @@
 -->
 <html>
   <head></head>
-  <body>
-    <backgroundcolor=#ffffff>
+  <body style="backgroundcolor:#ffffff;">
   </body>
 </html>
 
diff --git a/samples/src/site/xhtml/CompiledEJB/index.xhtml b/samples/src/site/xhtml/CompiledEJB/index.xhtml
index 48736984..a8f2d8a7 100644
--- a/samples/src/site/xhtml/CompiledEJB/index.xhtml
+++ b/samples/src/site/xhtml/CompiledEJB/index.xhtml
@@ -17,15 +17,11 @@
 -->
 <html>
   <head><title>XML Technology Center</title></head>
-    <backgroundcolor=#ffffff>
-
-    <frameset border="0" rows="30%,70%">
-      <frame src="top_frame.html" NAME="top" scrolling="off">
-      <frame src="bottom_frame.html" NAME="bottom" scrolling="on">
+    <frameset border="0" rows="30%,70%" style="backgroundcolor:#ffffff;">
+      <frame src="top_frame.html" NAME="top" scrolling="off"/>
+      <frame src="bottom_frame.html" NAME="bottom" scrolling="on"/>
     </frameset>
 
-    <noframes>
-    </noframes>
-
+    <noframes/>
 </html>
 
diff --git a/samples/src/site/xhtml/CompiledEJB/top_frame.xhtml b/samples/src/site/xhtml/CompiledEJB/top_frame.xhtml
index 541b1dbc..b83e7277 100644
--- a/samples/src/site/xhtml/CompiledEJB/top_frame.xhtml
+++ b/samples/src/site/xhtml/CompiledEJB/top_frame.xhtml
@@ -18,15 +18,15 @@
 <html>
 
   <head>
-    <base target=xtc_menu>
+    <base target="xtc_menu"/>
   </head>
 
-  <body bgcolor=#ffffff>
+  <body bgcolor="#ffffff">
 
-    <center><h1>Server-side XSL transformations</h1><p></center>
+    <center><h1>Server-side XSL transformations</h1><p/></center>
 
     <script language="JavaScript">
-
+      <![CDATA[
       function getURI() {
         var root = "http://gobsheen.ireland/morten/Sun/XTC/demo/plays/";
 	var menu = document.XMLinput.elements[0];
@@ -53,7 +53,7 @@
         var uri = getURI();
         open(uri,"bottom");
       }
-
+    ]]>
     </script>
 
     <form name="XMLinput">
@@ -65,31 +65,31 @@
       </td>
       <td>
         <select name="dropdown">
-          <option value="AsYouLikeIt.xml">As You Like It
-          <option value="Cymbeline.xml">Cymbeline
-          <option value="Hamlet.xml">The Tragedy of Hamlet
-          <option value="HenryV.xml">The Life of Henry V
-          <option value="HenryVIII.xml">The Famous History of the Life of Henry VIII
-          <option value="KingJohn.xml">The Life and Death of King John
-          <option value="KingLear.xml">The Tragedy of King Lear
-          <option value="KingRichardII.xml">The Tragedy of King Richard II
-          <option value="MeasureForMeasure.xml">Measure for Measure
-          <option value="MerchantOfVenice.xml">The Merchant of Venice
-          <option value="MerryWivesOfWindsor.xml">The Merry Wives of Windsor
-          <option value="MidsummerNightsDream.xml">A Midsummer Night's Dream
-          <option value="MuchAdoAboutNothing.xml">Much Ado about Nothing
-          <option value="PericlesPrinceOfTyre.xml">Pericles, Prince of Tyre
-          <option value="RomeoAndJuliet.xml">The Tragedy of Romeo and Juliet
-          <option value="TamingOfTheShrew.xml">The Taming of the Shrew
-          <option value="TheTempest.xml">The Tempest
-          <option value="TimonOfAthens.xml">The Life of Timon of Athens
-          <option value="TragedyOfCoriolanus.xml">The Tragedy of Coriolanus
-          <option value="TragedyOfJuliusCaesar.xml">The Tragedy of Julius Caesar
-          <option value="TragedyOfOthello.xml">The Tragedy of Othello, the Moor of Venice
-          <option value="TroilusAndCresida.xml">The History of Troilus and Cressida
-          <option value="TwelfthNight.xml">Twelfth Night, or What You Will
-          <option value="TwoGentlementOfVerona.xml">The Two Gentlemen of Verona
-          <option value="WintersTale.xml">The Winter's Tale
+          <option value="AsYouLikeIt.xml">As You Like It</option>
+          <option value="Cymbeline.xml">Cymbeline</option>
+          <option value="Hamlet.xml">The Tragedy of Hamlet</option>
+          <option value="HenryV.xml">The Life of Henry V</option>
+          <option value="HenryVIII.xml">The Famous History of the Life of Henry VIII</option>
+          <option value="KingJohn.xml">The Life and Death of King John</option>
+          <option value="KingLear.xml">The Tragedy of King Lear</option>
+          <option value="KingRichardII.xml">The Tragedy of King Richard II</option>
+          <option value="MeasureForMeasure.xml">Measure for Measure</option>
+          <option value="MerchantOfVenice.xml">The Merchant of Venice</option>
+          <option value="MerryWivesOfWindsor.xml">The Merry Wives of Windsor</option>
+          <option value="MidsummerNightsDream.xml">A Midsummer Night's Dream</option>
+          <option value="MuchAdoAboutNothing.xml">Much Ado about Nothing</option>
+          <option value="PericlesPrinceOfTyre.xml">Pericles, Prince of Tyre</option>
+          <option value="RomeoAndJuliet.xml">The Tragedy of Romeo and Juliet</option>
+          <option value="TamingOfTheShrew.xml">The Taming of the Shrew</option>
+          <option value="TheTempest.xml">The Tempest</option>
+          <option value="TimonOfAthens.xml">The Life of Timon of Athens</option>
+          <option value="TragedyOfCoriolanus.xml">The Tragedy of Coriolanus</option>
+          <option value="TragedyOfJuliusCaesar.xml">The Tragedy of Julius Caesar</option>
+          <option value="TragedyOfOthello.xml">The Tragedy of Othello, the Moor of Venice</option>
+          <option value="TroilusAndCresida.xml">The History of Troilus and Cressida</option>
+          <option value="TwelfthNight.xml">Twelfth Night, or What You Will</option>
+          <option value="TwoGentlementOfVerona.xml">The Two Gentlemen of Verona</option>
+          <option value="WintersTale.xml">The Winter's Tale</option>
         </select>
       </td>
     </tr>
@@ -99,9 +99,9 @@
       </td>
       <td>
         <select name="dropdown">
-          <option value="PlayToHTML">Full
-          <option value="PlayToSpeakers">Speakers
-          <option value="PlayToIndex">Index
+          <option value="PlayToHTML">Full</option>
+          <option value="PlayToSpeakers">Speakers</option>
+          <option value="PlayToIndex">Index</option>
         </select>
       </td>
     </tr>
@@ -110,8 +110,8 @@
         <b>Method:</b>
       </td>
       <td>
-        <input type="button" value="Transform" onClick="setHTMLlocation()">
-        <input type="button" value="XML source" onClick="setXMLlocation()">
+        <input type="button" value="Transform" onClick="setHTMLlocation()"/>
+        <input type="button" value="XML source" onClick="setXMLlocation()"/>
       </td>
     </tr>
   </table>
diff --git a/samples/src/test/java/org/apache/xalan/AppTest.java b/samples/src/test/java/org/apache/xalan/AppTest.java
new file mode 100644
index 00000000..03e01709
--- /dev/null
+++ b/samples/src/test/java/org/apache/xalan/AppTest.java
@@ -0,0 +1,20 @@
+package org.apache.xalan;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/samples/tools/xalan2jdoc.jar b/samples/tools/xalan2jdoc.jar
new file mode 100644
index 00000000..dcc37db8
Binary files /dev/null and b/samples/tools/xalan2jdoc.jar differ
diff --git a/serializer/.classpath b/serializer/.classpath
new file mode 100644
index 00000000..b2557069
--- /dev/null
+++ b/serializer/.classpath
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="META-INF">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/serializer/.gitignore b/serializer/.gitignore
new file mode 100644
index 00000000..b83d2226
--- /dev/null
+++ b/serializer/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/serializer/.project b/serializer/.project
new file mode 100644
index 00000000..a1131110
--- /dev/null
+++ b/serializer/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>serializer</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/serializer/.settings/org.eclipse.core.resources.prefs b/serializer/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000..b365ee4b
--- /dev/null
+++ b/serializer/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
+encoding/src=UTF-8
diff --git a/serializer/.settings/org.eclipse.jdt.core.prefs b/serializer/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..2f5cc74c
--- /dev/null
+++ b/serializer/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/serializer/.settings/org.eclipse.m2e.core.prefs b/serializer/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000..f897a7f1
--- /dev/null
+++ b/serializer/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/serializer/pom.xml b/serializer/pom.xml
new file mode 100644
index 00000000..af9abcaf
--- /dev/null
+++ b/serializer/pom.xml
@@ -0,0 +1,110 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>xalan</groupId>
+    <artifactId>xalan-project</artifactId>
+    <version>2.7.3</version>
+  </parent>
+
+  <artifactId>serializer</artifactId>
+  <name>XML Serializer</name>
+  <description>Apache's XML serialization layer, as used in the Xalan XSLT processor</description>
+
+  <dependencies>
+    <!-- https://mvnrepository.com/artifact/org.apache.bcel/bcel -->
+    <dependency>
+      <groupId>org.apache.bcel</groupId>
+      <artifactId>bcel</artifactId>
+      <version>6.7.0</version>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/javax/javaee-api -->
+    <dependency>
+      <groupId>javax</groupId>
+      <artifactId>javaee-api</artifactId>
+      <version>6.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/javax.servlet/servlet-api -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version> <!-- jakata servlet is at 6.0 -->
+      <scope>provided</scope>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/xerces/xercesImpl -->
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/xml-apis/xml-apis -->
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.4.01</version>
+      <!-- We were actually using 1.4.02 in the Ant build. -->
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+	<artifactId>maven-compiler-plugin</artifactId>
+	<version>3.8.1</version>
+	<configuration>
+	  <source>1.8</source>
+	  <target>1.8</target>
+	</configuration>
+      </plugin>
+
+      <!-- Filter out packages we don't want copied to the output jar
+	  https://maven.apache.org/plugins/maven-shade-plugin/examples/includes-excludes.html -->
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-shade-plugin</artifactId>
+	<version>3.5.0</version>
+	<executions>
+	  <execution>
+	    <phase>package</phase>
+	    <goals>
+	      <goal>shade</goal>
+	    </goals>
+	    <configuration>
+	      <artifactSet>
+		<excludes>
+		  <!-- Their examples (testing) -->
+		  <exclude>junit:junit</exclude>
+		  <exclude>jmock:*</exclude>
+		  <exclude>org.apache.maven:lib:tests</exclude>
+		  <!-- What I think I need to exclude.
+		       Some are direct dependencies, some come in
+		       via maven packages. -->
+		  <exclude>com.github.vbmacher:java-cup</exclude>
+		  <exclude>commons-logging:commons-logging</exclude>
+		  <exclude>org.apache.commons:commons-lang3</exclude>
+		  <exclude>org.apache.ant:ant</exclude>
+		  <exclude>org.apache.ant:ant-launcher</exclude>
+		  <exclude>org.apache.bcel:bcel</exclude>
+		</excludes>
+	      </artifactSet>
+	    </configuration>
+	  </execution>
+	</executions>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/Encodings.properties b/serializer/resources/org/apache/xml/serializer/Encodings.properties
similarity index 100%
rename from serializer/src/main/resources/org/apache/xml/serializer/Encodings.properties
rename to serializer/resources/org/apache/xml/serializer/Encodings.properties
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/HTMLEntities.properties b/serializer/resources/org/apache/xml/serializer/HTMLEntities.properties
similarity index 100%
rename from serializer/src/main/resources/org/apache/xml/serializer/HTMLEntities.properties
rename to serializer/resources/org/apache/xml/serializer/HTMLEntities.properties
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/Version.src b/serializer/resources/org/apache/xml/serializer/Version.src
similarity index 100%
copy from serializer/src/main/resources/org/apache/xml/serializer/Version.src
copy to serializer/resources/org/apache/xml/serializer/Version.src
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/XMLEntities.properties b/serializer/resources/org/apache/xml/serializer/XMLEntities.properties
similarity index 100%
rename from serializer/src/main/resources/org/apache/xml/serializer/XMLEntities.properties
rename to serializer/resources/org/apache/xml/serializer/XMLEntities.properties
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/output_html.properties b/serializer/resources/org/apache/xml/serializer/output_html.properties
similarity index 100%
rename from serializer/src/main/resources/org/apache/xml/serializer/output_html.properties
rename to serializer/resources/org/apache/xml/serializer/output_html.properties
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/output_text.properties b/serializer/resources/org/apache/xml/serializer/output_text.properties
similarity index 100%
rename from serializer/src/main/resources/org/apache/xml/serializer/output_text.properties
rename to serializer/resources/org/apache/xml/serializer/output_text.properties
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/output_unknown.properties b/serializer/resources/org/apache/xml/serializer/output_unknown.properties
similarity index 100%
rename from serializer/src/main/resources/org/apache/xml/serializer/output_unknown.properties
rename to serializer/resources/org/apache/xml/serializer/output_unknown.properties
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/output_xml.properties b/serializer/resources/org/apache/xml/serializer/output_xml.properties
similarity index 100%
rename from serializer/src/main/resources/org/apache/xml/serializer/output_xml.properties
rename to serializer/resources/org/apache/xml/serializer/output_xml.properties
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/package.html b/serializer/resources/org/apache/xml/serializer/package.html
similarity index 100%
copy from serializer/src/main/resources/org/apache/xml/serializer/package.html
copy to serializer/resources/org/apache/xml/serializer/package.html
diff --git a/serializer/src/main/java/org/apache/xml/serializer/DOM3Serializer.java b/serializer/src/main/java/org/apache/xml/serializer/DOM3Serializer.java
index 82e6470d..d05c3774 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/DOM3Serializer.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/DOM3Serializer.java
@@ -45,7 +45,7 @@ import org.w3c.dom.ls.LSSerializerFilter;
  * <p>
  * Example:
  * <pre>
- *    public class TestDOM3 {
+ *    public class TestDOM3 { 
  *
  *    public static void main(String args[]) throws Exception {
  *        // Get document to serialize
@@ -55,7 +55,8 @@ import org.w3c.dom.ls.LSSerializerFilter;
  *        System.out.println(test.testDOM3LS());
  *    }
  *
- *    public org.w3c.dom.Document getDocument() throws Exception {
+ *    // Javadoc needs an @code hint or it complains about angle brackets
+ *    public org.w3c.dom.Document getDocument() throws Exception {@code
  *        // Create a simple DOM Document.
  *        javax.xml.parsers.DocumentBuilderFactory factory = 
  *            javax.xml.parsers.DocumentBuilderFactory.newInstance();
diff --git a/serializer/src/main/java/org/apache/xml/serializer/EmptySerializer.java b/serializer/src/main/java/org/apache/xml/serializer/EmptySerializer.java
index fba7de2c..3bcd49dd 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/EmptySerializer.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/EmptySerializer.java
@@ -50,43 +50,66 @@ public class EmptySerializer implements SerializationHandler
 {
     protected static final String ERR = "EmptySerializer method not over-ridden";
     /**
-     * @see SerializationHandler#asContentHandler()
+     * Architectural placeholder, overridden in derived classes
+     * @throws IOException if one arises in override implementation.
      */
-    
     protected void couldThrowIOException() throws IOException
     {
         return; // don't do anything.
     }
     
+    /**
+     * Architectural placeholder, overridden in derived classes
+     * @throws SAXException if one arises in override implementation.
+     */
     protected void couldThrowSAXException() throws SAXException
     {
         return; // don't do anything.
     }
     
+    /**
+     * Architectural placeholder, overridden in derived classes
+     * @param chars char[] containing content being serialized
+     * @param off integer offset into chars, start of content under consideration
+     * @param len integer character count, length of content under consideration
+     * @throws SAXException if one arises in override implementation.
+     */
     protected void couldThrowSAXException(char[] chars, int off, int len) throws SAXException
     {
         return; // don't do anything.
     }
     
+    /**
+     * Architectural placeholder, overridden in derived classes
+     * @param elemQName qualified name of element being serialized
+     * @throws SAXException if one arises in override implementation.
+     */
     protected void couldThrowSAXException(String elemQName) throws SAXException
     {
         return; // don't do anything.
     }
     
+    /**
+     * Architectural placeholder, overridden in derived classes
+     * @throws Exception (unknown which type) if one arises in override implementation.
+     */
     protected void couldThrowException() throws Exception
     {
         return; // don't do anything.
     }
 
+    /**
+     * Architectural placeholder, overridden in derived implementation.
+     * A handler method might be invoked, or inlined, from this location.
+     */
     void aMethodIsCalled()
     {
 
         // throw new RuntimeException(err);
         return;
     }
-  
     
-    /**
+    /** 
      * @see SerializationHandler#asContentHandler()
      */
     public ContentHandler asContentHandler() throws IOException
@@ -94,14 +117,14 @@ public class EmptySerializer implements SerializationHandler
         couldThrowIOException();
         return null;
     }
-    /**
+    /** 
      * @see SerializationHandler#setContentHandler(org.xml.sax.ContentHandler)
      */
     public void setContentHandler(ContentHandler ch)
     {
         aMethodIsCalled();
     }
-    /**
+    /** 
      * @see SerializationHandler#close()
      */
     public void close()
@@ -109,6 +132,7 @@ public class EmptySerializer implements SerializationHandler
         aMethodIsCalled();
     }
     /**
+     * @return Properties object describing the serializer's configuration
      * @see SerializationHandler#getOutputFormat()
      */
     public Properties getOutputFormat()
@@ -117,6 +141,7 @@ public class EmptySerializer implements SerializationHandler
         return null;
     }
     /**
+     * @return the OutputStream that this serializer would write to
      * @see SerializationHandler#getOutputStream()
      */
     public OutputStream getOutputStream()
@@ -125,6 +150,7 @@ public class EmptySerializer implements SerializationHandler
         return null;
     }
     /**
+     * @return the Writer this serializer uses to write to the OutputStream
      * @see SerializationHandler#getWriter()
      */
     public Writer getWriter()
@@ -133,6 +159,7 @@ public class EmptySerializer implements SerializationHandler
         return null;
     }
     /**
+     * return 
      * @see SerializationHandler#reset()
      */
     public boolean reset()
@@ -155,6 +182,7 @@ public class EmptySerializer implements SerializationHandler
         aMethodIsCalled();
     }
     /**
+     * @return previous state of this flag, so it can be restored if desired.
      * @see SerializationHandler#setEscaping(boolean)
      */
     public boolean setEscaping(boolean escape) throws SAXException
@@ -217,7 +245,7 @@ public class EmptySerializer implements SerializationHandler
     public Transformer getTransformer()
     {
         aMethodIsCalled();
-        return null;
+	return null;
     }
     /**
      * @see SerializationHandler#flushPending()
@@ -559,7 +587,14 @@ public class EmptySerializer implements SerializationHandler
         return null;
     }
     /**
-     * @see XSLOutputAttributes#setCdataSectionElements
+    /**
+     * I believe this is intended to be a convenience front-end for the
+     * version which takes a Vector.
+     * @see #setCdataSectionElements(java.util.Vector)
+     * @param h Hashtable listing the element types (as opposed to datatypes)
+     * to be handled as CData.
+     * @throws Exception if the request can't be fulfilled (details
+     * depend on implementation)
      */
     public void setCdataSectionElements(Hashtable h) throws Exception
     {
diff --git a/serializer/src/main/java/org/apache/xml/serializer/EncodingInfo.java b/serializer/src/main/java/org/apache/xml/serializer/EncodingInfo.java
index 840405b2..e3fc7670 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/EncodingInfo.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/EncodingInfo.java
@@ -42,9 +42,9 @@ package org.apache.xml.serializer;
  * <code>m_last</code>). It will handle a certain range of values
  * explicitly (<code>m_explFirst</code> to <code>m_explLast</code>).
  * If the unicode point is before that explicit range, that is it
- * is in the range <code>m_first <= value < m_explFirst</code>, then it will delegate to another EncodingInfo object for The root
+ * is in the range <code>m_first &lt;= value &lt; m_explFirst</code>, then it will delegate to another EncodingInfo object for The root
  * of such a tree, m_before.  Likewise for values in the range 
- * <code>m_explLast < value <= m_last</code>, but delgating to <code>m_after</code>
+ * <code>m_explLast &lt; value &lt;= m_last</code>, but delgating to <code>m_after</code>
  * <p>
  * Actually figuring out if a code point is in the encoding is expensive. So the
  * purpose of this tree is to cache such determinations, and not to build the
@@ -97,6 +97,7 @@ public final class EncodingInfo extends Object
      * This is not a public API. It returns true if the
      * char in question is in the encoding.
      * @param ch the char in question.
+     * @return true if the character is a member of the encoding's charset
      * <p>
      * This method is not a public API.
      * @xsl.usage internal
@@ -118,6 +119,7 @@ public final class EncodingInfo extends Object
      * character formed by the high/low pair is in the encoding.
      * @param high a char that the a high char of a high/low surrogate pair.
      * @param low a char that is the low char of a high/low surrogate pair.
+     * @return true if the character is a member of the encoding's charset
      * <p>
      * This method is not a public API.
      * @xsl.usage internal
@@ -167,23 +169,24 @@ public final class EncodingInfo extends Object
      */
     private interface InEncoding {
         /**
-         * Returns true if the char is in the encoding
+         * @return true if the char is in the encoding
          */
         public boolean isInEncoding(char ch);
         /**
-         * Returns true if the high/low surrogate pair forms
+         * @return true if the high/low surrogate pair forms
          * a character that is in the encoding.
          */
         public boolean isInEncoding(char high, char low);
     }
 
     /**
-     * This class implements the 
+     * This class implements the InEncoding interface
      */
     private class EncodingImpl implements InEncoding {
-        
-
 
+	/** 
+	 * @return true if the char is in the encoding
+	 */
         public boolean isInEncoding(char ch1) {
             final boolean ret;
             int codePoint = Encodings.toCodePoint(ch1);
@@ -231,6 +234,10 @@ public final class EncodingInfo extends Object
             return ret;
         }
 
+        /**
+         * @return true if the high/low surrogate pair forms
+         * a character that is in the encoding.
+         */
         public boolean isInEncoding(char high, char low) {
             final boolean ret;
             int codePoint = Encodings.toCodePoint(high,low);
@@ -551,6 +558,7 @@ public final class EncodingInfo extends Object
      * If the value returned is '\u0000' it means that every character must be tested
      * with an isInEncoding method {@link #isInEncoding(char)} or {@link #isInEncoding(char, char)} 
      * for surrogate pairs.
+     * @return highest character in lowest group of characters handled by this encoding
      * <p>
      * This method is not a public API.
      * @xsl.usage internal
diff --git a/serializer/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java
index 8cf35d3f..df3358eb 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java
@@ -54,7 +54,7 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
      * @param type the attribute type typically character data (CDATA)
      * @param value the value of the attribute
      * @param XSLAttribute true if the added attribute is coming from an xsl:attribute element
-     * @throws SAXException
+     * @throws SAXException if attribute could not be written to output
      */
     public void addAttribute(
         String uri,
@@ -67,7 +67,7 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
     /**
      * Add attributes to the current element
      * @param atts the attributes to add.
-     * @throws SAXException
+     * @throws SAXException if attributes could not be written to output
      */
     public void addAttributes(org.xml.sax.Attributes atts)
         throws org.xml.sax.SAXException;
@@ -75,8 +75,8 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
      * Add an attribute to the current element. The namespace URI of the
      * attribute will be calculated from the prefix of qName. The local name
      * will be derived from qName and the type will be assumed to be "CDATA".
-     * @param qName
-     * @param value
+     * @param qName Qualified Name of the attribute to be added
+     * @param value String value of the attribute to be added
      */
     public void addAttribute(String qName, String value);
     
@@ -84,7 +84,7 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
      * This method is used to notify of a character event, but passing the data
      * as a character String rather than the standard character array.
      * @param chars the character data
-     * @throws SAXException
+     * @throws SAXException if characters could not be written to output
      */
     public void characters(String chars) throws SAXException;
     
@@ -92,7 +92,7 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
      * This method is used to notify of a character event, but passing the data
      * as a DOM Node rather than the standard character array.
      * @param node a DOM Node containing text.
-     * @throws SAXException
+     * @throws SAXException if characters could not be written to output
      */    
     public void characters(org.w3c.dom.Node node) throws org.xml.sax.SAXException;
     /**
@@ -105,7 +105,7 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
      * the localName from the qualified name and derive the namespaceURI from
      * its implementation.
      * @param elemName the fully qualified element name.
-     * @throws SAXException
+     * @throws SAXException if end tag could not be written to output
      */
     public void endElement(String elemName) throws SAXException;
 
@@ -119,8 +119,7 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
      * @param uri the namespace URI of the element
      * @param localName the local name (without prefix) of the element
      * @param qName the qualified name of the element
-     * 
-     * @throws SAXException
+     * @throws SAXException if start tag could not be written to output
      */
     public void startElement(String uri, String localName, String qName)
         throws org.xml.sax.SAXException;
@@ -128,9 +127,10 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
     /**
      * This method is used to notify of the start of an element
      * @param qName the fully qualified name of the element
-     * @throws SAXException
+     * @throws SAXException if start tag could not be written to output
      */
     public void startElement(String qName) throws SAXException;
+
     /**
      * This method is used to notify that a prefix mapping is to start, but
      * after an element is started. The SAX method call
@@ -147,7 +147,7 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
      * 
      * @param uri the namespace URI being declared
      * @param prefix the prefix that maps to the given namespace
-     * @throws SAXException
+     * @throws SAXException if namespace declaration could not be processed
      */
     public void namespaceAfterStartElement(String uri, String prefix)
         throws SAXException;
@@ -163,7 +163,7 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
      * @return boolean false if the prefix mapping was already in effect (in
      * other words we are just re-declaring), true if this is a new, never
      * before seen mapping for the element.
-     * @throws SAXException
+     * @throws SAXException if namespace declaration could not be processed
      */
     public boolean startPrefixMapping(
         String prefix,
@@ -173,7 +173,7 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
     /**
      * Notify of an entity reference.
      * @param entityName the name of the entity
-     * @throws SAXException
+     * @throws SAXException if entity reference could not be written to output
      */
     public void entityReference(String entityName) throws SAXException;
 
@@ -239,6 +239,7 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
      * @param qName the fully qualified attribute name.
      * @param value the attribute value
      * @param flags a bitwise flag
+     * @throws SAXException if attribute could not be added to output
      */
     public void addUniqueAttribute(String qName, String value, int flags)
         throws SAXException;
@@ -259,7 +260,7 @@ public interface ExtendedContentHandler extends org.xml.sax.ContentHandler
      * @param rawName the qualified name of the attribute
      * @param type the attribute type typically character data (CDATA)
      * @param value the value of the attribute
-     * @throws SAXException
+     * @throws SAXException if attribute could not be added to output
      */
     public void addAttribute(
         String uri,
diff --git a/serializer/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java
index bb7f90f5..837e3248 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java
@@ -33,7 +33,7 @@ public interface ExtendedLexicalHandler extends org.xml.sax.ext.LexicalHandler
      * This method is used to notify of a comment
      * @param comment the comment, but unlike the SAX comment() method this
      * method takes a String rather than a character array.
-     * @throws SAXException
+     * @throws SAXException if comment could not be processed
      */
     public void comment(String comment) throws SAXException;
 }
diff --git a/serializer/src/main/java/org/apache/xml/serializer/NamespaceMappings.java b/serializer/src/main/java/org/apache/xml/serializer/NamespaceMappings.java
index 91d25d34..0497c865 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/NamespaceMappings.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/NamespaceMappings.java
@@ -33,22 +33,22 @@ import org.xml.sax.SAXException;
  * 
  * <p>For example:
  * <pre>
- * <chapter xmlns:p1="def">
- *   <paragraph xmlns:p2="ghi">
- *      <sentance xmlns:p3="jkl">
- *      </sentance>
- *    </paragraph>
- *    <paragraph xlmns:p4="mno">
- *    </paragraph>
- * </chapter>
+ * &lt;chapter xmlns:p1="def"&gt;
+ *   &lt;paragraph xmlns:p2="ghi"&gt;
+ *      &lt;sentence xmlns:p3="jkl"&gt;
+ *      &lt;/sentence&gt;
+ *    &lt;/paragraph&gt;
+ *    &lt;paragraph xlmns:p4="mno"&gt;
+ *    &lt;/paragraph&gt;
+ * &lt;/chapter&gt;
  * </pre>
  * 
- * When the <chapter> element is encounted the prefix "p1" associated with uri
+ * When the &lt;chapter&gt; element is encounted the prefix "p1" associated with uri
  * "def" is pushed on the stack with depth 1.
- * When the first <paragraph> is encountered "p2" and "ghi" are pushed with
+ * When the first &lt;paragraph&gt; is encountered "p2" and "ghi" are pushed with
  * depth 2.
- * When the <sentance> is encountered "p3" and "jkl" are pushed with depth 3.
- * When </sentance> occurs the popNamespaces(3) will pop "p3"/"jkl" off the
+ * When the &lt;sentence&gt; is encountered "p3" and "jkl" are pushed with depth 3.
+ * When &lt;/sentence&gt; occurs the popNamespaces(3) will pop "p3"/"jkl" off the
  * stack.  Of course popNamespaces(2) would pop anything with depth 2 or
  * greater.
  * 
@@ -221,6 +221,7 @@ public class NamespaceMappings
      * @param prefix a String with the prefix for a qualified name
      * @param uri a String with the uri to which the prefix is to map
      * @param elemDepth the depth of current declaration
+     * @return true if binding succeeded, false otherwise
      */
     public boolean pushNamespace(String prefix, String uri, int elemDepth)
     {
diff --git a/serializer/src/main/java/org/apache/xml/serializer/SerializationHandler.java b/serializer/src/main/java/org/apache/xml/serializer/SerializationHandler.java
index fca975f3..6e0c8fd0 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/SerializationHandler.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/SerializationHandler.java
@@ -54,7 +54,7 @@ public interface SerializationHandler
     /**
      * Set the SAX Content handler that the serializer sends its output to. This
      * method only applies to a ToSAXHandler, not to a ToStream serializer.
-     * 
+     * @param ch the ContentHandler to recieve serializer's output
      * @see Serializer#asContentHandler()
      * @see ToSAXHandler
      */
@@ -67,7 +67,7 @@ public interface SerializationHandler
      * serialized.
      * 
      * @param node the DOM node to be serialized.
-     * @throws IOException
+     * @throws IOException if the serializer encounters IO problems.
      */
     public void serialize(Node node) throws IOException;
     /**
@@ -75,9 +75,14 @@ public interface SerializationHandler
      * 
      * Note that characters will
      * never, even if this option is set to 'true', be escaped within
-     * CDATA sections in output XML documents.
+     * CDATA sections in output XML documents. The only kind of escaping
+     * which takes place in that mode is when we are forced to end a
+     * CDATA section and begin a new one in order to split content that
+     * would otherwise include the CDATA end sequence.
      * 
      * @param escape true if escaping is to be set on.
+     * @return prior state of this flag, to permit restoring it later.
+     * @throws SAXException if the request cannot be handled correctly
      */
     public boolean setEscaping(boolean escape) throws SAXException;
 
@@ -131,6 +136,8 @@ public interface SerializationHandler
      * <p> 
      * For performance reasons this method should not be called
      * very often. 
+     * @throws SAXException if one was produced in the course of
+     * flushing the buffers (eg disk full or connection lost).
      */
     public void flushPending() throws SAXException;
     
diff --git a/serializer/src/main/java/org/apache/xml/serializer/Serializer.java b/serializer/src/main/java/org/apache/xml/serializer/Serializer.java
index 933d1c6e..19b24915 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/Serializer.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/Serializer.java
@@ -146,7 +146,7 @@ public interface Serializer {
      * "omit-xml-declaration", "standalone", doctype-public",
      * "doctype-system", "cdata-section-elements", "indent", "media-type". 
      * These property keys and their values are described in the XSLT recommendation,
-     * see {@link <a href="http://www.w3.org/TR/1999/REC-xslt-19991116"> XSLT 1.0 recommendation</a>}
+     * &lt;a href="http://www.w3.org/TR/1999/REC-xslt-19991116"&gt; XSLT 1.0 recommendation&lt;/a&gt;
      * <p>
      * The non-standard property keys supported are defined in {@link OutputPropertiesFactory}.
      *
diff --git a/serializer/src/main/java/org/apache/xml/serializer/SerializerBase.java b/serializer/src/main/java/org/apache/xml/serializer/SerializerBase.java
index 1df30014..c0c3585c 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/SerializerBase.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/SerializerBase.java
@@ -91,6 +91,7 @@ public abstract class SerializerBase
     /**
      * To fire off the end element trace event
      * @param name Name of element
+     * @throws SAXException if the trace handler produces one
      */
     protected void fireEndElem(String name)
         throws org.xml.sax.SAXException
@@ -107,6 +108,7 @@ public abstract class SerializerBase
      * @param chars  content of characters
      * @param start  starting index of characters to output
      * @param length  number of characters to output
+     * @throws SAXException if the trace handler produces one
      */
     protected void fireCharEvent(char[] chars, int start, int length)
         throws org.xml.sax.SAXException
@@ -123,7 +125,7 @@ public abstract class SerializerBase
 	 */
     protected boolean m_needToCallStartDocument = true; 
 
-    /** True if a trailing "]]>" still needs to be written to be
+    /** True if a trailing "]]&gt;" still needs to be written to be
      * written out. Used to merge adjacent CDATA sections
      */
     protected boolean m_cdataTagOpen = false;
@@ -273,6 +275,8 @@ public abstract class SerializerBase
      * TODO: This method is a HACK! We do not have access to the
      * XML file, it sometimes generates a NS prefix of the form "ns?" for
      * an attribute.
+     * @param qname Qualified name to be patched.
+     * @return Replacement qname
      */
     protected String patchName(String qname)
     {
@@ -563,7 +567,7 @@ public abstract class SerializerBase
 
    /**
      * Sets the character encoding coming from the xsl:output encoding stylesheet attribute.
-     * @param m_encoding the character encoding
+     * @param encoding the character encoding
      */
     public void setEncoding(String encoding)
     {
@@ -895,8 +899,7 @@ public abstract class SerializerBase
      * Entity reference event.
      *
      * @param name Name of entity
-     *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException if the serializer or tracer encounters an error.
      */
     public void entityReference(String name) throws org.xml.sax.SAXException
     {
@@ -943,7 +946,7 @@ public abstract class SerializerBase
      * This method gets the nodes value as a String and uses that String as if
      * it were an input character notification.
      * @param node the Node to serialize
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException if the serializer or tracer encounters an error.
      */
     public void characters(org.w3c.dom.Node node)
         throws org.xml.sax.SAXException
@@ -988,6 +991,7 @@ public abstract class SerializerBase
     /**
      * To fire off start entity trace event
      * @param name Name of entity
+     * @throws org.xml.sax.SAXException if the tracer encounters an error.
      */
     protected void fireStartEntity(String name)
         throws org.xml.sax.SAXException
@@ -1041,6 +1045,7 @@ public abstract class SerializerBase
      * @param chars  content of CDATA
      * @param start  starting index of characters to output
      * @param length  number of characters to output
+     * @throws org.xml.sax.SAXException if the serializer or tracer encounters an error.
      */
     protected void fireCDATAEvent(char[] chars, int start, int length)
         throws org.xml.sax.SAXException
@@ -1057,6 +1062,7 @@ public abstract class SerializerBase
      * @param chars  content of comment
      * @param start  starting index of comment to output
      * @param length  number of characters to output
+     * @throws org.xml.sax.SAXException if the serializer or tracer encounters an error.
      */
     protected void fireCommentEvent(char[] chars, int start, int length)
         throws org.xml.sax.SAXException
@@ -1072,6 +1078,7 @@ public abstract class SerializerBase
     /**
      * To fire off end entity trace event
      * @param name Name of entity
+     * @throws org.xml.sax.SAXException if the serializer or tracer encounters an error.
      */
     public void fireEndEntity(String name)
         throws org.xml.sax.SAXException
@@ -1083,6 +1090,7 @@ public abstract class SerializerBase
 
     /**
      * To fire off start document trace  event
+     * @throws org.xml.sax.SAXException if the serializer or tracer encounters an error.
      */
      protected void fireStartDoc()
         throws org.xml.sax.SAXException
@@ -1097,6 +1105,7 @@ public abstract class SerializerBase
 
     /**
      * To fire off end document trace event
+     * @throws org.xml.sax.SAXException if the serializer or tracer encounters an error.
      */
     protected void fireEndDoc()
         throws org.xml.sax.SAXException
@@ -1113,6 +1122,7 @@ public abstract class SerializerBase
      * called just before the attributes are cleared.
      * 
      * @param elemName the qualified name of the element
+     * @throws org.xml.sax.SAXException if the serializer or tracer encounters an error.
      * 
      */
     protected void fireStartElem(String elemName)
@@ -1127,21 +1137,11 @@ public abstract class SerializerBase
     }    
 
 
-    /**
-     * To fire off the end element event
-     * @param name Name of element
-     */
-//    protected void fireEndElem(String name)
-//        throws org.xml.sax.SAXException
-//    {
-//        if (m_tracer != null)
-//            m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_ENDELEMENT,name, (Attributes)null);     	        	    	
-//    }    
-
-
     /**
      * To fire off the PI trace event
      * @param name Name of PI
+     * @param data PI parameters (typically pseudoattributes)
+     * @throws org.xml.sax.SAXException if the serializer or tracer encounters an error.
      */
     protected void fireEscapingEvent(String name, String data)
         throws org.xml.sax.SAXException
@@ -1158,6 +1158,7 @@ public abstract class SerializerBase
     /**
      * To fire off the entity reference trace event
      * @param name Name of entity reference
+     * @throws org.xml.sax.SAXException if the serializer or tracer encounters an error.
      */
     protected void fireEntityReference(String name)
         throws org.xml.sax.SAXException
@@ -1180,8 +1181,6 @@ public abstract class SerializerBase
      *
      * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
-     *
-     * @throws org.xml.sax.SAXException
      */
     public void startDocument() throws org.xml.sax.SAXException
     {
@@ -1206,7 +1205,8 @@ public abstract class SerializerBase
      * called from an external caller, which in principle is just a matter of
      * style.
      * 
-     * @throws SAXException
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
+     *            wrapping another exception.
      */
     protected void startDocumentInternal() throws org.xml.sax.SAXException
     {
@@ -1443,10 +1443,9 @@ public abstract class SerializerBase
     
     
     /**
-     * Return true if nothing has been sent to this result tree yet.
+     * @return true if nothing has been sent to this result tree yet.
      * <p>
      * This is not a public API.
-     * 
      * @xsl.usage internal
      */
     public boolean documentIsEmpty() {
@@ -1455,9 +1454,9 @@ public abstract class SerializerBase
     }    
     
     /**
-     * Return true if the current element in m_elemContext
+     * @return true if the current element in m_elemContext
      * is a CDATA section.
-     * CDATA sections are specified in the <xsl:output> attribute
+     * CDATA sections are specified in the &lt;xsl:output&gt; attribute
      * cdata-section-names or in the JAXP equivalent property.
      * In any case the format of the value of such a property is:
      * <pre>
@@ -1561,8 +1560,8 @@ public abstract class SerializerBase
      * not the default value. If there is a default
      * value, but no non-default value this method
      * will return null.
-     * <p>
-     * 
+     * @param name Property name to be queried
+     * @return default value, or null if no default is defined
      */
     public String getOutputPropertyNonDefault(String name )
     {
diff --git a/serializer/src/main/java/org/apache/xml/serializer/SerializerConstants.java b/serializer/src/main/java/org/apache/xml/serializer/SerializerConstants.java
index 41cb4560..49a06dbd 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/SerializerConstants.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/SerializerConstants.java
@@ -27,13 +27,11 @@ package org.apache.xml.serializer;
 interface SerializerConstants
 {
 
-    /** To insert ]]> in a CDATA section by ending the last CDATA section with
-     * ]] and starting the next CDATA section with >
+    /** Use to insert ]]&lt; in a CDATA section context by ending the
+     * last CDATA section with ]] and starting the next CDATA section
+     * with &lt;
      */
     static final String CDATA_CONTINUE = "]]]]><![CDATA[>";
-    /**
-     * The constant "]]>"
-     */
     static final String CDATA_DELIMITER_CLOSE = "]]>";
     static final String CDATA_DELIMITER_OPEN = "<![CDATA[";
 
diff --git a/serializer/src/main/java/org/apache/xml/serializer/SerializerFactory.java b/serializer/src/main/java/org/apache/xml/serializer/SerializerFactory.java
index e4529614..aca99f77 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/SerializerFactory.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/SerializerFactory.java
@@ -27,6 +27,7 @@ import javax.xml.transform.OutputKeys;
 
 import org.apache.xml.serializer.utils.MsgKey;
 import org.apache.xml.serializer.utils.Utils;
+import org.apache.xml.serializer.utils.WrappedRuntimeException;
 import org.xml.sax.ContentHandler;
 
 /**
@@ -39,12 +40,13 @@ import org.xml.sax.ContentHandler;
    * using this factory ensures that the default key/value properties
    * are set for the given output "method".
    * 
-   * <p>
-   * The standard property keys supported are: "method", "version", "encoding",
-   * "omit-xml-declaration", "standalone", doctype-public",
-   * "doctype-system", "cdata-section-elements", "indent", "media-type". 
-   * These property keys and their values are described in the XSLT recommendation,
-   * see {@link <a href="http://www.w3.org/TR/1999/REC-xslt-19991116"> XSLT 1.0 recommendation</a>}
+   * <p> The standard property keys supported are: "method",
+   * "version", "encoding", "omit-xml-declaration", "standalone",
+   * doctype-public", "doctype-system", "cdata-section-elements",
+   * "indent", "media-type".  These property keys and their values are
+   * described in the <a
+   * href="http://www.w3.org/TR/1999/REC-xslt-19991116"> XSLT 1.0
+   * recommendation</a>
    * 
    * <p>
    * The value of the "cdata-section-elements" property key is a whitespace
@@ -79,13 +81,13 @@ public final class SerializerFactory
    * an exception of some type will be thrown.
    * For a list of the output "method" key values see {@link Method}.
    *
+   * May thrown an Exception if the class for the serializer is not
+   * found, or is found but does not implement ContentHandler.
+   *
    * @param format The output format, minimally the "method" property must be set.
    * @return A suitable serializer.
    * @throws IllegalArgumentException if method is
    * null or an appropriate serializer can't be found
-   * @throws Exception if the class for the serializer is found but does not
-   * implement ContentHandler.
-   * @throws WrappedRuntimeException if an exception is thrown while trying to find serializer
    */
   public static Serializer getSerializer(Properties format)
   {
diff --git a/serializer/src/main/java/org/apache/xml/serializer/ToHTMLSAXHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ToHTMLSAXHandler.java
index 097d3a04..9b5e87bc 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/ToHTMLSAXHandler.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToHTMLSAXHandler.java
@@ -79,7 +79,6 @@ public final class ToHTMLSAXHandler extends ToSAXHandler
     }
 
     /**
-     * Returns null
      * @return null
      * @see Serializer#getWriter()
      */
@@ -90,14 +89,19 @@ public final class ToHTMLSAXHandler extends ToSAXHandler
 
     /**
      * Does nothing.
-     *
+     * @throws SAXException never
+     * @param n would normally be the number of columns to indent by
      */
     public void indent(int n) throws SAXException
     {
     }
 
     /**
-     * Does nothing.
+     * Does nothing. NOTE: we *COULD* have functionality here that
+     * Did Something Appropriate, if we could agree on what that is.
+     * Convert to text?
+     * @throws IOException never
+     * @param node DOM node to be ignored
      * @see DOMSerializer#serialize(Node)
      */
     public void serialize(Node node) throws IOException
@@ -108,10 +112,9 @@ public final class ToHTMLSAXHandler extends ToSAXHandler
     /**
      * Turns special character escaping on/off.
      *
-     *
      * @param escape true if escaping is to be set on.
-     *
      * @see SerializationHandler#setEscaping(boolean)
+     * @throws SAXException never (I think), but signature requires it.
      */
     public boolean setEscaping(boolean escape) throws SAXException
     {
@@ -283,8 +286,6 @@ public final class ToHTMLSAXHandler extends ToSAXHandler
      *        none was supplied.
      * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
-     *
-     * @throws org.xml.sax.SAXException
      * @see org.xml.sax.ContentHandler#processingInstruction(String, String)
      */
     public void processingInstruction(String target, String data)
@@ -335,9 +336,6 @@ public final class ToHTMLSAXHandler extends ToSAXHandler
      * @see org.xml.sax.ContentHandler#startElement
      * @see org.xml.sax.ContentHandler#endElement
      * @see org.xml.sax.AttributeList
-     *
-     * @throws org.xml.sax.SAXException
-     *
      * @see org.xml.sax.ContentHandler#startElement(String, String, String, Attributes)
      */
     public void startElement(
@@ -419,10 +417,6 @@ public final class ToHTMLSAXHandler extends ToSAXHandler
      *
      * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
-     *
-     * @throws org.xml.sax.SAXException
-     *
-     *
      */
     public void endDocument() throws SAXException
     {
@@ -467,9 +461,7 @@ public final class ToHTMLSAXHandler extends ToSAXHandler
      * Receive notification of character data.
      *
      * @param chars The string of characters to process.
-     *
-     * @throws org.xml.sax.SAXException
-     *
+     * @throws org.xml.sax.SAXException if buffering fails
      * @see ExtendedContentHandler#characters(String)
      */
     public void characters(final String chars) throws SAXException
@@ -599,7 +591,7 @@ public final class ToHTMLSAXHandler extends ToSAXHandler
      * @see #ignorableWhitespace
      * @see org.xml.sax.Locator
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException if the underlying saxHandler objects
      *
      * @see org.xml.sax.ContentHandler#characters(char[], int, int)
      */
diff --git a/serializer/src/main/java/org/apache/xml/serializer/ToHTMLStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
index 453fac60..38e4632f 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
@@ -676,10 +676,7 @@ public class ToHTMLStream extends ToStream
     /**
      * Receive notification of the beginning of a document.
      *
-     * @throws org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
-     *
-     * @throws org.xml.sax.SAXException
+     * @throws SAXException if underlying handler reports an error
      */
     protected void startDocumentInternal() throws org.xml.sax.SAXException
     {
@@ -744,10 +741,7 @@ public class ToHTMLStream extends ToStream
     /**
      * Receive notification of the end of a document. 
      *
-     * @throws org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
-     *
-     * @throws org.xml.sax.SAXException
+     * @throws SAXException if underlying handler reports an error
      */
     public final void endDocument() throws org.xml.sax.SAXException
     {
@@ -773,9 +767,8 @@ public class ToHTMLStream extends ToStream
     /**
      *  Receive notification of the beginning of an element.
      *
-     *
-     *  @param namespaceURI
-     *  @param localName
+     *  @param namespaceURI Element namespace binding from qname
+     *  @param localName Element's local name from qname
      *  @param name The element type name.
      *  @param atts The attributes attached to the element, if any.
      *  @throws org.xml.sax.SAXException Any SAX exception, possibly
@@ -917,10 +910,8 @@ public class ToHTMLStream extends ToStream
 
     /**
      *  Receive notification of the end of an element.
-     *
-     *
-     *  @param namespaceURI
-     *  @param localName
+     *  @param namespaceURI Element namespace binding from qname
+     *  @param localName Element's local name from qname
      *  @param name The element type name
      *  @throws org.xml.sax.SAXException Any SAX exception, possibly
      *             wrapping another exception.
@@ -1054,7 +1045,7 @@ public class ToHTMLStream extends ToStream
      * @param   elemDesc The description of the HTML element 
      *           that has this attribute.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws IOException if output fails
      */
     protected void processAttribute(
         java.io.Writer writer,
@@ -1139,11 +1130,12 @@ public class ToHTMLStream extends ToStream
      * Write the specified <var>string</var> after substituting non ASCII characters,
      * with <CODE>%HH</CODE>, where HH is the hex of the byte value.
      *
+     * @param   writer The writer to write the processed output to.
      * @param   string      String to convert to XML format.
      * @param doURLEscaping True if we should try to encode as 
      *                      per http://www.ietf.org/rfc/rfc2396.txt.
      *
-     * @throws org.xml.sax.SAXException if a bad surrogate pair is detected.
+     * @throws IOException (SAXException) if a bad surrogate pair is detected.
      */
     public void writeAttrURI(
         final java.io.Writer writer, String string, boolean doURLEscaping)
@@ -1381,7 +1373,7 @@ public class ToHTMLStream extends ToStream
      * @param   string      String to convert to XML format.
      * @param   encoding    CURRENTLY NOT IMPLEMENTED.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws IOException (org.xml.sax.SAXException)
      */
     public void writeAttrString(
         final java.io.Writer writer, String string, String encoding)
@@ -1523,8 +1515,6 @@ public class ToHTMLStream extends ToStream
      *            wrapping another exception.
      * @see #ignorableWhitespace
      * @see org.xml.sax.Locator
-     *
-     * @throws org.xml.sax.SAXException
      */
     public final void characters(char chars[], int start, int length)
         throws org.xml.sax.SAXException
@@ -1587,8 +1577,6 @@ public class ToHTMLStream extends ToStream
      *             wrapping another exception.
      *  @see #ignorableWhitespace
      *  @see org.xml.sax.Locator
-     *
-     * @throws org.xml.sax.SAXException
      */
     public final void cdata(char ch[], int start, int length)
         throws org.xml.sax.SAXException
@@ -1638,8 +1626,6 @@ public class ToHTMLStream extends ToStream
      *         none was supplied.
      *  @throws org.xml.sax.SAXException Any SAX exception, possibly
      *             wrapping another exception.
-     *
-     * @throws org.xml.sax.SAXException
      */
     public void processingInstruction(String target, String data)
         throws org.xml.sax.SAXException
@@ -1727,7 +1713,7 @@ public class ToHTMLStream extends ToStream
      *
      * @param name non-null reference to entity name string.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws SAXException if underlying handler reports an error
      */
     public final void entityReference(String name)
         throws org.xml.sax.SAXException
@@ -1762,7 +1748,7 @@ public class ToHTMLStream extends ToStream
      * @param nAttrs the number of attributes in m_attributes 
      * to be processed
      *
-     * @throws org.xml.sax.SAXException
+     * @throws SAXException if underlying handler reports an error
      */
     public void processAttributes(java.io.Writer writer, int nAttrs)
         throws IOException,SAXException
@@ -1781,11 +1767,11 @@ public class ToHTMLStream extends ToStream
     }
 
     /**
-     * For the enclosing elements starting tag write out out any attributes
-     * followed by ">". At this point we also mark if this element is
-     * a cdata-section-element.
+     * For the enclosing elements starting tag write out out any
+     * attributes followed by the &gt; character. At this point we
+     * also mark if this element is a cdata-section-element.
      *
-     *@throws org.xml.sax.SAXException
+     *@throws SAXException if underlying handler reports an error
      */
     protected void closeStartTag() throws SAXException
     {
@@ -1866,7 +1852,7 @@ public class ToHTMLStream extends ToStream
 
     /**
      * Report the end of DTD declarations.
-     * @throws org.xml.sax.SAXException The application may raise an exception.
+     * @throws SAXException if underlying handler reports an error 
      * @see #startDTD
      */
     public void endDTD() throws org.xml.sax.SAXException
diff --git a/serializer/src/main/java/org/apache/xml/serializer/ToSAXHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
index 0373f1dd..75d423de 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
@@ -113,7 +113,7 @@ public abstract class ToSAXHandler extends SerializerBase
      *
      * @param characters The string of characters to process.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws SAXException if underlying handler reports an error
      *
      * @see ExtendedContentHandler#characters(String)
      */
@@ -179,13 +179,11 @@ public abstract class ToSAXHandler extends SerializerBase
      * SAX method additional namespace or attribute information can occur before
      * or after this call, that is associated with this element.
      *
-     * @throws org.xml.sax.SAXException Any SAX exception, possibly
-     *            wrapping another exception.
      * @see org.xml.sax.ContentHandler#startElement
      * @see org.xml.sax.ContentHandler#endElement
      * @see org.xml.sax.AttributeList
      *
-     * @throws org.xml.sax.SAXException
+     * @throws SAXException if underlying handler reports an error
      *
      * @see org.xml.sax.ContentHandler#startElement(String,String,String,Attributes)
      */
@@ -342,7 +340,7 @@ public abstract class ToSAXHandler extends SerializerBase
      * This method gets the node's value as a String and uses that String as if
      * it were an input character notification.
      * @param node the Node to serialize
-     * @throws org.xml.sax.SAXException
+     * @throws SAXException if underlying handler reports an error
      */    
     public void characters(org.w3c.dom.Node node)
         throws org.xml.sax.SAXException
diff --git a/serializer/src/main/java/org/apache/xml/serializer/ToStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToStream.java
index 1134eb7e..6340f241 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/ToStream.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToStream.java
@@ -141,7 +141,7 @@ abstract public class ToStream extends SerializerBase
     boolean m_shouldFlush = true;
 
     /**
-     * Add space before '/>' for XHTML.
+     * Add space before self-closing '/&gt;' syntax for XHTML.
      */
     protected boolean m_spaceBeforeClose = false;
 
@@ -184,9 +184,9 @@ abstract public class ToStream extends SerializerBase
     }
 
     /**
-     * This helper method to writes out "]]>" when closing a CDATA section.
+     * This helper method writes the syntax for closing a CDATA section.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException if write fails
      */
     protected void closeCDATA() throws org.xml.sax.SAXException
     {
@@ -233,7 +233,7 @@ abstract public class ToStream extends SerializerBase
     /**
      * Flush the formatter's result stream.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException if write fails
      */
     protected final void flushWriter() throws org.xml.sax.SAXException
     {
@@ -357,7 +357,7 @@ abstract public class ToStream extends SerializerBase
      * @param name non-null reference to document type name.
      * NEEDSDOC @param value
      *
-     * @throws org.xml.sax.SAXException
+     * @throws IOException if an error occurs during writing.
      */
     void outputEntityDecl(String name, String value) throws IOException
     {
@@ -373,11 +373,11 @@ abstract public class ToStream extends SerializerBase
     /**
      * Output a system-dependent line break.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws IOException if an error occurs during writing.
+
      */
     protected final void outputLineSep() throws IOException
     {
-
         m_writer.write(m_lineSep, 0, m_lineSepLen);
     }
 
@@ -780,7 +780,7 @@ abstract public class ToStream extends SerializerBase
      * 
      * @param depth the indentation depth (element nesting depth)
      *
-     * @throws org.xml.sax.SAXException if an error occurs during writing.
+     * @throws IOException if an error occurs during writing.
      */
     protected void indent(int depth) throws IOException
     {
@@ -798,7 +798,7 @@ abstract public class ToStream extends SerializerBase
     
     /**
      * Indent at the current element nesting depth.
-     * @throws IOException
+     * @throws IOException if an error occurs while writing
      */
     protected void indent() throws IOException
     {
@@ -808,7 +808,7 @@ abstract public class ToStream extends SerializerBase
      * Prints <var>n</var> spaces.
      * @param n         Number of spaces to print.
      *
-     * @throws org.xml.sax.SAXException if an error occurs when writing.
+     * @throws IOException if an error occurs while writing
      */
     private void printSpace(int n) throws IOException
     {
@@ -934,7 +934,8 @@ abstract public class ToStream extends SerializerBase
     }
 
     /**
-     * Tell if this character can be written without escaping.
+     * @return true iff this character can be written without escaping.
+     * @param ch character to be tested
      */
     protected boolean escapingNotNeeded(char ch)
     {
@@ -976,8 +977,7 @@ abstract public class ToStream extends SerializerBase
      * the surrogate pair if an entity reference with that value
      * was written out. 
      * 
-     * @throws IOException
-     * @throws org.xml.sax.SAXException if invalid UTF-16 surrogate detected.
+     * @throws IOException if  invalid UTF-16 surrogate detected.
      */
     protected int writeUTF16Surrogate(char c, char ch[], int i, int end)
         throws IOException
@@ -1051,7 +1051,7 @@ abstract public class ToStream extends SerializerBase
      *
      * @return i+1 if the character was written, else i.
      *
-     * @throws java.io.IOException
+     * @throws java.io.IOException if error arose while writing
      */
     int accumDefaultEntity(
         java.io.Writer writer,
@@ -1100,8 +1100,8 @@ abstract public class ToStream extends SerializerBase
      * @param useSystemLineSeparator true if the operating systems 
      * end-of-line separator should be output rather than a new-line character.
      *
-     * @throws IOException
-     * @throws org.xml.sax.SAXException
+     * @throws IOException if unable to write
+     * @throws org.xml.sax.SAXException never (I think), but signature expects it
      */
     void writeNormalizedChars(
         char ch[],
@@ -1203,7 +1203,7 @@ abstract public class ToStream extends SerializerBase
      *
      * @see #startNonEscaping
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException never, but signature expects it
      */
     public void endNonEscaping() throws org.xml.sax.SAXException
     {
@@ -1218,7 +1218,7 @@ abstract public class ToStream extends SerializerBase
      * <p> The contents of the un-escaping section will be delivered through the
      * regular <tt>characters</tt> event.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException never, but signature expects it
      */
     public void startNonEscaping() throws org.xml.sax.SAXException
     {
@@ -1249,8 +1249,6 @@ abstract public class ToStream extends SerializerBase
      *            wrapping another exception.
      * @see #ignorableWhitespace
      * @see org.xml.sax.Locator
-     *
-     * @throws org.xml.sax.SAXException
      */
     protected void cdata(char ch[], int start, final int length)
         throws org.xml.sax.SAXException
@@ -1338,7 +1336,7 @@ abstract public class ToStream extends SerializerBase
      * @param start The start position in the array.
      * @param length The number of characters to read from the array.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException containing IOException, if one arises
      */
     protected void charactersRaw(char ch[], int start, int length)
         throws org.xml.sax.SAXException
@@ -1389,8 +1387,6 @@ abstract public class ToStream extends SerializerBase
      *            wrapping another exception.
      * @see #ignorableWhitespace
      * @see org.xml.sax.Locator
-     *
-     * @throws org.xml.sax.SAXException
      */
     public void characters(final char chars[], final int start, final int length)
         throws org.xml.sax.SAXException
@@ -1701,6 +1697,7 @@ abstract public class ToStream extends SerializerBase
      * @param fromTextNode true if the characters being processed are
      * from a text node, false if they are from an attribute value.
      * @return the index of the last character processed
+     * @throws IOException if an error occurs while writing
      */
     private int processDirty(
         char[] chars, 
@@ -1747,7 +1744,7 @@ abstract public class ToStream extends SerializerBase
      *
      * @param s The string of characters to process.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException if characters could not be handled
      */
     public void characters(String s) throws org.xml.sax.SAXException
     {
@@ -1777,7 +1774,7 @@ abstract public class ToStream extends SerializerBase
      * @return i+1 if a character was written, i+2 if two characters
      * were written out, else return i.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws IOException if an error occurs while writing
      */
     private int accumDefaultEscape(
         Writer writer,
@@ -1888,8 +1885,6 @@ abstract public class ToStream extends SerializerBase
      * @see org.xml.sax.ContentHandler#startElement
      * @see org.xml.sax.ContentHandler#endElement
      * @see org.xml.sax.AttributeList
-     *
-     * @throws org.xml.sax.SAXException
      */
     public void startElement(
         String namespaceURI,
@@ -1978,7 +1973,7 @@ abstract public class ToStream extends SerializerBase
       * @see org.xml.sax.ContentHandler#endElement
       * @see org.xml.sax.AttributeList
       *
-      * @throws org.xml.sax.SAXException
+      * @throws org.xml.sax.SAXException if characters could not be handled
       */
     public void startElement(
         String elementNamespaceURI,
@@ -2055,8 +2050,8 @@ abstract public class ToStream extends SerializerBase
      * @param nAttrs the number of attributes in m_attributes 
      * to be processed
      *
-     * @throws java.io.IOException
-     * @throws org.xml.sax.SAXException
+     * @throws IOException if an error occurs while writing
+     * @throws org.xml.sax.SAXException never (I think)
      */
     public void processAttributes(java.io.Writer writer, int nAttrs) throws IOException, SAXException
     {
@@ -2081,13 +2076,14 @@ abstract public class ToStream extends SerializerBase
     }
 
     /**
-     * Returns the specified <var>string</var> after substituting <VAR>specials</VAR>,
+     * Writes the specified <var>string</var> after substituting <VAR>specials</VAR>,
      * and UTF-16 surrogates for chracter references <CODE>&amp;#xnn</CODE>.
      *
+     * @param   writer      to recieve processed string
      * @param   string      String to convert to XML format.
      * @param   encoding    CURRENTLY NOT IMPLEMENTED.
      *
-     * @throws java.io.IOException
+     * @throws IOException if an error occurs while writing
      */
     public void writeAttrString(
         Writer writer,
@@ -2197,8 +2193,6 @@ abstract public class ToStream extends SerializerBase
      * @param name The element type name
      * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
-     *
-     * @throws org.xml.sax.SAXException
      */
     public void endElement(String namespaceURI, String localName, String name)
         throws org.xml.sax.SAXException
@@ -2529,8 +2523,6 @@ abstract public class ToStream extends SerializerBase
      * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see #characters
-     * 
-     * @throws org.xml.sax.SAXException
      */
     public void ignorableWhitespace(char ch[], int start, int length)
         throws org.xml.sax.SAXException
@@ -2602,9 +2594,9 @@ abstract public class ToStream extends SerializerBase
 
     /**
      * For the enclosing elements starting tag write out
-     * out any attributes followed by ">"
+     * out any attributes followed by the &gt; character.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException if underlying writer encounters error
      */
     protected void closeStartTag() throws SAXException
     {
@@ -2841,10 +2833,11 @@ abstract public class ToStream extends SerializerBase
      * Makes sure that the namespace URI for the given qualified attribute name
      * is declared.
      * @param ns the namespace URI
+     * @param localName the local name 
      * @param rawName the qualified name 
      * @return returns null if no action is taken, otherwise it returns the
      * prefix used in declaring the namespace. 
-     * @throws SAXException
+     * @throws SAXException if attempt to write declaration failed
      */
     protected String ensureAttributesNamespaceIsDeclared(
         String ns,
@@ -3542,9 +3535,9 @@ abstract public class ToStream extends SerializerBase
     }
     
     /**
-     * A private helper method to output the 
-     * @throws SAXException
-     * @throws IOException
+     * A private helper method to output the DTD
+     * @throws SAXException never (I think)
+     * @throws IOException if an error occurs while writing
      */
     private void DTDprolog() throws SAXException, IOException {
         final java.io.Writer writer = m_writer;
diff --git a/serializer/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
index 78c6ab08..c203eb8a 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
@@ -69,9 +69,7 @@ public final class ToTextSAXHandler extends ToSAXHandler
         super(hdlr, lex, encoding);
     }
     
-        /**
-     * From XSLTC
-     */
+    // This constructor supports XSLTC
     public ToTextSAXHandler(ContentHandler handler, String encoding)
     {
         super(handler,encoding);
@@ -120,9 +118,9 @@ public final class ToTextSAXHandler extends ToSAXHandler
     }
 
     /**
-     * Does nothing because 
-     * the indent attribute is ignored for text output.
-     *
+     * Does nothing
+     * @param n the indent attribute, ignored for text output.
+     * @throws SAXException never, but the method signature requires it.
      */
     public void indent(int n) throws SAXException
     {
diff --git a/serializer/src/main/java/org/apache/xml/serializer/ToTextStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToTextStream.java
index 312bc8b8..cf22d68a 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/ToTextStream.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToTextStream.java
@@ -57,8 +57,6 @@ public class ToTextStream extends ToStream
    *
    * @throws org.xml.sax.SAXException Any SAX exception, possibly
    *            wrapping another exception.
-   *
-   * @throws org.xml.sax.SAXException
    */
   protected void startDocumentInternal() throws org.xml.sax.SAXException
   {
@@ -80,8 +78,6 @@ public class ToTextStream extends ToStream
    *
    * @throws org.xml.sax.SAXException Any SAX exception, possibly
    *            wrapping another exception.
-   *
-   * @throws org.xml.sax.SAXException
    */
   public void endDocument() throws org.xml.sax.SAXException
   {
@@ -120,8 +116,6 @@ public class ToTextStream extends ToStream
    *            wrapping another exception.
    * @see #endElement
    * @see org.xml.sax.AttributeList
-   *
-   * @throws org.xml.sax.SAXException
    */
   public void startElement(
           String namespaceURI, String localName, String name, Attributes atts)
@@ -157,8 +151,6 @@ public class ToTextStream extends ToStream
    *        empty string if qualified names are not available.
    * @throws org.xml.sax.SAXException Any SAX exception, possibly
    *            wrapping another exception.
-   *
-   * @throws org.xml.sax.SAXException
    */
   public void endElement(String namespaceURI, String localName, String name)
           throws org.xml.sax.SAXException
@@ -264,8 +256,8 @@ public class ToTextStream extends ToStream
      * @param useLineSep true if the operating systems 
      * end-of-line separator should be output rather than a new-line character.
      * 
-     * @throws IOException
-     * @throws org.xml.sax.SAXException
+     * @throws IOException if the write fails
+     * @throws org.xml.sax.SAXException if processing fails in the handler layer
      */
     void writeNormalizedChars(
         final char ch[],
@@ -412,8 +404,6 @@ public class ToTextStream extends ToStream
    * @throws org.xml.sax.SAXException Any SAX exception, possibly
    *            wrapping another exception.
    * @see #characters
-   *
-   * @throws org.xml.sax.SAXException
    */
   public void ignorableWhitespace(char ch[], int start, int length)
           throws org.xml.sax.SAXException
@@ -445,8 +435,6 @@ public class ToTextStream extends ToStream
    *        none was supplied.
    * @throws org.xml.sax.SAXException Any SAX exception, possibly
    *            wrapping another exception.
-   *
-   * @throws org.xml.sax.SAXException
    */
   public void processingInstruction(String target, String data)
           throws org.xml.sax.SAXException
@@ -504,7 +492,7 @@ public class ToTextStream extends ToStream
    *
    * @param name non-null reference to the name of the entity.
    *
-   * @throws org.xml.sax.SAXException
+   * @throws org.xml.sax.SAXException if processing fails in the handler layer
    */
   public void entityReference(String name) throws org.xml.sax.SAXException
   {
diff --git a/serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
index e7ed0e01..b4777772 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
@@ -37,9 +37,9 @@ import org.xml.sax.SAXException;
 
 
 /**
- *This class wraps another SerializationHandler. The wrapped object will either
+ * This class wraps another SerializationHandler. The wrapped object will either
  * handler XML or HTML, which is not known until a little later when the first XML
- * tag is seen.  If the first tag is <html> then the wrapped object is an HTML
+ * tag is seen.  If the first tag is &lt;html&gt; then the wrapped object is an HTML
  * handler, otherwise it is an XML handler.
  *
  * This class effectively caches the first few calls to it then passes them
diff --git a/serializer/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
index eb18c8a2..a9b9cc4f 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
@@ -83,14 +83,17 @@ public final class ToXMLSAXHandler extends ToSAXHandler
 
     /**
      * Do nothing for SAX.
+     * @param n Indentation in character-columns, ignored here
+     * @throws SAXException never, but inheritance requires it.
      */
     public void indent(int n) throws SAXException
     {
     }
 
 
-    /**
+    /** @param node A DOM node (which this implementation will ignore)
      * @see DOMSerializer#serialize(Node)
+     * @throws IOException never, but inheritance requires it.
      */
     public void serialize(Node node) throws IOException
     {
@@ -217,12 +220,11 @@ public final class ToXMLSAXHandler extends ToSAXHandler
      * unlike the this.endCDATA() method (from the LexicalHandler) interface,
      * this "internal" method will send the endCDATA() call to the wrapped
      * handler.
-     * 
      */
     public void closeCDATA() throws SAXException
     {
 
-        // Output closing bracket - "]]>"
+        // Output CDATA closing bracket - "]]>"
         if (m_lexHandler != null && m_cdataTagOpen) {
             m_lexHandler.endCDATA();
         }
@@ -491,7 +493,7 @@ public final class ToXMLSAXHandler extends ToSAXHandler
 
     /**
      * Start an element in the output document. This might be an XML element
-     * (<elem>data</elem> type) or a CDATA section.
+     * (&lt;elem&gt;data&lt;/elem&gt; type) or a CDATA section.
      */
     public void startElement(
     String elementNamespaceURI,
@@ -570,9 +572,11 @@ public final class ToXMLSAXHandler extends ToSAXHandler
     }
 
     /**
-     *
-     * @see org.xml.sax.ContentHandler#processingInstruction(String, String)
      * Send a processing instruction to the output document
+     * @param target "name" of processing instruction
+     * @param data "value" of processing instruction
+     * @throws SAXException if underlying handler throws one
+     * @see org.xml.sax.ContentHandler#processingInstruction(String, String)
      */
     public void processingInstruction(String target, String data)
         throws SAXException
@@ -591,6 +595,8 @@ public final class ToXMLSAXHandler extends ToSAXHandler
     /**
      * Undeclare the namespace that is currently pointed to by a given
      * prefix. Inform SAX handler if prefix was previously mapped.
+     * @param prefix Namespace prefix mapping to be removed
+     * @return true iff a mapping was present to be removed
      */
     protected boolean popNamespace(String prefix)
     {
diff --git a/serializer/src/main/java/org/apache/xml/serializer/ToXMLStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToXMLStream.java
index e1ca8447..da444c34 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/ToXMLStream.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToXMLStream.java
@@ -102,8 +102,6 @@ public class ToXMLStream extends ToStream
      *
      * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
-     *
-     * @throws org.xml.sax.SAXException
      */
     public void startDocumentInternal() throws org.xml.sax.SAXException
     {
@@ -178,8 +176,6 @@ public class ToXMLStream extends ToStream
      *
      * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
-     *
-     * @throws org.xml.sax.SAXException
      */
     public void endDocument() throws org.xml.sax.SAXException
     {
@@ -212,7 +208,7 @@ public class ToXMLStream extends ToStream
      * The contents of the whitespace preserving section will be delivered
      * through the regular <tt>characters</tt> event.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException never (I think) but required by signature
      */
     public void startPreserving() throws org.xml.sax.SAXException
     {
@@ -228,7 +224,7 @@ public class ToXMLStream extends ToStream
      *
      * @see #startPreserving
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException never (I think), but required by signature.
      */
     public void endPreserving() throws org.xml.sax.SAXException
     {
@@ -245,8 +241,6 @@ public class ToXMLStream extends ToStream
      *        none was supplied.
      * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
-     *
-     * @throws org.xml.sax.SAXException
      */
     public void processingInstruction(String target, String data)
         throws org.xml.sax.SAXException
@@ -339,7 +333,7 @@ public class ToXMLStream extends ToStream
      *
      * @param name The name of the entity.
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException never (I think), but required by signature.
      */
     public void entityReference(String name) throws org.xml.sax.SAXException
     {
@@ -418,14 +412,14 @@ public class ToXMLStream extends ToStream
 
     /**
      * Add an attribute to the current element.
-     * @param uri the URI associated with the element name
+     * @param uri the URI associated with the attribute's namespace prefix
      * @param localName local part of the attribute name
      * @param rawName   prefix:localName
-     * @param type
+     * @param type the attribute type typically character data (CDATA)
      * @param value the value of the attribute
      * @param xslAttribute true if this attribute is from an xsl:attribute,
      * false if declared within the elements opening tag.
-     * @throws SAXException
+     * @throws org.xml.sax.SAXException never (I think), but required by signature.
      */
     public void addAttribute(
         String uri,
@@ -553,6 +547,9 @@ public class ToXMLStream extends ToStream
      * From XSLTC
      * Declare a prefix to point to a namespace URI. Inform SAX handler
      * if this is a new prefix mapping.
+     * @param prefix to be bound to namespace URI
+     * @param uri namespace identifier string
+     * @return true if prefix successfully bound, false otherwise.
      */
     protected boolean pushNamespace(String prefix, String uri)
     {
diff --git a/serializer/src/main/java/org/apache/xml/serializer/TransformStateSetter.java b/serializer/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
index 0375773b..2f8dc949 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
@@ -25,7 +25,7 @@ import javax.xml.transform.Transformer;
 import org.w3c.dom.Node;
 /**
  * This interface is meant to be used by a base interface to
- * TransformState, but which as only the setters which have non Xalan
+ * TransformState, but which has only the setters which have non Xalan
  * specific types in their signature, so that there are no dependancies
  * of the serializer on Xalan.
  * 
@@ -49,7 +49,7 @@ public interface TransformStateSetter
   /**
    * Reset the state on the given transformer object.
    *
-   * @param transformer
+   * @param transformer The transformer to have its state reset
    */
   void resetState(Transformer transformer);
 
diff --git a/serializer/src/main/java/org/apache/xml/serializer/TreeWalker.java b/serializer/src/main/java/org/apache/xml/serializer/TreeWalker.java
index 756a5da4..fd3e225f 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/TreeWalker.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/TreeWalker.java
@@ -24,6 +24,7 @@ import java.io.File;
 
 import org.apache.xml.serializer.utils.AttList;
 import org.apache.xml.serializer.utils.DOM2Helper;
+import org.apache.xml.serializer.utils.WrappedRuntimeException;
 import org.w3c.dom.Comment;
 import org.w3c.dom.Element;
 import org.w3c.dom.EntityReference;
@@ -33,6 +34,7 @@ import org.w3c.dom.ProcessingInstruction;
 import org.w3c.dom.Text;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
 import org.xml.sax.ext.LexicalHandler;
 import org.xml.sax.helpers.LocatorImpl;
 
@@ -84,6 +86,8 @@ public final class TreeWalker
    * Constructor.
    * @param   contentHandler The implemention of the
    * contentHandler operation (toXMLString, digest, ...)
+   * @param systemId to be set into the output document. If null we
+   * use a default (currently dummy.xsl)
    */
   public TreeWalker(ContentHandler contentHandler, String systemId)
   {
@@ -131,7 +135,7 @@ public final class TreeWalker
    *  
    * @param pos Node in the tree where to start traversal
    *
-   * @throws TransformerException
+   * @throws SAXException if the ContentHandler objects to the request.
    */
   public void traverse(Node pos) throws org.xml.sax.SAXException
   {
@@ -187,7 +191,7 @@ public final class TreeWalker
    * @param pos Node in the tree where to start traversal
    * @param top Node in the tree where to end traversal
    *
-   * @throws TransformerException
+   * @throws SAXException if the ContentHandler objects to the request.
    */
   public void traverse(Node pos, Node top) throws org.xml.sax.SAXException
   {
@@ -232,6 +236,7 @@ public final class TreeWalker
   
   /**
    * Optimized dispatch of characters.
+   * @throws SAXException if the ContentHandler objects to the request.
    */
   private final void dispatachChars(Node node)
      throws org.xml.sax.SAXException
@@ -252,8 +257,7 @@ public final class TreeWalker
    *
    *
    * @param node Node to process
-   *
-   * @throws org.xml.sax.SAXException
+   * @throws SAXException if the ContentHandler objects to the request.
    */
   protected void startNode(Node node) throws org.xml.sax.SAXException
   {
@@ -428,7 +432,6 @@ public final class TreeWalker
       }
       else
       {
-
         // warning("Can not output entity to a pure SAX ContentHandler");
       }
     }
@@ -443,7 +446,7 @@ public final class TreeWalker
    *
    * @param node Node we just finished processing
    *
-   * @throws org.xml.sax.SAXException
+   * @throws SAXException if the ContentHandler objects to the request.
    */
   protected void endNode(Node node) throws org.xml.sax.SAXException
   {
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/Version.src b/serializer/src/main/java/org/apache/xml/serializer/Version.java
similarity index 91%
copy from serializer/src/main/resources/org/apache/xml/serializer/Version.src
copy to serializer/src/main/java/org/apache/xml/serializer/Version.java
index deb26637..240d5619 100644
--- a/serializer/src/main/resources/org/apache/xml/serializer/Version.src
+++ b/serializer/src/main/java/org/apache/xml/serializer/Version.java
@@ -59,7 +59,7 @@ public final class Version
   }
   
   /**
-   * Name of product: Serializer.
+   * @return String name of product: Serializer.
    */
   public static String getProduct()
   {
@@ -67,7 +67,7 @@ public final class Version
   }
 
   /**
-   * Implementation Language: Java.
+   * @return String implementation Language: Java.
    */
   public static String getImplementationLanguage()
   {
@@ -76,7 +76,7 @@ public final class Version
   
   
   /**
-   * Major version number.
+   * @return int Major version number.
    * Version number. This changes only when there is a
    *          significant, externally apparent enhancement from
    *          the previous release. 'n' represents the n'th
@@ -88,12 +88,12 @@ public final class Version
    */
   public static int getMajorVersionNum()
   {
-    return @version.VERSION@;
+    return 2;
     
   }  
 
   /**
-   * Release Number.
+   * @return int Release Number.
    * Release number. This changes when:
    *            -  a new set of functionality is to be added, eg,
    *               implementation of a new W3C specification.
@@ -102,11 +102,11 @@ public final class Version
    */
   public static int getReleaseVersionNum()
   {
-    return @version.RELEASE@;
+    return 7;
   }
   
   /**
-   * Maintenance Drop Number.
+   * @return int Maintenance Drop Number.
    * Optional identifier used to designate maintenance
    *          drop applied to a specific release and contains
    *          fixes for defects reported. It maintains compatibility
@@ -116,11 +116,11 @@ public final class Version
    */
   public static int getMaintenanceVersionNum()
   {
-    return @version.MINOR@;
+    return 3;
   }
 
   /**
-   * Development Drop Number.
+   * @return int Development Drop Number.
    * Optional identifier designates development drop of
    *          a specific release. D01 is the first development drop
    *          of a new release.
@@ -139,10 +139,10 @@ public final class Version
   public static int getDevelopmentVersionNum()
   { 
     try {   
-        if ((new String("@version.DEVELOPER@")).length() == 0)
+        if ((new String("")).length() == 0)
           return 0;
         else  
-          return Integer.parseInt("@version.DEVELOPER@");
+          return Integer.parseInt("");
     } catch (NumberFormatException nfe) {
            return 0;
     }    
diff --git a/serializer/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java b/serializer/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java
index f5676f78..a285b154 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java
@@ -28,7 +28,7 @@ import java.util.Vector;
  * 
  * In an XSLT stylesheet these attributes appear for example as:
  * <pre>
- * <xsl:output method="xml" omit-xml-declaration="no" indent="yes"/> 
+ * &lt;xsl:output method="xml" omit-xml-declaration="no" indent="yes"/&gt;
  * </pre>
  * The xsl:output attributes covered in this interface are:
  * <pre>
@@ -215,7 +215,7 @@ interface XSLOutputAttributes
      * <li> "{http://xml.apache.org/xalan}indent-amount"
      * <li> "{http://xml.apache.org/xalan}line-separator"
      * </ul>
-     * @val The non-default value of the parameter
+     * @param val The non-default value of the parameter
      */    
     public void   setOutputProperty(String name, String val);
     
@@ -230,7 +230,7 @@ interface XSLOutputAttributes
      * <li> "{http://xml.apache.org/xalan}indent-amount"
      * <li> "{http://xml.apache.org/xalan}line-separator"
      * </ul>
-     * @val The default value of the parameter
+     * @param val The default value of the parameter
      */ 
     public void   setOutputPropertyDefault(String name, String val);
 }
diff --git a/serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
index 3f765d9e..e382ba5d 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
@@ -87,7 +87,7 @@ public final class DOM3SerializerImpl implements DOM3Serializer {
     }
     
     /**
-     * Gets the end-of-line sequence of characters to be used during serialization.
+     * @return char[] containing the end-of-line sequence of characters to be used during serialization.
      */
     public char[] getNewLine() {
         return (fNewLine != null) ? fNewLine.toCharArray() : null;
diff --git a/serializer/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java
index c2ce783e..7ce20c3b 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java
@@ -1363,9 +1363,7 @@ final public class LSSerializerImpl implements DOMConfiguration, LSSerializer {
      * 
      * @param  nodeArg The Node to serialize
      * @return A String containing the version pseudo-attribute of the XMLDecl.  
-     * @throws Throwable if the DOM implementation does not implement Document.getXmlVersion()      
      */
-    //protected String getXMLVersion(Node nodeArg) throws Throwable {
     protected String getXMLVersion(Node nodeArg) {
         Document doc = null;
         
@@ -1393,10 +1391,10 @@ final public class LSSerializerImpl implements DOMConfiguration, LSSerializer {
     /** 
      * Determines the XML Encoding of the Document Node to serialize.  If the Document Node
      * is not a DOM Level 3 Node, then the default encoding "UTF-8" is returned.
+     * NOTE: May throw an unspecified Throwable if the DOM implementation does not implement Document.getXmlEncoding()     
      * 
      * @param  nodeArg The Node to serialize
      * @return A String containing the encoding pseudo-attribute of the XMLDecl.  
-     * @throws Throwable if the DOM implementation does not implement Document.getXmlEncoding()     
      */
     protected String getXMLEncoding(Node nodeArg) {
         Document doc = null;
diff --git a/serializer/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
index 445f3eb9..a7eb6bff 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
@@ -150,6 +150,9 @@ public class NamespaceSupport {
     } // popContext()
 
 	/**
+	 * @param prefix String containing the QName prefix to be bound
+	 * @param uri String containing the namespace URI to bind to prefix
+	 * @return false if binding the prefix is forbidden(xml: and xmlns:), otherwise true
 	 * @see org.apache.xerces.xni.NamespaceContext#declarePrefix(String, String)
 	 */
     public boolean declarePrefix(String prefix, String uri) {
@@ -189,6 +192,9 @@ public class NamespaceSupport {
     } // declarePrefix(String,String):boolean
 
 	/**
+	 * @param prefix String prefix to be looked up in this context
+	 * @return String containing the Namespace URI bound to that prefix,
+	 * or null if unbound
 	 * @see org.apache.xerces.xni.NamespaceContext#getURI(String)
 	 */
     public String getURI(String prefix) {
@@ -207,9 +213,13 @@ public class NamespaceSupport {
     } // getURI(String):String
 
 
-	/**
-	 * @see org.apache.xerces.xni.NamespaceContext#getPrefix(String)
-	 */
+    /**
+     * @param uri String containing the Namespace URI to be looked up
+     * @return String containing a prefix bound to that namespace
+     * or null if unbound. CAVEAT: There may be multiple prefixes bound
+     * to the same namespace; this returns the first found.
+     * @see org.apache.xerces.xni.NamespaceContext#getPrefix(String)
+     */
     public String getPrefix(String uri) {
 
         // find uri in current context
@@ -228,24 +238,28 @@ public class NamespaceSupport {
     } // getPrefix(String):String
 
 
-	/**
-	 * @see org.apache.xerces.xni.NamespaceContext#getDeclaredPrefixCount()
-	 */
+    /** @return number of prefixes currently bound
+     * @see org.apache.xerces.xni.NamespaceContext#getDeclaredPrefixCount()
+     */
     public int getDeclaredPrefixCount() {
         return (fNamespaceSize - fContext[fCurrentContext]) / 2;
     } // getDeclaredPrefixCount():int
 
-	/**
-	 * @see org.apache.xerces.xni.NamespaceContext#getDeclaredPrefixAt(int)
-	 */
+    /**
+     * @param index Select prefix from all currently bound
+     * @return The prefix in that slot of our table. Equivalent to
+     * indexing into enumerator returned by #getAllPrefixes()
+     * @see org.apache.xerces.xni.NamespaceContext#getDeclaredPrefixAt(int)
+     */
     public String getDeclaredPrefixAt(int index) {
         return fNamespace[fContext[fCurrentContext] + index * 2];
     } // getDeclaredPrefixAt(int):String
-
-	/**
-	 * @see org.apache.xerces.xni.NamespaceContext#getAllPrefixes()
-	 */
-	public Enumeration getAllPrefixes() {
+    
+    /**
+     * @return an Enumeration of the namespace prefixes currently bound
+     * @see org.apache.xerces.xni.NamespaceContext#getAllPrefixes()
+     */
+    public Enumeration getAllPrefixes() {
         int count = 0;
         if (fPrefixes.length < (fNamespace.length/2)) {
             // resize prefix array          
@@ -269,36 +283,43 @@ public class NamespaceSupport {
         }
 		return new Prefixes(fPrefixes, count);
 	}
-    
+
+    // I'm a bit confused by Prefixes.prefixes vs. NamespaceSupper.fPrefixes.
+    // Need to review the logic and document that. -- jkesselm GONK
     protected final class Prefixes implements Enumeration {
         private String[] prefixes;
         private int counter = 0;
         private int size = 0;
                
-		/**
-		 * Constructor for Prefixes.
-		 */
-		public Prefixes(String [] prefixes, int size) {
-			this.prefixes = prefixes;
+	/**
+	 * Constructor for Prefixes enumerator
+	 * @param prefixes String[] Set of prefixes.
+	 * @param size integer Number of preloaded prefixes
+	 */
+	public Prefixes(String [] prefixes, int size) {
+	    this.prefixes = prefixes;
             this.size = size;
-		}
-
+	}
+	
        /**
-		 * @see java.util.Enumeration#hasMoreElements()
-		 */
-		public boolean hasMoreElements() {           
-			return (counter< size);
-		}
-
-		/**
-		 * @see java.util.Enumeration#nextElement()
-		 */
-		public Object nextElement() {
+	* @return true if this object, as an Enumeration, can return
+	* more bindings
+	* @see java.util.Enumeration#hasMoreElements()
+	*/
+	public boolean hasMoreElements() {           
+	    return (counter< size);
+	}
+	
+	/**
+	 * @return the next binding's prefix, as an Enumeration result
+	 * @see java.util.Enumeration#nextElement()
+	 */
+	public Object nextElement() {
             if (counter< size){
                 return fPrefixes[counter++];
             }
-			throw new NoSuchElementException("Illegal access to Namespace prefixes enumeration.");
-		}
+	    throw new NoSuchElementException("Illegal access to Namespace prefixes enumeration.");
+	}
         
         public String toString(){
             StringBuffer buf = new StringBuffer();
@@ -310,6 +331,6 @@ public class NamespaceSupport {
             return buf.toString(); 
         }
 
-}
-
+    }
+    
 } // class NamespaceSupport
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/package.html b/serializer/src/main/java/org/apache/xml/serializer/package.html
similarity index 100%
rename from serializer/src/main/resources/org/apache/xml/serializer/package.html
rename to serializer/src/main/java/org/apache/xml/serializer/package.html
diff --git a/serializer/src/main/java/org/apache/xml/serializer/utils/BoolStack.java b/serializer/src/main/java/org/apache/xml/serializer/utils/BoolStack.java
index 68cea422..e1f49d6b 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/utils/BoolStack.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/utils/BoolStack.java
@@ -19,7 +19,7 @@
  * $Id$
  */
 package org.apache.xml.serializer.utils;
-
+import java.util.EmptyStackException;
 
 /**
  * Simple stack for boolean values.
diff --git a/serializer/src/main/java/org/apache/xml/serializer/utils/XML11Char.java b/serializer/src/main/java/org/apache/xml/serializer/utils/XML11Char.java
index b32249ed..f6756cc1 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/utils/XML11Char.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/utils/XML11Char.java
@@ -152,7 +152,7 @@ public class XML11Char {
     //
 
     /**
-     * Returns true if the specified character is a space character
+     * @return true if the specified character is a space character
      * as amdended in the XML 1.1 specification.
      *
      * @param c The character to check.
@@ -162,7 +162,7 @@ public class XML11Char {
     } // isXML11Space(int):boolean
 
     /**
-     * Returns true if the specified character is valid. This method
+     * @return true if the specified character is valid. This method
      * also checks the surrogate character range from 0x10000 to 0x10FFFF.
      * <p>
      * If the program chooses to apply the mask directly to the
@@ -177,7 +177,7 @@ public class XML11Char {
     } // isXML11Valid(int):boolean
 
     /**
-     * Returns true if the specified character is invalid.
+     * @return true if the specified character is invalid.
      *
      * @param c The character to check.
      */
@@ -186,7 +186,7 @@ public class XML11Char {
     } // isXML11Invalid(int):boolean
 
     /**
-     * Returns true if the specified character is valid and permitted outside
+     * @return true if the specified character is valid and permitted outside
      * of a character reference.  
      * That is, this method will return false for the same set as
      * isXML11Valid, except it also reports false for "control characters".
@@ -199,7 +199,7 @@ public class XML11Char {
     } // isXML11ValidLiteral(int):boolean
 
     /**
-     * Returns true if the specified character can be considered 
+     * @return true if the specified character can be considered 
      * content in an external parsed entity.
      *
      * @param c The character to check.
@@ -210,7 +210,7 @@ public class XML11Char {
     } // isXML11Content(int):boolean
     
     /**
-     * Returns true if the specified character can be considered 
+     * @return true if the specified character can be considered 
      * content in an internal parsed entity.
      *
      * @param c The character to check.
@@ -221,7 +221,7 @@ public class XML11Char {
     } // isXML11InternalEntityContent(int):boolean
 
     /**
-     * Returns true if the specified character is a valid name start
+     * @return true if the specified character is a valid name start
      * character as defined by production [4] in the XML 1.1
      * specification.
      *
@@ -233,7 +233,7 @@ public class XML11Char {
     } // isXML11NameStart(int):boolean
 
     /**
-     * Returns true if the specified character is a valid name
+     * @return true if the specified character is a valid name
      * character as defined by production [4a] in the XML 1.1
      * specification.
      *
@@ -245,7 +245,7 @@ public class XML11Char {
     } // isXML11Name(int):boolean
 
     /**
-     * Returns true if the specified character is a valid NCName start
+     * @return true if the specified character is a valid NCName start
      * character as defined by production [4] in Namespaces in XML
      * 1.1 recommendation.
      *
@@ -257,7 +257,7 @@ public class XML11Char {
     } // isXML11NCNameStart(int):boolean
 
     /**
-     * Returns true if the specified character is a valid NCName
+     * @return true if the specified character is a valid NCName
      * character as defined by production [5] in Namespaces in XML
      * 1.1 recommendation.
      *
@@ -269,7 +269,7 @@ public class XML11Char {
     } // isXML11NCName(int):boolean
     
     /**
-     * Returns whether the given character is a valid 
+     * @return true if the given character is a valid 
      * high surrogate for a name character. This includes
      * all high surrogates for characters [0x10000-0xEFFFF].
      * In other words everything excluding planes 15 and 16.
diff --git a/serializer/src/main/java/org/apache/xml/serializer/utils/XMLChar.java b/serializer/src/main/java/org/apache/xml/serializer/utils/XMLChar.java
index a0d8c852..f38e8f09 100644
--- a/serializer/src/main/java/org/apache/xml/serializer/utils/XMLChar.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/utils/XMLChar.java
@@ -722,7 +722,7 @@ public class XMLChar {
     //
 
     /**
-     * Returns true if the specified character is a supplemental character.
+     * @return true if the specified character is a supplemental character.
      *
      * @param c The character to check.
      */
@@ -731,7 +731,7 @@ public class XMLChar {
     }
 
     /**
-     * Returns true the supplemental character corresponding to the given
+     * @return true the supplemental character corresponding to the given
      * surrogates.
      *
      * @param h The high surrogate.
@@ -742,7 +742,7 @@ public class XMLChar {
     }
 
     /**
-     * Returns the high surrogate of a supplemental character
+     * @return the high surrogate of a supplemental character
      *
      * @param c The supplemental character to "split".
      */
@@ -751,7 +751,7 @@ public class XMLChar {
     }
 
     /**
-     * Returns the low surrogate of a supplemental character
+     * @return the low surrogate of a supplemental character
      *
      * @param c The supplemental character to "split".
      */
@@ -760,7 +760,7 @@ public class XMLChar {
     }
 
     /**
-     * Returns whether the given character is a high surrogate
+     * @return whether the given character is a high surrogate
      *
      * @param c The character to check.
      */
@@ -769,7 +769,7 @@ public class XMLChar {
     }
 
     /**
-     * Returns whether the given character is a low surrogate
+     * @return whether the given character is a low surrogate
      *
      * @param c The character to check.
      */
@@ -779,7 +779,7 @@ public class XMLChar {
 
 
     /**
-     * Returns true if the specified character is valid. This method
+     * @return true if the specified character is valid. This method
      * also checks the surrogate character range from 0x10000 to 0x10FFFF.
      * <p>
      * If the program chooses to apply the mask directly to the
@@ -794,7 +794,7 @@ public class XMLChar {
     } // isValid(int):boolean
 
     /**
-     * Returns true if the specified character is invalid.
+     * @return true if the specified character is invalid.
      *
      * @param c The character to check.
      */
@@ -803,7 +803,7 @@ public class XMLChar {
     } // isInvalid(int):boolean
 
     /**
-     * Returns true if the specified character can be considered content.
+     * @return true if the specified character can be considered content.
      *
      * @param c The character to check.
      */
@@ -813,7 +813,7 @@ public class XMLChar {
     } // isContent(int):boolean
 
     /**
-     * Returns true if the specified character can be considered markup.
+     * @return true if the specified character can be considered markup.
      * Markup characters include '&lt;', '&amp;', and '%'.
      *
      * @param c The character to check.
@@ -823,7 +823,7 @@ public class XMLChar {
     } // isMarkup(int):boolean
 
     /**
-     * Returns true if the specified character is a space character
+     * @return true if the specified character is a space character
      * as defined by production [3] in the XML 1.0 specification.
      *
      * @param c The character to check.
@@ -833,7 +833,7 @@ public class XMLChar {
     } // isSpace(int):boolean
 
     /**
-     * Returns true if the specified character is a valid name start
+     * @return true if the specified character is a valid name start
      * character as defined by production [5] in the XML 1.0
      * specification.
      *
@@ -844,7 +844,7 @@ public class XMLChar {
     } // isNameStart(int):boolean
 
     /**
-     * Returns true if the specified character is a valid name
+     * @return true if the specified character is a valid name
      * character as defined by production [4] in the XML 1.0
      * specification.
      *
@@ -855,7 +855,7 @@ public class XMLChar {
     } // isName(int):boolean
 
     /**
-     * Returns true if the specified character is a valid NCName start
+     * @return true if the specified character is a valid NCName start
      * character as defined by production [4] in Namespaces in XML
      * recommendation.
      *
@@ -866,7 +866,7 @@ public class XMLChar {
     } // isNCNameStart(int):boolean
 
     /**
-     * Returns true if the specified character is a valid NCName
+     * @return true if the specified character is a valid NCName
      * character as defined by production [5] in Namespaces in XML
      * recommendation.
      *
@@ -877,7 +877,7 @@ public class XMLChar {
     } // isNCName(int):boolean
 
     /**
-     * Returns true if the specified character is a valid Pubid
+     * @return true if the specified character is a valid Pubid
      * character as defined by production [13] in the XML 1.0
      * specification.
      *
@@ -968,7 +968,7 @@ public class XMLChar {
     // encodings
 
     /**
-     * Returns true if the encoding name is a valid IANA encoding.
+     * @return true if the encoding name is a valid IANA encoding.
      * This method does not verify that there is a decoder available
      * for this encoding, only that the characters are valid for an
      * IANA encoding name.
@@ -997,7 +997,7 @@ public class XMLChar {
     } // isValidIANAEncoding(String):boolean
 
     /**
-     * Returns true if the encoding name is a valid Java encoding.
+     * @return true if the encoding name is a valid Java encoding.
      * This method does not verify that there is a decoder available
      * for this encoding, only that the characters are valid for an
      * Java encoding name.
diff --git a/serializer/tools/xalan2jdoc.jar b/serializer/tools/xalan2jdoc.jar
new file mode 100644
index 00000000..dcc37db8
Binary files /dev/null and b/serializer/tools/xalan2jdoc.jar differ
diff --git a/serializer/tools/xalan2jtaglet.jar b/serializer/tools/xalan2jtaglet.jar
new file mode 100644
index 00000000..37049cbf
Binary files /dev/null and b/serializer/tools/xalan2jtaglet.jar differ
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/Version.src b/src/org/apache/xalan/Version.java
similarity index 87%
copy from serializer/src/main/resources/org/apache/xml/serializer/Version.src
copy to src/org/apache/xalan/Version.java
index deb26637..7b4a3953 100644
--- a/serializer/src/main/resources/org/apache/xml/serializer/Version.src
+++ b/src/org/apache/xalan/Version.java
@@ -18,23 +18,26 @@
 /*
  * $Id$
  */
-package org.apache.xml.serializer;
+package org.apache.xalan;
 
 /**
  * Administrative class to keep track of the version number of
- * the Serializer release.
+ * the Xalan release.
  * <P>This class implements the upcoming standard of having
  * org.apache.project-name.Version.getVersion() be a standard way 
- * to get version information.</P> 
+ * to get version information.  This class will replace the older 
+ * org.apache.xalan.processor.Version class.</P>
+ * <P>See also: org/apache/xalan/res/XSLTInfo.properties for 
+ * information about the version of the XSLT spec we support.</P>
  * @xsl.usage general
  */
-public final class Version
+public class Version
 {
 
   /**
-   * Get the basic version string for the current Serializer.
+   * Get the basic version string for the current Xalan release.
    * Version String formatted like 
-   * <CODE>"<B>Serializer</B> <B>Java</B> v.r[.dd| <B>D</B>nn]"</CODE>.
+   * <CODE>"<B>Xalan</B> <B>Java</B> v.r[.dd| <B>D</B>nn]"</CODE>.
    *
    * Futurework: have this read version info from jar manifest.
    *
@@ -59,11 +62,11 @@ public final class Version
   }
   
   /**
-   * Name of product: Serializer.
+   * Name of product: Xalan.
    */
   public static String getProduct()
   {
-    return "Serializer";
+    return "Xalan";
   }
 
   /**
@@ -88,7 +91,7 @@ public final class Version
    */
   public static int getMajorVersionNum()
   {
-    return @version.VERSION@;
+    return 2;
     
   }  
 
@@ -102,7 +105,7 @@ public final class Version
    */
   public static int getReleaseVersionNum()
   {
-    return @version.RELEASE@;
+    return 7;
   }
   
   /**
@@ -116,7 +119,7 @@ public final class Version
    */
   public static int getMaintenanceVersionNum()
   {
-    return @version.MINOR@;
+    return 3;
   }
 
   /**
@@ -139,10 +142,10 @@ public final class Version
   public static int getDevelopmentVersionNum()
   { 
     try {   
-        if ((new String("@version.DEVELOPER@")).length() == 0)
+        if ((new String("")).length() == 0)
           return 0;
         else  
-          return Integer.parseInt("@version.DEVELOPER@");
+          return Integer.parseInt("");
     } catch (NumberFormatException nfe) {
            return 0;
     }    
diff --git a/src/org/apache/xalan/xsltc/util/JavaCupRedirect.java b/src/org/apache/xalan/xsltc/util/JavaCupRedirect.java
deleted file mode 100644
index 6ca533d3..00000000
--- a/src/org/apache/xalan/xsltc/util/JavaCupRedirect.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the  "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * $Id$
- */
-
-package org.apache.xalan.xsltc.util;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
-/**
- * Utility class to redirect input to JavaCup program.
- *
- * Usage-command line: 
- * <code>java org.apache.xalan.xsltc.utils.JavaCupRedirect [args] -stdin filename.ext</code>
- *
- * @author Morten Jorgensen
- * @version $Id$
- */
-public class JavaCupRedirect {
-
-    private final static String ERRMSG = 
-		 "You must supply a filename with the -stdin option.";
-
-    public static void main (String args[]) {
-
-		 // If we should call System.exit or not
-         //@todo make this settable for use inside other java progs
-		 boolean systemExitOK = true;
-
-		 // This is the stream we'll set as our System.in
-		 InputStream input = null;
-
-		 // The number of arguments
-		 final int argc = args.length;
-
-		 // The arguments we'll pass to the real 'main()'
-		 String[] new_args = new String[argc - 2];
-		 int new_argc = 0;
-
-		 // Parse all parameters passed to this class
-		 for (int i = 0; i < argc; i++) {
-		     // Parse option '-stdin <filename>'
-		     if (args[i].equals("-stdin")) {
-		 		 // This option must have an argument
-		 		 if ((++i >= argc) || (args[i].startsWith("-"))) {
-		 		     System.err.println(ERRMSG);
-                     throw new RuntimeException(ERRMSG);
-		 		 }
-		 		 try {
-		 		     input = new FileInputStream(args[i]);
-		 		 }
-		 		 catch (FileNotFoundException e) {
-		 		     System.err.println("Could not open file "+args[i]);
-                     throw new RuntimeException(e.getMessage());
-		 		 }
-		 		 catch (SecurityException e) {
-		 		     System.err.println("No permission to file "+args[i]);
-                     throw new RuntimeException(e.getMessage());
-		 		 }
-		     }
-		     else {
-		 		 if (new_argc == new_args.length) {
-		 		     System.err.println("Missing -stdin option!");
-                     throw new RuntimeException();
-		 		 }
-		 		 new_args[new_argc++] = args[i];
-		     }
-		 }
-
-		 System.setIn(input);
-		 try {
-		     java_cup.Main.main(new_args);
-		 }
-		 catch (Exception e) {
-		     System.err.println("Error running JavaCUP:");
-		     e.printStackTrace();
-		 }
-    }
-}
diff --git a/src/xml-commons-external-1.3.02-src.tar.gz b/src/xml-commons-external-1.3.02-src.tar.gz
deleted file mode 100644
index 469b3bd7..00000000
Binary files a/src/xml-commons-external-1.3.02-src.tar.gz and /dev/null differ
diff --git a/stylebook/sources/entities.src b/stylebook/sources/entities.src
new file mode 100644
index 00000000..b58c3921
--- /dev/null
+++ b/stylebook/sources/entities.src
@@ -0,0 +1,117 @@
+<?xml encoding="US-ASCII"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<!ENTITY xslt "Xalan">
+<!ENTITY xslt4j "Xalan-Java">
+<!ENTITY xslt4j2 "Xalan-Java 2">
+<!ENTITY xslt4ji "&xslt4j; Interpretive">
+<!ENTITY xslt4jc-short "XSLTC">
+<!ENTITY xslt4jc-long  "&xslt4j; Compiled">
+<!ENTITY xslt4j-dist-bin "&xslt4j-dist;-bin">
+<!ENTITY xslt4j-dist-src "&xslt4j-dist;-src">
+<!ENTITY xslt4j-dist "xalan-j_@version.VERSION@_@version.RELEASE@_@version.MINOR@">
+<!ENTITY xslt4j-current "&xslt4j; Version @version.VERSION@.@version.RELEASE@.@version.MINOR@">
+<!ENTITY xslt4j-distdir "http://www.apache.org/dyn/closer.cgi/xml/xalan-j/">
+<!ENTITY xslt4j_longname "Apache Xalan Java">
+<!ENTITY xml4j "Xerces-Java">
+<!ENTITY xml4j1 "Xerces-Java 1">
+<!ENTITY xml4j2 "Xerces-Java 2">
+<!ENTITY xml4j-used "&xml4j; @parser.version.VERSION@.@parser.version.RELEASE@.@parser.version.MINOR@">
+<!ENTITY xml4j-jar "xercesImpl.jar">
+<!ENTITY xslt4c "Xalan-C++">
+<!ENTITY xml4c "Xerces-C++">
+<!ENTITY jaxp13-short "JAXP 1.3">
+<!ENTITY jaxp13-long  "Java API for XML Processing (JAXP) 1.3">
+<!ENTITY download "The &xslt4j-current; download includes &xml4j-jar; from &xml4j-used; and xml-apis.jar. 
+For version information about the contents of xml-apis.jar, see the JAR manifest.">
+
+<!ENTITY xsltcwhatsnewhead '<li><link anchor="xsltc">&xslt4jc-short;</link></li>'>
+
+<!ENTITY xsltcwhatsnew '<anchor name="xsltc"/><s2 title="&xslt4jc-long; (&xslt4jc-short;)">
+                <p>In April 2001, Sun donated &xslt4jc-short; to the Xalan project. &xslt4jc-short; compiles stylesheets into translets and
+                provides a runtime environment for using translets to transform XML documents. Initially, &xslt4jc-short; is
+                available in a separate JAR. Over time, we plan to integrate the two codebases. For more information,
+                see <link idref="xsltc_usage">Getting Started with &xslt4jc-short;</link>, 
+                <link idref="readme" anchor="xsltcreleasenotes">&xslt4jc-short;
+                Release Notes</link>, and <jump href="xsltc/index.html">&xslt4jc-short; Design</link>.</p>
+                </s2>'>
+
+<!ENTITY history2xsltc '<note>For &xslt4jc-short; changes since &xslt4jc-short; was incorporated into &xslt4j;, see
+                        <link idref="xsltc_history">&xslt4jc-short; software changes</link>.</note>'>
+
+<!ENTITY xsltcclasspath '<p>If you are using <link idref="xsltc_usage">&xslt4jc-short;</link>, see
+                        <link idref="xsltc_usage" anchor="classpath">Setting the system classpath for &xslt4jc-short;</link>.</p>'>
+
+<!ENTITY xsltcsampleshead '<li><link anchor="translets">translets</link></li>'>
+
+<!ENTITY xsltcsamples '<anchor name="translets"/><s2 title="Translets">
+                 <ul>
+                 <li><link anchor="xsltc1">JAXPTransletOneTransformation</link></li>
+                 <li><link anchor="xsltc2">JAXPTransletMultipleTransformations</link></li>
+                 <li><link anchor="xsltcother">Other &xslt4jc-short; samples</link></li>   
+                 </ul>
+                 <p>You can use the JAXP interfaces to compile and run translets.
+                 For an overview of the usage patterns these samples illustrate, see 
+                 <link idref="xsltc_usage" anchor="api">Calling &xslt4jc-short; with the JAXP API</link>.</p>
+                 <anchor name="xsltc1"/>
+                 <s3 title="JAXPTransletOneTransformation">
+                 <p>What it does: Uses the &xslt4jc-short; TransformerFactory to compile a translet and use
+                 the translet to transform the &xslt4jc-short; to-do list from XML into HTML.</p>
+                 <p>Run this sample from the translets subdirectory with</p>
+                 <p><code>java JAXPTransletOneTransformation</code></p>
+                 <p>View the result in todo.html.</p>
+                 </s3><anchor name="xsltc2"/>
+                 <s3 title="JAXPTransletMultipleTransformations">
+                 <p>What it does: Uses the &xslt4jc-short; TransformerFactory to compile a translet and use
+                 the Templates object associated with the translet to transform the &xslt4jc-short; and Xalan to-do lists from XML 
+                 into HTML.</p>
+                 <p>Run this sample from the translets subdirectory with</p>
+                 <p><code>java JAXPTransletMultipleTransformations</code></p>
+                 <p>View the results in todo.html and todotoo.html.</p>                
+                 </s3><anchor name="xsltcother"/>
+                 <s3 title="Other &xslt4jc-short; samples">
+                 <p>Other &xslt4jc-short; samples are located in the following samples subdirectories:</p>
+                 <ul>
+                 <li>CompiledServlet</li>
+                 <li>CompiledBrazil</li>
+                 <li>CompiledJAXP</li>
+                 <li>CompiledApplet</li>
+                 <li>CompiledEJB</li>
+                 </ul>
+                 <p>For information about each of these samples, consult the README file in the subdirectory.</p>
+                 <p>&xslt4jc-short; provides demos for using &xslt4jc-short; as a servlet and as a handler for
+                 Brazil (a new and powerful Web techology from Sun labs).</p>
+                 <p>To run the Brazil-handler demo, download Brazil from sunlabs:</p>
+                 <p><code>&nbsp;&nbsp;&nbsp;&nbsp;<jump href="http://research.sun.com/research/download/index.html">http://research.sun.com/research/download/index.html</jump></code></p>
+                 <p>The translet must be specified as a pure class name,
+                 accessible through the Brazil-handler&apos;s classpath. For
+                 example:</p>
+                 <p><code>&nbsp;&nbsp;&nbsp;&nbsp;translet=mk054</code></p>
+                 <p>The document must be specified as a valid URL. For example:</p>
+                 <p><code>&nbsp;&nbsp;&nbsp;&nbsp;document=http://server/path/to/filename.xml</code></p>
+                 <p>If the file is local to the Brazil handler, it has to be
+                specified using the "file:filename.xml" format.</p>
+                <note>In order to run the Brazil-handler demo, you also need to
+                      make the Brazil and javax classes available from your
+                      classpath</note>
+                 <p>To run the servlet demo, download the java extensions for servlets from Sun:</p>
+                 <p><code>&nbsp;&nbsp;&nbsp;&nbsp;
+                 <jump href="http://java.sun.com/products/servlet/download.html">
+                 http://java.sun.com/products/servlet/download.html</jump></code></p>
+                 </s3>
+                 </s2>'>
diff --git a/stylebook/sources/xalan/DONE b/stylebook/sources/xalan/DONE
new file mode 100644
index 00000000..e69de29b
diff --git a/stylebook/sources/xalan/xalan-collate.xml b/stylebook/sources/xalan/xalan-collate.xml
new file mode 100644
index 00000000..947ac93d
--- /dev/null
+++ b/stylebook/sources/xalan/xalan-collate.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?><documentation><chapter id="index"><!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+--><!-- $Id$ --><s1 title="Xalan-Java DTM">
+<ul>
+  <li><link anchor="intro">Introduction</link></li>
+  <li><link anchor="settings">Performance settings</link></li>  
+</ul><anchor name="intro"/>
+<s2 title="Introduction">
+  <p>The Document Table Model (DTM) is an interface to a Document Model designed specifically for 
+  the needs of our XPath and XSLT implementations. The motivation behind this model is to optimize 
+  performance and minimize storage.</p>
+  <p>Specifically, DTM avoids the overhead of instantiating the objects the standard DOM requires to 
+  represent a tree of nodes. DTM uses unique integer "handles" to identify nodes, integer ID values 
+  to represent URLs, local names, and expanded names, and integer index and length references to a 
+  string buffer to represent the text value of each node.</p>
+  <p>In general, the "read" APIs to DTM resemble those of the W3C Document Object Model 
+  (<resource-ref idref="dom"/>) interface. However, in place of the DOM object tree of nodes, DTM 
+  uses integer arrays and string pools to represent the structure and content of the XML document to 
+  be transformed. DTM also structures the document's contents slightly differently, to better match 
+  the XPath data model; some details and constraints present in a standard DOM are suppressed, and a 
+  few XPath-specific features are added.</p>
+  <p>DTM is intended to be a read-only model, and so does not attempt to replicate the DOM's write or 
+  create-node operations.</p> 
+  <p>The details of constructing a DTM vary depending on which implementation of this API you are 
+  using. Two reference implementations are currently available:</p>
+  <ul>
+    <li>SAX2DTM (built via a SAX stream)</li>
+    <li>DOM2DTM (which provides DTM access to an existing DOM)</li>
+  </ul> 
+  <p>Both DTMs can be built incrementally (see <link anchor="incremental">incremental transforms</link>). 
+  When operating incrementally, the DTM allows the Xalan-Java processor to begin reading the DTM and 
+  performing the transformation while the DTM is still being assembled (for example, while the parser 
+  is still parsing the XML source), and attempts to do only as much work as is needed to support the
+  read requests actually made by the XPath or XSLT processor.</p>
+  <p>For the convenience of user-written extensions, a proxy mechanism presents the contents of the 
+  DTM as a read-only subset of the DOM.</p>
+</s2>
+
+<anchor name="settings"/>
+<s2 title="DTM performance settings">
+  <p>Xalan-Java implements two DTM performance features that you can control with the TransformerFactory
+  <jump href="apidocs/javax/xml/transform/TransformerFactory.html#setAttribute(java.lang.String,    java.lang.Object)">setAttribute(String name, Object value)</jump> method.</p>
+  <table>
+  <tr>
+    <th colspan="1" rowspan="1">Attribute name (URL)</th>
+    <th colspan="1" rowspan="1">Default setting</th>
+    <th colspan="1" rowspan="1">Description</th>
+  </tr>
+  <tr>
+    <td colspan="1" rowspan="1">"http://xml.apache.org/xalan/features/incremental"</td>
+    <td colspan="1" rowspan="1">false</td>
+    <td colspan="1" rowspan="1"><link anchor="incremental">incremental transforms</link></td>
+  </tr>
+  <tr>
+    <td colspan="1" rowspan="1">"http://xml.apache.org/xalan/features/optimize"</td>
+    <td colspan="1" rowspan="1">true</td>
+    <td colspan="1" rowspan="1"><link anchor="optimized">optimized transforms</link></td>
+  </tr> 
+  </table>
+  <p>Both of these DTM settings are described below.</p>
+  
+  <p> </p>
+  <anchor name="incremental"/>
+  <s3 title="'http://xml.apache.org/xalan/features/incremental'">
+   <p>Set this feature to true to enable incremental transformations. If set to false (the default), 
+      the transform and the parse are performed on the same thread.</p>
+   <note> When set to true: If the parser is Xerces, we perform an incremental transform on a single 
+          thread using the Xerces "parse on demand" feature. If the parser is not Xerces, we run the
+          transform in one thread and the parse in another. Exception: if the parser is not Xerces 
+          and the XML source is a DOMSource, setting this feature to true has no effect.</note>
+   <note> The incremental feature is not currently supported by the XSLT Compiling processor, XSLTC.</note>
+   <p>Example: setting incremental transforms to true (for the XSLT Interpretive processor):</p>
+   <source>javax.xml.transform.TransformerFactory tFactory =
+            javax.xml.transform.TransformerFactory.newInstance();
+ // setAttribute() takes a String and an Object.            
+  tFactory.setAttribute
+            ("http://xml.apache.org/xalan/features/incremental", 
+             java.lang.Boolean.TRUE);
+  ...</source>
+  </s3>
+  
+  <anchor name="optimized"/>
+  <s3 title="'http://xml.apache.org/xalan/features/optimize'">
+   <p>When set to true (the default), this feature enables optimizations that may involve structural 
+      rewrites of the stylesheet. Any tool that requires direct access to the stylesheet structure 
+      should set this feature to false.</p>
+  </s3>
+</s2>
+
+<s2 title="DTM node location tracking setting">
+  <p>The DTM also provides a setting that you can use to track location information for each node in 
+     the source document. See <link idref="features" anchor="source_location">"http://apache.org/xalan/features/source_location"</link></p>
+</s2>
+</s1></chapter></documentation>
\ No newline at end of file
diff --git a/stylebook/style/dtd/blocks.ent b/stylebook/style/dtd/blocks.ent
new file mode 100644
index 00000000..5f352d1b
--- /dev/null
+++ b/stylebook/style/dtd/blocks.ent
@@ -0,0 +1,40 @@
+<?xml encoding='US-ASCII'?>
+
+<!-- BLOCKS ENTITY -->
+<!ENTITY % blocks "p|note|ul|ol|gloss|table|source|anchor">
+
+<!-- import the external markup.ent dtd -->
+<!ENTITY % markupEntity SYSTEM "markup.ent">
+%markupEntity;
+
+<!ENTITY % content "(#PCDATA|%markup;|%links;)*">
+
+<!ELEMENT p %content;>
+<!ELEMENT note %content;>
+
+<!ELEMENT ul (li|ol|ul)+>
+<!ELEMENT ol (li|ol|ul)+>
+<!ELEMENT li %content;>
+
+<!ELEMENT gloss (label|item)+>
+<!ELEMENT label %content;>
+<!ELEMENT item %content;>
+
+<!ELEMENT source (#PCDATA)>
+
+<!ELEMENT table (tr)+>
+
+<!ELEMENT tr (tn|th|td)+>
+
+<!ELEMENT tn EMPTY>
+<!ATTLIST tn colspan CDATA "1"
+             rowspan CDATA "1">
+
+<!ELEMENT th %content;>
+<!ATTLIST th colspan CDATA "1"
+             rowspan CDATA "1">
+
+<!ELEMENT td %content;>
+<!ATTLIST td colspan CDATA "1"
+             rowspan CDATA "1">
+             
\ No newline at end of file
diff --git a/stylebook/style/dtd/book.dtd b/stylebook/style/dtd/book.dtd
new file mode 100644
index 00000000..2f49ce99
--- /dev/null
+++ b/stylebook/style/dtd/book.dtd
@@ -0,0 +1,49 @@
+<?xml encoding='US-ASCII'?>
+
+<!-- STYLEBOOK BOOK DTD -->
+
+<!-- import the external source-specific dtd -->
+<!ENTITY % externalEntity SYSTEM "sbk:/sources/entities.ent">
+%externalEntity;
+
+<!ELEMENT book (resources?|document|hidden|faqs|changes|group|external|separator)+>
+<!ATTLIST book title     CDATA #REQUIRED
+               copyright CDATA #IMPLIED>
+               
+<!ELEMENT resources EMPTY>
+<!ATTLIST resources source CDATA #REQUIRED>
+
+<!ELEMENT document EMPTY>
+<!ATTLIST document id     ID    #REQUIRED
+                   source CDATA #REQUIRED
+                   label  CDATA #REQUIRED>
+
+<!ELEMENT hidden EMPTY>
+<!ATTLIST hidden id     ID    #REQUIRED
+                 source CDATA #REQUIRED>
+
+<!ELEMENT faqs EMPTY>
+<!ATTLIST faqs id     ID    #REQUIRED
+               source CDATA #REQUIRED
+               label  CDATA #REQUIRED>
+
+<!ELEMENT changes EMPTY>
+<!ATTLIST changes id     ID    #REQUIRED
+                  source CDATA #REQUIRED
+                  label  CDATA #REQUIRED>
+
+<!ELEMENT group (entry)+>
+<!ATTLIST group id    ID    #IMPLIED
+                label CDATA #REQUIRED>
+
+<!ELEMENT entry EMPTY>
+<!ATTLIST entry id     ID    #REQUIRED
+                source CDATA #REQUIRED>
+
+<!ELEMENT external EMPTY>
+<!ATTLIST external label CDATA #REQUIRED
+                   href  CDATA #REQUIRED>
+                   
+<!ELEMENT separator EMPTY>
+
+<!-- CVS $Revision: 1.3 $ $Date: 1999/12/01 23:03:37 $ -->
\ No newline at end of file
diff --git a/stylebook/style/dtd/changes.dtd b/stylebook/style/dtd/changes.dtd
new file mode 100644
index 00000000..661affa8
--- /dev/null
+++ b/stylebook/style/dtd/changes.dtd
@@ -0,0 +1,24 @@
+<?xml encoding='US-ASCII'?>
+
+<!-- STYLEBOOK CHANGES DTD -->
+
+<!-- import the external markup.ent dtd -->
+<!ENTITY % markupEntity SYSTEM "markup.ent">
+%markupEntity;
+
+<!ENTITY % content "(#PCDATA|%markup;|%links;)*">
+
+<!ELEMENT changes (release)+>
+<!ATTLIST changes title CDATA #REQUIRED>
+
+<!ELEMENT release ((features,fixes)|(features)|(fixes))>
+<!ATTLIST release version CDATA #REQUIRED
+                  date    CDATA #IMPLIED>
+
+<!ELEMENT features (feat)+>
+<!ELEMENT fixes (fix)+>
+
+<!ELEMENT feat %content;>
+<!ELEMENT fix %content;>
+
+<!-- CVS $Revision: 1.3 $ $Date: 1999/12/01 23:03:37 $ -->
\ No newline at end of file
diff --git a/stylebook/style/dtd/characters.ent b/stylebook/style/dtd/characters.ent
new file mode 100644
index 00000000..036c06d5
--- /dev/null
+++ b/stylebook/style/dtd/characters.ent
@@ -0,0 +1,297 @@
+<?xml encoding='US-ASCII'?>
+
+<!-- CHARACTERS ENTITY -->
+
+<!-- Latin A -->
+<!ENTITY nbsp     "&#160;">  <!-- U+00A0 ISOnum    - no-break space = non-breaking space                                   -->
+<!ENTITY iexcl    "&#161;">  <!-- U+00A1 ISOnum    - inverted exclamation mark                                             -->
+<!ENTITY cent     "&#162;">  <!-- U+00A2 ISOnum    - cent sign                                                             -->
+<!ENTITY pound    "&#163;">  <!-- U+00A3 ISOnum    - pound sign                                                            -->
+<!ENTITY curren   "&#164;">  <!-- U+00A4 ISOnum    - currency sign                                                         -->
+<!ENTITY yen      "&#165;">  <!-- U+00A5 ISOnum    - yen sign = yuan sign                                                  -->
+<!ENTITY brvbar   "&#166;">  <!-- U+00A6 ISOnum    - broken bar = broken vertical bar                                      -->
+<!ENTITY sect     "&#167;">  <!-- U+00A7 ISOnum    - section sign                                                          -->
+<!ENTITY uml      "&#168;">  <!-- U+00A8 ISOdia    - diaeresis = spacing diaeresis                                         -->
+<!ENTITY copy     "&#169;">  <!-- U+00A9 ISOnum    - copyright sign                                                        -->
+<!ENTITY ordf     "&#170;">  <!-- U+00AA ISOnum    - feminine ordinal indicator                                            -->
+<!ENTITY laquo    "&#171;">  <!-- U+00AB ISOnum    - left-pointing double angle quotation mark = left pointing guillemet   -->
+<!ENTITY not      "&#172;">  <!-- U+00AC ISOnum    - not sign                                                              -->
+<!ENTITY shy      "&#173;">  <!-- U+00AD ISOnum    - soft hyphen = discretionary hyphen                                    -->
+<!ENTITY reg      "&#174;">  <!-- U+00AE ISOnum    - registered sign = registered trade mark sign                          -->
+<!ENTITY macr     "&#175;">  <!-- U+00AF ISOdia    - macron = spacing macron = overline = APL overbar                      -->
+<!ENTITY deg      "&#176;">  <!-- U+00B0 ISOnum    - degree sign                                                           -->
+<!ENTITY plusmn   "&#177;">  <!-- U+00B1 ISOnum    - plus-minus sign = plus-or-minus sign                                  -->
+<!ENTITY sup2     "&#178;">  <!-- U+00B2 ISOnum    - superscript two = superscript digit two = squared                     -->
+<!ENTITY sup3     "&#179;">  <!-- U+00B3 ISOnum    - superscript three = superscript digit three = cubed                   -->
+<!ENTITY acute    "&#180;">  <!-- U+00B4 ISOdia    - acute accent = spacing acute                                          -->
+<!ENTITY micro    "&#181;">  <!-- U+00B5 ISOnum    - micro sign                                                            -->
+<!ENTITY para     "&#182;">  <!-- U+00B6 ISOnum    - pilcrow sign = paragraph sign                                         -->
+<!ENTITY middot   "&#183;">  <!-- U+00B7 ISOnum    - middle dot = Georgian comma = Greek middle dot                        -->
+<!ENTITY cedil    "&#184;">  <!-- U+00B8 ISOdia    - cedilla = spacing cedilla                                             -->
+<!ENTITY sup1     "&#185;">  <!-- U+00B9 ISOnum    - superscript one = superscript digit one                               -->
+<!ENTITY ordm     "&#186;">  <!-- U+00BA ISOnum    - masculine ordinal indicator                                           -->
+<!ENTITY raquo    "&#187;">  <!-- U+00BB ISOnum    - right-pointing double angle quotation mark = right pointing guillemet -->
+<!ENTITY frac14   "&#188;">  <!-- U+00BC ISOnum    - vulgar fraction one quarter = fraction one quarter                    -->
+<!ENTITY frac12   "&#189;">  <!-- U+00BD ISOnum    - vulgar fraction one half = fraction one half                          -->
+<!ENTITY frac34   "&#190;">  <!-- U+00BE ISOnum    - vulgar fraction three quarters = fraction three quarters              -->
+<!ENTITY iquest   "&#191;">  <!-- U+00BF ISOnum    - inverted question mark = turned question mark                         -->
+<!ENTITY Agrave   "&#192;">  <!-- U+00C0 ISOlat1   - latin capital letter A with grave = latin capital letter A grave      -->
+<!ENTITY Aacute   "&#193;">  <!-- U+00C1 ISOlat1   - latin capital letter A with acute                                     -->
+<!ENTITY Acirc    "&#194;">  <!-- U+00C2 ISOlat1   - latin capital letter A with circumflex                                -->
+<!ENTITY Atilde   "&#195;">  <!-- U+00C3 ISOlat1   - latin capital letter A with tilde                                     -->
+<!ENTITY Auml     "&#196;">  <!-- U+00C4 ISOlat1   - latin capital letter A with diaeresis                                 -->
+<!ENTITY Aring    "&#197;">  <!-- U+00C5 ISOlat1   - latin capital letter A with ring above = latin capital letter A ring  -->
+<!ENTITY AElig    "&#198;">  <!-- U+00C6 ISOlat1   - latin capital letter AE = latin capital ligature AE                   -->
+<!ENTITY Ccedil   "&#199;">  <!-- U+00C7 ISOlat1   - latin capital letter C with cedilla                                   -->
+<!ENTITY Egrave   "&#200;">  <!-- U+00C8 ISOlat1   - latin capital letter E with grave                                     -->
+<!ENTITY Eacute   "&#201;">  <!-- U+00C9 ISOlat1   - latin capital letter E with acute                                     -->
+<!ENTITY Ecirc    "&#202;">  <!-- U+00CA ISOlat1   - latin capital letter E with circumflex                                -->
+<!ENTITY Euml     "&#203;">  <!-- U+00CB ISOlat1   - latin capital letter E with diaeresis                                 -->
+<!ENTITY Igrave   "&#204;">  <!-- U+00CC ISOlat1   - latin capital letter I with grave                                     -->
+<!ENTITY Iacute   "&#205;">  <!-- U+00CD ISOlat1   - latin capital letter I with acute                                     -->
+<!ENTITY Icirc    "&#206;">  <!-- U+00CE ISOlat1   - latin capital letter I with circumflex                                -->
+<!ENTITY Iuml     "&#207;">  <!-- U+00CF ISOlat1   - latin capital letter I with diaeresis                                 -->
+<!ENTITY ETH      "&#208;">  <!-- U+00D0 ISOlat1   - latin capital letter ETH                                              -->
+<!ENTITY Ntilde   "&#209;">  <!-- U+00D1 ISOlat1   - latin capital letter N with tilde                                     -->
+<!ENTITY Ograve   "&#210;">  <!-- U+00D2 ISOlat1   - latin capital letter O with grave                                     -->
+<!ENTITY Oacute   "&#211;">  <!-- U+00D3 ISOlat1   - latin capital letter O with acute                                     -->
+<!ENTITY Ocirc    "&#212;">  <!-- U+00D4 ISOlat1   - latin capital letter O with circumflex                                -->
+<!ENTITY Otilde   "&#213;">  <!-- U+00D5 ISOlat1   - latin capital letter O with tilde                                     -->
+<!ENTITY Ouml     "&#214;">  <!-- U+00D6 ISOlat1   - latin capital letter O with diaeresis                                 -->
+<!ENTITY times    "&#215;">  <!-- U+00D7 ISOnum    - multiplication sign                                                   -->
+<!ENTITY Oslash   "&#216;">  <!-- U+00D8 ISOlat1   - latin capital letter O with stroke = latin capital letter O slash     -->
+<!ENTITY Ugrave   "&#217;">  <!-- U+00D9 ISOlat1   - latin capital letter U with grave                                     -->
+<!ENTITY Uacute   "&#218;">  <!-- U+00DA ISOlat1   - latin capital letter U with acute                                     -->
+<!ENTITY Ucirc    "&#219;">  <!-- U+00DB ISOlat1   - latin capital letter U with circumflex                                -->
+<!ENTITY Uuml     "&#220;">  <!-- U+00DC ISOlat1   - latin capital letter U with diaeresis                                 -->
+<!ENTITY Yacute   "&#221;">  <!-- U+00DD ISOlat1   - latin capital letter Y with acute                                     -->
+<!ENTITY THORN    "&#222;">  <!-- U+00DE ISOlat1   - latin capital letter THORN                                            -->
+<!ENTITY szlig    "&#223;">  <!-- U+00DF ISOlat1   - latin small letter sharp s = ess-zed                                  -->
+<!ENTITY agrave   "&#224;">  <!-- U+00E0 ISOlat1   - latin small letter a with grave = latin small letter a grave          -->
+<!ENTITY aacute   "&#225;">  <!-- U+00E1 ISOlat1   - latin small letter a with acute                                       -->
+<!ENTITY acirc    "&#226;">  <!-- U+00E2 ISOlat1   - latin small letter a with circumflex                                  -->
+<!ENTITY atilde   "&#227;">  <!-- U+00E3 ISOlat1   - latin small letter a with tilde                                       -->
+<!ENTITY auml     "&#228;">  <!-- U+00E4 ISOlat1   - latin small letter a with diaeresis                                   -->
+<!ENTITY aring    "&#229;">  <!-- U+00E5 ISOlat1   - latin small letter a with ring above = latin small letter a ring      -->
+<!ENTITY aelig    "&#230;">  <!-- U+00E6 ISOlat1   - latin small letter ae = latin small ligature ae                       -->
+<!ENTITY ccedil   "&#231;">  <!-- U+00E7 ISOlat1   - latin small letter c with cedilla                                     -->
+<!ENTITY egrave   "&#232;">  <!-- U+00E8 ISOlat1   - latin small letter e with grave                                       -->
+<!ENTITY eacute   "&#233;">  <!-- U+00E9 ISOlat1   - latin small letter e with acute                                       -->
+<!ENTITY ecirc    "&#234;">  <!-- U+00EA ISOlat1   - latin small letter e with circumflex                                  -->
+<!ENTITY euml     "&#235;">  <!-- U+00EB ISOlat1   - latin small letter e with diaeresis                                   -->
+<!ENTITY igrave   "&#236;">  <!-- U+00EC ISOlat1   - latin small letter i with grave                                       -->
+<!ENTITY iacute   "&#237;">  <!-- U+00ED ISOlat1   - latin small letter i with acute                                       -->
+<!ENTITY icirc    "&#238;">  <!-- U+00EE ISOlat1   - latin small letter i with circumflex                                  -->
+<!ENTITY iuml     "&#239;">  <!-- U+00EF ISOlat1   - latin small letter i with diaeresis                                   -->
+<!ENTITY eth      "&#240;">  <!-- U+00F0 ISOlat1   - latin small letter eth                                                -->
+<!ENTITY ntilde   "&#241;">  <!-- U+00F1 ISOlat1   - latin small letter n with tilde                                       -->
+<!ENTITY ograve   "&#242;">  <!-- U+00F2 ISOlat1   - latin small letter o with grave                                       -->
+<!ENTITY oacute   "&#243;">  <!-- U+00F3 ISOlat1   - latin small letter o with acute                                       -->
+<!ENTITY ocirc    "&#244;">  <!-- U+00F4 ISOlat1   - latin small letter o with circumflex                                  -->
+<!ENTITY otilde   "&#245;">  <!-- U+00F5 ISOlat1   - latin small letter o with tilde                                       -->
+<!ENTITY ouml     "&#246;">  <!-- U+00F6 ISOlat1   - latin small letter o with diaeresis                                   -->
+<!ENTITY divide   "&#247;">  <!-- U+00F7 ISOnum    - division sign                                                         -->
+<!ENTITY oslash   "&#248;">  <!-- U+00F8 ISOlat1   - latin small letter o with stroke = latin small letter o slash         -->
+<!ENTITY ugrave   "&#249;">  <!-- U+00F9 ISOlat1   - latin small letter u with grave                                       -->
+<!ENTITY uacute   "&#250;">  <!-- U+00FA ISOlat1   - latin small letter u with acute                                       -->
+<!ENTITY ucirc    "&#251;">  <!-- U+00FB ISOlat1   - latin small letter u with circumflex                                  -->
+<!ENTITY uuml     "&#252;">  <!-- U+00FC ISOlat1   - latin small letter u with diaeresis                                   -->
+<!ENTITY yacute   "&#253;">  <!-- U+00FD ISOlat1   - latin small letter y with acute                                       -->
+<!ENTITY thorn    "&#254;">  <!-- U+00FE ISOlat1   - latin small letter thorn                                              -->
+<!ENTITY yuml     "&#255;">  <!-- U+00FF ISOlat1   - latin small letter y with diaeresis                                   -->
+
+
+<!-- C0 Controls and Basic Latin -->
+<!ENTITY quot     "&#34;">   <!-- U+0022 ISOnum    - quotation mark = APL quote                                            -->
+<!ENTITY amp      "&#38;">   <!-- U+0026 ISOnum    - ampersand                                                             -->
+<!ENTITY lt       "&#60;">   <!-- U+003C ISOnum    - less-than sign                                                        -->
+<!ENTITY gt       "&#62;">   <!-- U+003E ISOnum    - greater-than sign                                                     -->
+
+<!-- Latin Extended-A -->
+<!ENTITY OElig    "&#338;">  <!-- U+0152 ISOlat2   - latin capital ligature OE                                             -->
+<!ENTITY oelig    "&#339;">  <!-- U+0153 ISOlat2   - latin small ligature oe                                               -->
+
+<!-- ligature is a misnomer, this is a separate character in some languages -->
+<!ENTITY Scaron   "&#352;">  <!-- U+0160 ISOlat2   - latin capital letter S with caron                                     -->
+<!ENTITY scaron   "&#353;">  <!-- U+0161 ISOlat2   - latin small letter s with caron                                       -->
+<!ENTITY Yuml     "&#376;">  <!-- U+0178 ISOlat2   - latin capital letter Y with diaeresis                                 -->
+
+<!-- Spacing Modifier Letters -->
+<!ENTITY circ     "&#710;" > <!-- U+02C6 ISOpub    - modifier letter circumflex accent                                     -->
+<!ENTITY tilde    "&#732;" > <!-- U+02DC ISOdia    - small tilde                                                           -->
+
+<!-- General Punctuation -->
+<!ENTITY ensp     "&#8194;"> <!-- U+2002 ISOpub    - en space                                                              -->
+<!ENTITY emsp     "&#8195;"> <!-- U+2003 ISOpub    - em space                                                              -->
+<!ENTITY thinsp   "&#8201;"> <!-- U+2009 ISOpub    - thin space                                                            -->
+<!ENTITY zwnj     "&#8204;"> <!-- U+200C RFC 2070  - zero width non-joiner                                                 -->
+<!ENTITY zwj      "&#8205;"> <!-- U+200D RFC 2070  - zero width joiner                                                     -->
+<!ENTITY lrm      "&#8206;"> <!-- U+200E RFC 2070  - left-to-right mark                                                    -->
+<!ENTITY rlm      "&#8207;"> <!-- U+200F RFC 2070  - right-to-left mark                                                    -->
+<!ENTITY ndash    "&#8211;"> <!-- U+2013 ISOpub    - en dash                                                               -->
+<!ENTITY mdash    "&#8212;"> <!-- U+2014 ISOpub    - em dash                                                               -->
+<!ENTITY lsquo    "&#8216;"> <!-- U+2018 ISOnum    - left single quotation mark                                            -->
+<!ENTITY rsquo    "&#8217;"> <!-- U+2019 ISOnum    - right single quotation mark                                           -->
+<!ENTITY sbquo    "&#8218;"> <!-- U+201A NEW       - single low-9 quotation mark                                           -->
+<!ENTITY ldquo    "&#8220;"> <!-- U+201C ISOnum    - left double quotation mark                                            -->
+<!ENTITY rdquo    "&#8221;"> <!-- U+201D ISOnum    - right double quotation mark,                                          -->
+<!ENTITY bdquo    "&#8222;"> <!-- U+201E NEW       - double low-9 quotation mark                                           -->
+<!ENTITY dagger   "&#8224;"> <!-- U+2020 ISOpub    - dagger                                                                -->
+<!ENTITY Dagger   "&#8225;"> <!-- U+2021 ISOpub    - double dagger                                                         -->
+<!ENTITY permil   "&#8240;"> <!-- U+2030 ISOtech   - per mille sign                                                        -->
+<!ENTITY lsaquo   "&#8249;"> <!-- U+2039 ISO prop. - single left-pointing angle quotation mark                             -->
+
+<!-- lsaquo is proposed but not yet ISO standardized -->
+<!ENTITY rsaquo   "&#8250;"> <!-- U+203A ISO prop. -   single right-pointing angle quotation mark                          -->
+
+<!-- rsaquo is proposed but not yet ISO standardized -->
+<!ENTITY euro     "&#8364;"> <!-- U+20AC NEW       -   euro sign                                                           -->
+
+<!-- Latin Extended-B -->
+<!ENTITY fnof     "&#402;">  <!-- U+0192 ISOtech   - latin small f with hook = function = florin                           -->
+
+<!-- Greek -->
+<!ENTITY Alpha    "&#913;">  <!-- U+0391           - greek capital letter alpha                                            -->
+<!ENTITY Beta     "&#914;">  <!-- U+0392           - greek capital letter beta                                             -->
+<!ENTITY Gamma    "&#915;">  <!-- U+0393 ISOgrk3   - greek capital letter gamma                                            -->
+<!ENTITY Delta    "&#916;">  <!-- U+0394 ISOgrk3   - greek capital letter delta                                            -->
+<!ENTITY Epsilon  "&#917;">  <!-- U+0395           - greek capital letter epsilon                                          -->
+<!ENTITY Zeta     "&#918;">  <!-- U+0396           - greek capital letter zeta                                             -->
+<!ENTITY Eta      "&#919;">  <!-- U+0397           - greek capital letter eta                                              -->
+<!ENTITY Theta    "&#920;">  <!-- U+0398 ISOgrk3   - greek capital letter theta                                            -->
+<!ENTITY Iota     "&#921;">  <!-- U+0399           - greek capital letter iota                                             -->
+<!ENTITY Kappa    "&#922;">  <!-- U+039A           - greek capital letter kappa                                            -->
+<!ENTITY Lambda   "&#923;">  <!-- U+039B ISOgrk3   - greek capital letter lambda                                           -->
+<!ENTITY Mu       "&#924;">  <!-- U+039C           - greek capital letter mu                                               -->
+<!ENTITY Nu       "&#925;">  <!-- U+039D           - greek capital letter nu                                               -->
+<!ENTITY Xi       "&#926;">  <!-- U+039E ISOgrk3   - greek capital letter xi                                               -->
+<!ENTITY Omicron  "&#927;">  <!-- U+039F           - greek capital letter omicron                                          -->
+<!ENTITY Pi       "&#928;">  <!-- U+03A0 ISOgrk3   - greek capital letter pi                                               -->
+<!ENTITY Rho      "&#929;">  <!-- U+03A1           - greek capital letter rho                                              -->
+<!ENTITY Sigma    "&#931;">  <!-- U+03A3 ISOgrk3   - greek capital letter sigma                                            -->
+<!ENTITY Tau      "&#932;">  <!-- U+03A4           - greek capital letter tau                                              -->
+<!ENTITY Upsilon  "&#933;">  <!-- U+03A5 ISOgrk3   - greek capital letter upsilon                                          -->
+<!ENTITY Phi      "&#934;">  <!-- U+03A6 ISOgrk3   - greek capital letter phi                                              -->
+<!ENTITY Chi      "&#935;">  <!-- U+03A7           - greek capital letter chi                                              -->
+<!ENTITY Psi      "&#936;">  <!-- U+03A8 ISOgrk3   - greek capital letter psi                                              -->
+<!ENTITY Omega    "&#937;">  <!-- U+03A9 ISOgrk3   - greek capital letter omega                                            -->
+<!ENTITY alpha    "&#945;">  <!-- U+03B1 ISOgrk3   - greek small letter alpha                                              -->
+<!ENTITY beta     "&#946;">  <!-- U+03B2 ISOgrk3   - greek small letter beta                                               -->
+<!ENTITY gamma    "&#947;">  <!-- U+03B3 ISOgrk3   - greek small letter gamma                                              -->
+<!ENTITY delta    "&#948;">  <!-- U+03B4 ISOgrk3   - greek small letter delta                                              -->
+<!ENTITY epsilon  "&#949;">  <!-- U+03B5 ISOgrk3   - greek small letter epsilon                                            -->
+<!ENTITY zeta     "&#950;">  <!-- U+03B6 ISOgrk3   - greek small letter zeta                                               -->
+<!ENTITY eta      "&#951;">  <!-- U+03B7 ISOgrk3   - greek small letter eta                                                -->
+<!ENTITY theta    "&#952;">  <!-- U+03B8 ISOgrk3   - greek small letter theta                                              -->
+<!ENTITY iota     "&#953;">  <!-- U+03B9 ISOgrk3   - greek small letter iota                                               -->
+<!ENTITY kappa    "&#954;">  <!-- U+03BA ISOgrk3   - greek small letter kappa                                              -->
+<!ENTITY lambda   "&#955;">  <!-- U+03BB ISOgrk3   - greek small letter lambda                                             -->
+<!ENTITY mu       "&#956;">  <!-- U+03BC ISOgrk3   - greek small letter mu                                                 -->
+<!ENTITY nu       "&#957;">  <!-- U+03BD ISOgrk3   - greek small letter nu                                                 -->
+<!ENTITY xi       "&#958;">  <!-- U+03BE ISOgrk3   - greek small letter xi                                                 -->
+<!ENTITY omicron  "&#959;">  <!-- U+03BF NEW       - greek small letter omicron                                            -->
+<!ENTITY pi       "&#960;">  <!-- U+03C0 ISOgrk3   - greek small letter pi                                                 -->
+<!ENTITY rho      "&#961;">  <!-- U+03C1 ISOgrk3   - greek small letter rho                                                -->
+<!ENTITY sigmaf   "&#962;">  <!-- U+03C2 ISOgrk3   - greek small letter final sigma                                        -->
+<!ENTITY sigma    "&#963;">  <!-- U+03C3 ISOgrk3   - greek small letter sigma                                              -->
+<!ENTITY tau      "&#964;">  <!-- U+03C4 ISOgrk3   - greek small letter tau                                                -->
+<!ENTITY upsilon  "&#965;">  <!-- U+03C5 ISOgrk3   - greek small letter upsilon                                            -->
+<!ENTITY phi      "&#966;">  <!-- U+03C6 ISOgrk3   - greek small letter phi                                                -->
+<!ENTITY chi      "&#967;">  <!-- U+03C7 ISOgrk3   - greek small letter chi                                                -->
+<!ENTITY psi      "&#968;">  <!-- U+03C8 ISOgrk3   - greek small letter psi                                                -->
+<!ENTITY omega    "&#969;">  <!-- U+03C9 ISOgrk3   - greek small letter omega                                              -->
+<!ENTITY thetasym "&#977;">  <!-- U+03D1 NEW       - greek small letter theta symbol                                       -->
+<!ENTITY upsih    "&#978;">  <!-- U+03D2 NEW       - greek upsilon with hook symbol                                        -->
+<!ENTITY piv      "&#982;">  <!-- U+03D6 ISOgrk3   - greek pi symbol                                                       -->
+
+<!-- General Punctuation -->
+<!ENTITY bull     "&#8226;"> <!-- U+2022 ISOpub    - bullet = black small circle                                           -->
+<!ENTITY hellip   "&#8230;"> <!-- U+2026 ISOpub    - horizontal ellipsis = three dot leader                                -->
+<!ENTITY prime    "&#8242;"> <!-- U+2032 ISOtech   - prime = minutes = feet                                                -->
+<!ENTITY Prime    "&#8243;"> <!-- U+2033 ISOtech   - double prime = seconds = inches                                       -->
+<!ENTITY oline    "&#8254;"> <!-- U+203E NEW       - overline = spacing overscore                                          -->
+<!ENTITY frasl    "&#8260;"> <!-- U+2044 NEW       - fraction slash                                                        -->
+
+<!-- Letterlike Symbols -->
+<!ENTITY weierp   "&#8472;"> <!-- U+2118 ISOamso   - script capital P = power set = Weierstrass p                          -->
+<!ENTITY image    "&#8465;"> <!-- U+2111 ISOamso   - blackletter capital I = imaginary part                                -->
+<!ENTITY real     "&#8476;"> <!-- U+211C ISOamso   - blackletter capital R = real part symbol                              -->
+<!ENTITY trade    "&#8482;"> <!-- U+2122 ISOnum    - trade mark sign                                                       -->
+<!ENTITY alefsym  "&#8501;"> <!-- U+2135 NEW       - alef symbol = first transfinite cardinal                              -->
+
+<!-- Arrows -->
+<!ENTITY larr     "&#8592;"> <!-- U+2190 ISOnum    - leftwards arrow                                                       -->
+<!ENTITY uarr     "&#8593;"> <!-- U+2191 ISOnum    - upwards arrow                                                         -->
+<!ENTITY rarr     "&#8594;"> <!-- U+2192 ISOnum    - rightwards arrow                                                      -->
+<!ENTITY darr     "&#8595;"> <!-- U+2193 ISOnum    - downwards arrow                                                       -->
+<!ENTITY harr     "&#8596;"> <!-- U+2194 ISOamsa   - left right arrow                                                      -->
+<!ENTITY crarr    "&#8629;"> <!-- U+21B5 NEW       - downwards arrow with corner leftwards = carriage return               -->
+<!ENTITY lArr     "&#8656;"> <!-- U+21D0 ISOtech   - leftwards double arrow                                                -->
+<!ENTITY uArr     "&#8657;"> <!-- U+21D1 ISOamsa   - upwards double arrow                                                  -->
+<!ENTITY rArr     "&#8658;"> <!-- U+21D2 ISOtech   - rightwards double arrow                                               -->
+<!ENTITY dArr     "&#8659;"> <!-- U+21D3 ISOamsa   - downwards double arrow                                                -->
+<!ENTITY hArr     "&#8660;"> <!-- U+21D4 ISOamsa   - left right double arrow                                               -->
+
+<!-- Mathematical Operators -->
+<!ENTITY forall   "&#8704;"> <!-- U+2200 ISOtech   - for all                                                               -->
+<!ENTITY part     "&#8706;"> <!-- U+2202 ISOtech   - partial differential                                                  -->
+<!ENTITY exist    "&#8707;"> <!-- U+2203 ISOtech   - there exists                                                          -->
+<!ENTITY empty    "&#8709;"> <!-- U+2205 ISOamso   - empty set = null set = diameter                                       -->
+<!ENTITY nabla    "&#8711;"> <!-- U+2207 ISOtech   - nabla = backward difference                                           -->
+<!ENTITY isin     "&#8712;"> <!-- U+2208 ISOtech   - element of                                                            -->
+<!ENTITY notin    "&#8713;"> <!-- U+2209 ISOtech   - not an element of                                                     -->
+<!ENTITY ni       "&#8715;"> <!-- U+220B ISOtech   - contains as member                                                    -->
+<!ENTITY prod     "&#8719;"> <!-- U+220F ISOamsb   - n-ary product = product sign                                          -->
+<!ENTITY sum      "&#8721;"> <!-- U+2211 ISOamsb   - n-ary sumation                                                        -->
+<!ENTITY minus    "&#8722;"> <!-- U+2212 ISOtech   - minus sign                                                            -->
+<!ENTITY lowast   "&#8727;"> <!-- U+2217 ISOtech   - asterisk operator                                                     -->
+<!ENTITY radic    "&#8730;"> <!-- U+221A ISOtech   - square root = radical sign                                            -->
+<!ENTITY prop     "&#8733;"> <!-- U+221D ISOtech   - proportional to                                                       -->
+<!ENTITY infin    "&#8734;"> <!-- U+221E ISOtech   - infinity                                                              -->
+<!ENTITY ang      "&#8736;"> <!-- U+2220 ISOamso   - angle                                                                 -->
+<!ENTITY and      "&#8743;"> <!-- U+2227 ISOtech   - logical and = wedge                                                   -->
+<!ENTITY or       "&#8744;"> <!-- U+2228 ISOtech   - logical or = vee                                                      -->
+<!ENTITY cap      "&#8745;"> <!-- U+2229 ISOtech   - intersection = cap                                                    -->
+<!ENTITY cup      "&#8746;"> <!-- U+222A ISOtech   - union = cup                                                           -->
+<!ENTITY int      "&#8747;"> <!-- U+222B ISOtech   - integral                                                              -->
+<!ENTITY there4   "&#8756;"> <!-- U+2234 ISOtech   - therefore                                                             -->
+<!ENTITY sim      "&#8764;"> <!-- U+223C ISOtech   - tilde operator = varies with = similar to                             -->
+<!ENTITY cong     "&#8773;"> <!-- U+2245 ISOtech   - approximately equal to                                                -->
+<!ENTITY asymp    "&#8776;"> <!-- U+2248 ISOamsr   - almost equal to = asymptotic to                                       -->
+<!ENTITY ne       "&#8800;"> <!-- U+2260 ISOtech   - not equal to                                                          -->
+<!ENTITY equiv    "&#8801;"> <!-- U+2261 ISOtech   - identical to                                                          -->
+<!ENTITY le       "&#8804;"> <!-- U+2264 ISOtech   - less-than or equal to                                                 -->
+<!ENTITY ge       "&#8805;"> <!-- U+2265 ISOtech   - greater-than or equal to                                              -->
+<!ENTITY sub      "&#8834;"> <!-- U+2282 ISOtech   - subset of                                                             -->
+<!ENTITY sup      "&#8835;"> <!-- U+2283 ISOtech   - superset of                                                           -->
+<!ENTITY nsub     "&#8836;"> <!-- U+2284 ISOamsn   - not a subset of                                                       -->
+<!ENTITY sube     "&#8838;"> <!-- U+2286 ISOtech   - subset of or equal to                                                 -->
+<!ENTITY supe     "&#8839;"> <!-- U+2287 ISOtech   - superset of or equal to                                               -->
+<!ENTITY oplus    "&#8853;"> <!-- U+2295 ISOamsb   - circled plus = direct sum                                             -->
+<!ENTITY otimes   "&#8855;"> <!-- U+2297 ISOamsb   - circled times = vector product                                        -->
+<!ENTITY perp     "&#8869;"> <!-- U+22A5 ISOtech   - up tack = orthogonal to = perpendicular                               -->
+<!ENTITY sdot     "&#8901;"> <!-- U+22C5 ISOamsb   - dot operator                                                          -->
+
+<!-- Miscellaneous Technical -->
+<!ENTITY lceil    "&#8968;"> <!-- U+2308 ISOamsc   - left ceiling = apl upstile                                            -->
+<!ENTITY rceil    "&#8969;"> <!-- U+2309 ISOamsc   - right ceiling                                                         -->
+<!ENTITY lfloor   "&#8970;"> <!-- U+230A ISOamsc   - left floor = apl downstile                                            -->
+<!ENTITY rfloor   "&#8971;"> <!-- U+230B ISOamsc   - right floor                                                           -->
+<!ENTITY lang     "&#9001;"> <!-- U+2329 ISOtech   - left-pointing angle bracket = bra                                     -->
+<!ENTITY rang     "&#9002;"> <!-- U+232A ISOtech   - right-pointing angle bracket = ket                                    -->
+
+<!-- Geometric Shapes -->
+<!ENTITY loz      "&#9674;"> <!-- U+25CA ISOpub    - lozenge                                                               -->
+
+<!-- Miscellaneous Symbols -->
+<!ENTITY spades   "&#9824;"> <!-- U+2660 ISOpub    - black spade suit                                                      -->
+<!ENTITY clubs    "&#9827;"> <!-- U+2663 ISOpub    - black club suit = shamrock                                            -->
+<!ENTITY hearts   "&#9829;"> <!-- U+2665 ISOpub    - black heart suit = valentine                                          -->
+<!ENTITY diams    "&#9830;"> <!-- U+2666 ISOpub    - black diamond suit                                                    -->
+
+<!-- CVS $Revision: 1.1 $ $Date: 1999/12/01 14:19:18 $ -->
+
+<!-- Portions (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies. -->
diff --git a/stylebook/style/dtd/document.dtd b/stylebook/style/dtd/document.dtd
new file mode 100644
index 00000000..f7cf5b12
--- /dev/null
+++ b/stylebook/style/dtd/document.dtd
@@ -0,0 +1,19 @@
+<?xml encoding='US-ASCII'?>
+
+<!-- STYLEBOOK DOCUMENT DTD -->
+
+<!-- import the external blocks.ent dtd -->
+<!ENTITY % blocksEntity SYSTEM "blocks.ent">
+%blocksEntity;
+
+<!ELEMENT s1 (s2|%blocks;)*>
+<!ELEMENT s2 (s3|%blocks;)*>
+<!ELEMENT s3 (s4|%blocks;)*>
+<!ELEMENT s4 (%blocks;)*>
+
+<!ATTLIST s1 title CDATA #REQUIRED>
+<!ATTLIST s2 title CDATA #REQUIRED>
+<!ATTLIST s3 title CDATA #REQUIRED>
+<!ATTLIST s4 title CDATA #REQUIRED>
+
+<!-- CVS $Revision: 1.1 $ $Date: 1999/12/01 14:19:18 $ -->
\ No newline at end of file
diff --git a/stylebook/style/dtd/faqs.dtd b/stylebook/style/dtd/faqs.dtd
new file mode 100644
index 00000000..565d99f4
--- /dev/null
+++ b/stylebook/style/dtd/faqs.dtd
@@ -0,0 +1,19 @@
+<?xml encoding='US-ASCII'?>
+
+<!-- STYLEBOOK FAQS DTD -->
+
+<!-- import the external blocks.ent dtd -->
+<!ENTITY % blocksEntity SYSTEM "blocks.ent">
+%blocksEntity;
+
+<!ELEMENT faqs (faq)+>
+<!ATTLIST faqs title CDATA #REQUIRED>
+
+<!ELEMENT faq (q,a)>
+<!ATTLIST faq title CDATA #IMPLIED>
+
+
+<!ELEMENT q (#PCDATA)>
+<!ELEMENT a (%blocks;)+>
+
+<!-- CVS $Revision: 1.1 $ $Date: 1999/12/01 14:19:18 $ -->
\ No newline at end of file
diff --git a/stylebook/style/dtd/links.ent b/stylebook/style/dtd/links.ent
new file mode 100644
index 00000000..63b002ff
--- /dev/null
+++ b/stylebook/style/dtd/links.ent
@@ -0,0 +1,24 @@
+<?xml encoding='US-ASCII'?>
+
+<!-- LINKS ENTITY -->
+<!ENTITY % links "link|anchor|jump|img|resource-ref|human-resource-ref">
+
+<!ELEMENT anchor EMPTY>
+<!ATTLIST anchor name NMTOKEN #REQUIRED>
+
+<!ELEMENT img EMPTY>
+<!ATTLIST img src CDATA #REQUIRED
+              alt CDATA #REQUIRED>
+
+<!ELEMENT link (#PCDATA|img)*>
+<!ATTLIST link idref NMTOKEN #IMPLIED
+               anchor CDATA  #IMPLIED>
+
+<!ELEMENT jump (#PCDATA|img)*>
+<!ATTLIST jump href CDATA #REQUIRED>
+
+<!-- cross-reference resource elements -->
+<!ELEMENT resource-ref 		EMPTY>
+<!ATTLIST resource-ref 		idref CDATA #REQUIRED>
+<!ELEMENT human-resource-ref 	EMPTY>
+<!ATTLIST human-resource-ref 	 idref CDATA #REQUIRED>
\ No newline at end of file
diff --git a/stylebook/style/dtd/markup.ent b/stylebook/style/dtd/markup.ent
new file mode 100644
index 00000000..66319e5f
--- /dev/null
+++ b/stylebook/style/dtd/markup.ent
@@ -0,0 +1,21 @@
+<?xml encoding='US-ASCII'?>
+
+<!-- MARKUP ENTITY -->
+<!ENTITY % markup "em|ref|code|br">
+
+<!-- import the external source-specific dtd -->
+<!ENTITY % externalEntity SYSTEM "../../sources/entities.ent">
+%externalEntity;
+<!-- import the external charecters.ent dtd -->
+<!ENTITY % charEntity SYSTEM "characters.ent">
+%charEntity;
+<!-- import the external links.ent dtd -->
+<!ENTITY % linksEntity SYSTEM "links.ent">
+%linksEntity;
+
+<!ELEMENT em (#PCDATA|%links;)*>
+<!ELEMENT ref (#PCDATA|%links;)*>
+<!ELEMENT code (#PCDATA|%links;|ref)*>
+<!ELEMENT br EMPTY>
+
+<!-- CVS $Revision: 1.2 $ $Date: 1999/12/01 23:03:37 $ -->
\ No newline at end of file
diff --git a/stylebook/style/graphics/button-a.gif b/stylebook/style/graphics/button-a.gif
new file mode 100644
index 00000000..5d0b8c24
Binary files /dev/null and b/stylebook/style/graphics/button-a.gif differ
diff --git a/stylebook/style/graphics/button-b.gif b/stylebook/style/graphics/button-b.gif
new file mode 100644
index 00000000..06e03811
Binary files /dev/null and b/stylebook/style/graphics/button-b.gif differ
diff --git a/stylebook/style/loader.xml b/stylebook/style/loader.xml
new file mode 100644
index 00000000..8607e5d7
--- /dev/null
+++ b/stylebook/style/loader.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<!-- CVS $Revision: 1.1 $ $Date: 1999/12/01 14:26:14 $ -->
+
+<loader>
+  <processor name="xslt">
+    <parameter name="stylesheet" value="sbk:/style/stylesheets/book2project.xsl"/>
+  </processor>
+</loader>
diff --git a/stylebook/style/resources/bottom.gif b/stylebook/style/resources/bottom.gif
new file mode 100644
index 00000000..f39031ef
Binary files /dev/null and b/stylebook/style/resources/bottom.gif differ
diff --git a/stylebook/style/resources/button-asf-hi.gif b/stylebook/style/resources/button-asf-hi.gif
new file mode 100644
index 00000000..08b880a7
Binary files /dev/null and b/stylebook/style/resources/button-asf-hi.gif differ
diff --git a/stylebook/style/resources/button-asf-lo.gif b/stylebook/style/resources/button-asf-lo.gif
new file mode 100644
index 00000000..134580f3
Binary files /dev/null and b/stylebook/style/resources/button-asf-lo.gif differ
diff --git a/stylebook/style/resources/button-w3c-hi.gif b/stylebook/style/resources/button-w3c-hi.gif
new file mode 100644
index 00000000..3bf0be39
Binary files /dev/null and b/stylebook/style/resources/button-w3c-hi.gif differ
diff --git a/stylebook/style/resources/button-w3c-lo.gif b/stylebook/style/resources/button-w3c-lo.gif
new file mode 100644
index 00000000..d383d3dd
Binary files /dev/null and b/stylebook/style/resources/button-w3c-lo.gif differ
diff --git a/stylebook/style/resources/button-xml-hi.gif b/stylebook/style/resources/button-xml-hi.gif
new file mode 100644
index 00000000..01d095ce
Binary files /dev/null and b/stylebook/style/resources/button-xml-hi.gif differ
diff --git a/stylebook/style/resources/button-xml-lo.gif b/stylebook/style/resources/button-xml-lo.gif
new file mode 100644
index 00000000..5719c7ef
Binary files /dev/null and b/stylebook/style/resources/button-xml-lo.gif differ
diff --git a/stylebook/style/resources/close.gif b/stylebook/style/resources/close.gif
new file mode 100644
index 00000000..48a9782c
Binary files /dev/null and b/stylebook/style/resources/close.gif differ
diff --git a/stylebook/style/resources/dot.gif b/stylebook/style/resources/dot.gif
new file mode 100644
index 00000000..6227d1d8
Binary files /dev/null and b/stylebook/style/resources/dot.gif differ
diff --git a/stylebook/style/resources/join.gif b/stylebook/style/resources/join.gif
new file mode 100644
index 00000000..02e7611b
Binary files /dev/null and b/stylebook/style/resources/join.gif differ
diff --git a/stylebook/style/resources/line.gif b/stylebook/style/resources/line.gif
new file mode 100644
index 00000000..fd25c394
Binary files /dev/null and b/stylebook/style/resources/line.gif differ
diff --git a/stylebook/style/resources/logo.gif b/stylebook/style/resources/logo.gif
new file mode 100644
index 00000000..53538c3f
Binary files /dev/null and b/stylebook/style/resources/logo.gif differ
diff --git a/stylebook/style/resources/note.gif b/stylebook/style/resources/note.gif
new file mode 100644
index 00000000..33942226
Binary files /dev/null and b/stylebook/style/resources/note.gif differ
diff --git a/stylebook/style/resources/right.gif b/stylebook/style/resources/right.gif
new file mode 100644
index 00000000..bcb50e38
Binary files /dev/null and b/stylebook/style/resources/right.gif differ
diff --git a/stylebook/style/resources/script.js b/stylebook/style/resources/script.js
new file mode 100644
index 00000000..2f89588f
--- /dev/null
+++ b/stylebook/style/resources/script.js
@@ -0,0 +1,21 @@
+rolloverImagesOn=new Array();
+rolloverImagesOff=new Array();
+
+function rolloverOn(name) {
+  if(rolloverImagesOn[name]){
+    document.images[name].src=rolloverImagesOn[name].src;
+  }
+}
+
+function rolloverOff(name) {
+  if(rolloverImagesOff[name]){
+      document.images[name].src=rolloverImagesOff[name].src;
+  }
+}
+
+function rolloverLoad(name,on,off) {
+  rolloverImagesOn[name]=new Image();
+  rolloverImagesOn[name].src=on;
+  rolloverImagesOff[name]=new Image();
+  rolloverImagesOff[name].src=off;
+}
diff --git a/stylebook/style/resources/separator.gif b/stylebook/style/resources/separator.gif
new file mode 100644
index 00000000..e7749432
Binary files /dev/null and b/stylebook/style/resources/separator.gif differ
diff --git a/stylebook/style/resources/void.gif b/stylebook/style/resources/void.gif
new file mode 100644
index 00000000..75b945d2
Binary files /dev/null and b/stylebook/style/resources/void.gif differ
diff --git a/stylebook/style/stylesheets/any2header.xsl b/stylebook/style/stylesheets/any2header.xsl
new file mode 100644
index 00000000..51a8e5a0
--- /dev/null
+++ b/stylebook/style/stylesheets/any2header.xsl
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:param name="label"/>
+
+  <xsl:template match="/">
+    <image width="456" height="35" bgcolor="0086b2">
+      <xsl:apply-templates/>
+    </image>
+  </xsl:template>
+
+  <xsl:template match="s1|faqs|changes">
+      <xsl:variable name="title">
+        <xsl:if test="string-length(@title)=0">
+          <xsl:value-of select="$label"/>
+        </xsl:if>
+        <xsl:if test="string-length(@title)>0">
+          <xsl:value-of select="@title"/>
+        </xsl:if>
+      </xsl:variable>
+
+      <text font="Arial" size="29" x="454" y="8" halign="right" valign="top" color="004080"
+            text="{$title}"/>
+      <text font="Arial" size="29" x="452" y="6" halign="right" valign="top" color="ffffff"
+            text="{$title}"/>
+  </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/stylebook/style/stylesheets/any2project.xsl b/stylebook/style/stylesheets/any2project.xsl
new file mode 100644
index 00000000..2a29c06f
--- /dev/null
+++ b/stylebook/style/stylesheets/any2project.xsl
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:param name="label"/>
+
+  <xsl:template match="/">
+    <project>
+      <xsl:apply-templates/>
+    </project>
+  </xsl:template>
+
+  <xsl:template match="img">
+    <resource source="{@src}" target="images/{@src}"/>
+  </xsl:template>
+
+  <xsl:template match="node()">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/stylebook/style/stylesheets/book2group.xsl b/stylebook/style/stylesheets/book2group.xsl
new file mode 100644
index 00000000..34ac963e
--- /dev/null
+++ b/stylebook/style/stylesheets/book2group.xsl
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:param name="id"/>
+
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="book">
+    <group title="{group[attribute::id=$id]/@label}">
+      <xsl:apply-templates select="group[attribute::id=$id]/entry"/>
+    </group>
+  </xsl:template>
+
+  <xsl:template match="entry">
+    <entry id="{@id}" title="{document(concat('sbk:/sources/',@source))/faqs/@title}">
+      <xsl:apply-templates select="document(concat('sbk:/sources/',@source))/faqs/faq"/>
+    </entry>
+  </xsl:template>
+
+  <xsl:template match="faq">
+    <voice>
+      <xsl:if test="string-length(@title)=0">
+        <xsl:value-of select="q"/>
+      </xsl:if>
+      <xsl:if test="string-length(@title)>0">
+        <xsl:value-of select="@title"/>
+      </xsl:if>
+    </voice>
+  </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/stylebook/style/stylesheets/book2project.xsl b/stylebook/style/stylesheets/book2project.xsl
new file mode 100644
index 00000000..41d34e2a
--- /dev/null
+++ b/stylebook/style/stylesheets/book2project.xsl
@@ -0,0 +1,257 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <!-- match the root book element -->
+  <xsl:template match="book">
+    <project>
+
+      <parameter name="copyright" value="{@copyright}"/>
+
+      <!-- copy all resources to the targets -->
+      <process source="sbk:/style/resources/" producer="directory">
+        <processor name="xslt">
+          <parameter name="stylesheet" value="sbk:/style/stylesheets/directory2project.xsl"/>
+          <parameter name="base" value="resources/"/>
+        </processor>
+      </process>
+
+      <xsl:apply-templates/>
+
+    </project>
+  </xsl:template>
+
+<!-- ********************************************************************** -->
+<!-- CREATE THE TARGET HTML -->
+<!-- ********************************************************************** -->
+
+  <xsl:template match="document">
+
+    <process source="{@source}" producer="parser">
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/any2project.xsl"/>
+      </processor>
+    </process>
+
+    <xsl:call-template name="header">
+      <xsl:with-param name="id"     select="@id"/>
+      <xsl:with-param name="source" select="@source"/>
+      <xsl:with-param name="label"  select="@label"/>
+    </xsl:call-template>
+
+    <xsl:call-template name="labels">
+      <xsl:with-param name="id" select="@id"/>
+      <xsl:with-param name="label" select="@label"/>
+    </xsl:call-template>
+
+    <create source="{@source}" target="{@id}.html" producer="parser" printer="html">
+      <processor name="xslt">
+        <parameter name="id" value="{@id}"/>
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/document2html.xsl"/>
+      </processor>
+    </create>
+  </xsl:template>
+
+  <xsl:template match="hidden">
+
+    <process source="{@source}" producer="parser">
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/any2project.xsl"/>
+      </processor>
+    </process>
+
+    <xsl:call-template name="header">
+      <xsl:with-param name="id"     select="@id"/>
+      <xsl:with-param name="source" select="@source"/>
+      <xsl:with-param name="label"  select="@label"/>
+    </xsl:call-template>
+
+    <create source="{@source}" target="{@id}.html" producer="parser" printer="html">
+      <processor name="xslt">
+        <parameter name="id" value="{@id}"/>
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/document2html.xsl"/>
+      </processor>
+    </create>
+  </xsl:template>
+
+  <xsl:template match="faqs">
+
+    <process source="{@source}" producer="parser">
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/any2project.xsl"/>
+      </processor>
+    </process>
+
+    <xsl:call-template name="header">
+      <xsl:with-param name="id"     select="@id"/>
+      <xsl:with-param name="source" select="@source"/>
+      <xsl:with-param name="label"  select="@label"/>
+    </xsl:call-template>
+
+    <xsl:call-template name="labels">
+      <xsl:with-param name="id" select="@id"/>
+      <xsl:with-param name="label" select="@label"/>
+    </xsl:call-template>
+
+    <create source="{@source}" target="{@id}.html" producer="parser" printer="html">
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/faqs2document.xsl"/>
+      </processor>
+      <processor name="xslt">
+        <parameter name="id" value="{@id}"/>
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/document2html.xsl"/>
+      </processor>
+    </create>
+
+  </xsl:template>
+
+  <xsl:template match="changes">
+
+    <process source="{@source}" producer="parser">
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/any2project.xsl"/>
+      </processor>
+    </process>
+
+    <xsl:call-template name="header">
+      <xsl:with-param name="id"     select="@id"/>
+      <xsl:with-param name="source" select="@source"/>
+      <xsl:with-param name="label"  select="@label"/>
+    </xsl:call-template>
+
+    <xsl:call-template name="labels">
+      <xsl:with-param name="id" select="@id"/>
+      <xsl:with-param name="label" select="@label"/>
+    </xsl:call-template>
+
+    <create source="{@source}" target="{@id}.html" producer="parser" printer="html">
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/changes2document.xsl"/>
+      </processor>
+      <processor name="xslt">
+        <parameter name="id" value="{@id}"/>
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/document2html.xsl"/>
+      </processor>
+    </create>
+
+  </xsl:template>
+
+  <xsl:template match="group">
+    <xsl:apply-templates/>
+
+    <xsl:call-template name="header">
+      <xsl:with-param name="id"     select="@id"/>
+      <xsl:with-param name="source" select="@source"/>
+      <xsl:with-param name="label"  select="@label"/>
+    </xsl:call-template>
+
+    <xsl:call-template name="labels">
+      <xsl:with-param name="id" select="@id"/>
+      <xsl:with-param name="label" select="@label"/>
+    </xsl:call-template>
+
+    <create source="" target="{@id}.html" producer="project" printer="html">
+      <parameter name="id" value="{@id}"/>
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/book2group.xsl"/>
+      </processor>
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/group2document.xsl"/>
+      </processor>
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/document2html.xsl"/>
+      </processor>
+    </create>
+
+  </xsl:template>
+
+  <xsl:template match="entry">
+
+    <process source="{@source}" producer="parser">
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/any2project.xsl"/>
+      </processor>
+    </process>
+
+    <xsl:call-template name="header">
+      <xsl:with-param name="id"     select="@id"/>
+      <xsl:with-param name="source" select="@source"/>
+      <xsl:with-param name="label"  select="@label"/>
+    </xsl:call-template>
+
+    <create source="{@source}" target="{@id}.html" producer="parser" printer="html">
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/faqs2document.xsl"/>
+      </processor>
+      <processor name="xslt">
+        <parameter name="id" value="{@id}"/>
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/document2html.xsl"/>
+      </processor>
+    </create>
+
+  </xsl:template>
+
+  <xsl:template match="external">
+
+    <xsl:call-template name="labels">
+      <xsl:with-param name="id" select="concat('ext-',position())"/>
+      <xsl:with-param name="label" select="@label"/>
+    </xsl:call-template>
+
+  </xsl:template>
+<!-- ********************************************************************** -->
+<!-- NAMED TEMPLATES -->
+<!-- ********************************************************************** -->
+
+<!-- Generate the doument header image -->
+  <xsl:template name="header"> 
+    <xsl:param name="id"/>
+    <xsl:param name="source"/>
+    <xsl:param name="label"/>
+
+    <create source="{$source}" target="graphics/{$id}-header.jpg" producer="parser" printer="image">
+      <processor name="xslt">
+        <parameter name="label" value="{$label}"/>
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/any2header.xsl"/>
+      </processor>
+    </create>
+  </xsl:template>
+
+<!-- Generate the three rollover label images -->
+  <xsl:template name="labels"> 
+    <xsl:param name="id"/>
+    <xsl:param name="label"/>
+    
+    <create source="" target="graphics/{$id}-label-1.jpg" producer="context" printer="image">
+      <parameter name="label" value="{$label}"/>
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/context2label.xsl"/>
+        <parameter name="image" value="sbk:/style/graphics/button-a.gif"/>
+        <parameter name="color" value="ffffff"/>
+      </processor>
+    </create>
+
+    <create source="" target="graphics/{$id}-label-2.jpg" producer="context" printer="image">
+      <parameter name="label" value="{$label}"/>
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/context2label.xsl"/>
+        <parameter name="image" value="sbk:/style/graphics/button-b.gif"/>
+        <parameter name="color" value="ffff00"/>
+      </processor>
+    </create>
+
+    <create source="" target="graphics/{$id}-label-3.jpg" producer="context" printer="image">
+      <parameter name="label" value="{$label}"/>
+      <processor name="xslt">
+        <parameter name="stylesheet" value="sbk:/style/stylesheets/context2label.xsl"/>
+        <parameter name="image" value="sbk:/style/graphics/button-b.gif"/>
+        <parameter name="color" value="ffffff"/>
+      </processor>
+    </create>
+  </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/stylebook/style/stylesheets/changes2document.xsl b/stylebook/style/stylesheets/changes2document.xsl
new file mode 100644
index 00000000..dccbcfce
--- /dev/null
+++ b/stylebook/style/stylesheets/changes2document.xsl
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="changes">
+    <s1 title="{@title}">
+      <xsl:apply-templates/>
+    </s1>
+  </xsl:template>
+
+  <xsl:template match="release">
+    <s2 title="Release {@version} {@date}">
+      <br/><xsl:apply-templates/>
+    </s2>
+  </xsl:template>
+
+  <xsl:template match="features">
+    <s3 title="Features">
+      <ul><xsl:apply-templates/></ul>
+    </s3>
+  </xsl:template>
+
+  <xsl:template match="fixes">
+    <s3 title="Bugs fixed">
+      <ul><xsl:apply-templates/></ul>
+    </s3>
+  </xsl:template>
+
+  <xsl:template match="feat|fix">
+    <li><xsl:apply-templates/></li>
+  </xsl:template>
+
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/stylebook/style/stylesheets/context2footer.xsl b/stylebook/style/stylesheets/context2footer.xsl
new file mode 100644
index 00000000..f50cdf2f
--- /dev/null
+++ b/stylebook/style/stylesheets/context2footer.xsl
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="context">
+    <image source="sbk:/style/graphics/footer.gif">
+      <xsl:apply-templates/>
+    </image>
+  </xsl:template>
+
+  <xsl:template match="parameter">
+    <xsl:if test="@name='copyright'">
+      <text font="Arial Bold" size="11" x="124" y="6" style="plain"
+            halign="left" valign="top" color="666699"
+            text="Copyright &#169; {@value}. All Rights Reserved."/>
+      <text font="Arial Bold" size="11" x="123" y="5" style="plain"
+            halign="left" valign="top" color="333366"
+            text="Copyright &#169; {@value}. All Rights Reserved."/>
+      <text font="Arial Bold" size="11" x="122" y="4" style="plain"
+            halign="left" valign="top" color="ffffff"
+            text="Copyright &#169; {@value}. All Rights Reserved."/>
+    </xsl:if>
+  </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/stylebook/style/stylesheets/context2label.xsl b/stylebook/style/stylesheets/context2label.xsl
new file mode 100644
index 00000000..3c25e521
--- /dev/null
+++ b/stylebook/style/stylesheets/context2label.xsl
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:param name="image"/>
+  <xsl:param name="color"/>
+
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="context">
+    <image source="{$image}">
+      <xsl:apply-templates/>
+    </image>
+  </xsl:template>
+
+  <xsl:template match="parameter">
+    <xsl:if test="@name='label'">
+      <text font="Arial" size="12" x="14" y="1" halign="left"
+            valign="top" color="{$color}" style="italic" text="{@value}"/>
+    </xsl:if>
+  </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/stylebook/style/stylesheets/directory2project.xsl b/stylebook/style/stylesheets/directory2project.xsl
new file mode 100644
index 00000000..48a4581c
--- /dev/null
+++ b/stylebook/style/stylesheets/directory2project.xsl
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:param name="base"/>
+
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="directory">
+    <project>
+      <xsl:apply-templates/>
+    </project>
+  </xsl:template>
+
+  <xsl:template match="entry">
+
+    <!--xsl:if test="@directory!='true'"-->
+      <resource source="{@href}" target="{$base}{@href}"/>
+    <!--/xsl:if-->
+<!-- don't copy subdir to avoid copying proprietary CVS files
+    <xsl:if test="@directory='true'">
+      <process source="{@href}" producer="directory">
+        <processor name="xslt">
+          <parameter name="stylesheet" value="sbk:/style/stylesheets/directory2project.xsl"/>
+          <parameter name="base" value="{$base}{@href}"/>
+        </processor>
+      </process>
+    </xsl:if>
+-->    
+  </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/stylebook/style/stylesheets/document2html.xsl b/stylebook/style/stylesheets/document2html.xsl
new file mode 100644
index 00000000..1c2de8f2
--- /dev/null
+++ b/stylebook/style/stylesheets/document2html.xsl
@@ -0,0 +1,445 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:param name="stylebook.project"/>
+  <xsl:param name="copyright"/>
+  <xsl:param name="id"/>
+
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="s1">
+    <html>
+      <head>
+        <script language="JavaScript" type="text/javascript" src="resources/script.js"/>
+        <title><xsl:value-of select="@title"/></title>
+      </head>
+      <body text="#000000" link="#0000ff" vlink="#0000aa" alink="#ff0000"
+            topmargin="4" leftmargin="4" marginwidth="4" marginheight="4"
+            bgcolor="#ffffff">
+        <!-- THE TOP BAR (HEADER) -->
+        <table width="620" cellspacing="0" cellpadding="0" border="0">
+          <tr>
+            <td width="135" height="60" rowspan="3" valign="top" align="left">
+              <img width="135" height="60" src="resources/logo.gif" alt="logo" hspace="0" vspace="0" border="0"/></td>
+            <td width="456" height="5" valign="top" align="left" colspan="4">
+              <img width="456" height="5" src="resources/line.gif" alt="line" hspace="0" vspace="0" border="0"/></td>
+            <td width="29" height="60"  rowspan="3" valign="top" align="left">
+              <img width="29" height="60" src="resources/right.gif" alt="right" hspace="0" vspace="0" border="0"/></td>
+          </tr>
+          <tr>
+            <td width="456" height="35" valign="top" align="left" colspan="4" bgcolor="#0086b2">
+              <img src="graphics/{$id}-header.jpg" width="456" height="35" hspace="0" vspace="0" border="0" alt="{s1/@title}"/></td>
+          </tr>
+          <tr>
+            <td width="168" height="20" valign="top" align="left">
+              <img width="168" height="20" src="resources/bottom.gif" alt="bottom" hspace="0" vspace="0" border="0"/></td>
+            <td width="96" height="20" valign="top" align="left">
+              <a href="http://xml.apache.org/" onMouseOver="rolloverOn('xml');" onMouseOut="rolloverOff('xml');" target="new">
+                <img alt="http://xml.apache.org/" width="96" height="20" src="resources/button-xml-lo.gif"
+                     name="xml" hspace="0" vspace="0" border="0"
+                     onLoad="rolloverLoad('xml','resources/button-xml-hi.gif','resources/button-xml-lo.gif');"/>
+              </a>
+            </td>
+            <td width="96" height="20" valign="top" align="left">
+              <a href="http://www.apache.org/" onMouseOver="rolloverOn('asf');" onMouseOut="rolloverOff('asf');" target="new">
+                <img alt="http://www.apache.org/" width="96" height="20" src="resources/button-asf-lo.gif"
+                     name="asf" hspace="0" vspace="0" border="0"
+                     onLoad="rolloverLoad('asf','resources/button-asf-hi.gif','resources/button-asf-lo.gif');"/>
+              </a>
+            </td>
+            <td width="96" height="20" valign="top" align="left">
+              <a href="http://www.w3.org/" onMouseOver="rolloverOn('w3c');" onMouseOut="rolloverOff('w3c');" target="new">
+                <img alt="http://www.w3.org/" width="96" height="20" src="resources/button-w3c-lo.gif"
+                     name="w3c" hspace="0" vspace="0" border="0"
+                     onLoad="rolloverLoad('w3c','resources/button-w3c-hi.gif','resources/button-w3c-lo.gif');"/>
+              </a>
+            </td>
+          </tr>
+        </table>
+        <!-- THE MAIN PANEL (SIDEBAR AND CONTENT) -->
+        <table width="620" cellspacing="0" cellpadding="0" border="0">
+          <tr>
+            <!-- THE SIDE BAR -->
+            <td width="120" valign="top" align="left">
+              <img width="120" height="14" src="resources/join.gif" alt="join" hspace="0" vspace="0" border="0"/><br/>
+                <xsl:apply-templates select="document($stylebook.project)"/>
+              <img width="120" height="14" src="resources/close.gif" alt="close" hspace="0" vspace="0" border="0"/><br/>
+            </td>
+            <!-- THE CONTENT PANEL -->
+            <td width="500" valign="top" align="left">
+              <table border="0" cellspacing="0" cellpadding="3">
+                <tr><td><xsl:apply-templates/></td></tr>
+              </table>
+            </td>
+          </tr>
+        </table><br/>
+        <table width="620" border="0" cellspacing="0" cellpadding="0">
+          <tr><td bgcolor="#0086b2"><img src="resources/dot.gif" alt="dot" width="1" height="1"/></td></tr>
+          <tr>
+            <td align="center"><font size="-1" color="#0086b2"><i>
+              Copyright &#169; <xsl:value-of select="$copyright"/>.
+              All Rights Reserved.
+            </i></font></td>
+          </tr>
+        </table>
+      </body>
+    </html>
+  </xsl:template>
+
+<!-- ###################################################################### -->
+<!-- book -->
+
+  <xsl:template match="book">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="document|faqs|changes|group">
+    <xsl:if test="@id=$id">
+      <img src="graphics/{@id}-label-1.jpg" width="120" height="12" hspace="0" vspace="0" border="0" alt="{@label}"/>
+    </xsl:if>
+    <xsl:if test="@id!=$id">
+      <a href="{@id}.html" onMouseOver="rolloverOn('side-{@id}');" onMouseOut="rolloverOff('side-{@id}');">
+        <img onLoad="rolloverLoad('side-{@id}','graphics/{@id}-label-2.jpg','graphics/{@id}-label-3.jpg');"
+             name="side-{@id}" src="graphics/{@id}-label-3.jpg" width="120" height="12" hspace="0" vspace="0" border="0" alt="{@label}"/>
+      </a>
+    </xsl:if>
+    <br/>
+  </xsl:template>
+
+  <xsl:template match="external">
+    <xsl:variable name="extid" select="concat('ext-',position())"/>
+    <a href="{@href}" onMouseOver="rolloverOn('side-{$extid}');" onMouseOut="rolloverOff('side-{$extid}');">
+      <img onLoad="rolloverLoad('side-{$extid}','graphics/{$extid}-label-2.jpg','graphics/{$extid}-label-3.jpg');"
+           name="side-{$extid}" src="graphics/{$extid}-label-3.jpg" width="120" height="12" hspace="0" vspace="0" border="0" alt="{@label}"/>
+    </a>
+    <br/>
+  </xsl:template>
+
+  <xsl:template match="separator">
+    <img src="resources/separator.gif" alt="separator" width="120" height="6" hspace="0" vspace="0" border="0"/><br/>
+  </xsl:template>
+
+
+<!-- ###################################################################### -->
+<!-- document -->
+
+  <xsl:template match="s2">
+    <table width="494" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td bgcolor="666699" colspan="2" width="494">
+          <table width="494" cellspacing="0" cellpadding="0" border="0">
+            <tr>
+              <td bgcolor="#039acc" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+              <td bgcolor="#039acc" width="492" height="1"><img src="resources/void.gif" alt="" width="492" height="1" vspace="0" hspace="0" border="0"/></td>
+              <td bgcolor="#0086b2" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+            </tr>
+            <tr>
+              <td bgcolor="#039acc" width="1"><img src="resources/void.gif" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+              <td bgcolor="#0086b2"  width="492">
+                <font size="+1" face="arial,helvetica,sanserif" color="#ffffff">
+                  <img src="resources/void.gif" alt="" width="2" height="2" vspace="0" hspace="0" border="0"/>
+                  <b><xsl:value-of select="@title"/></b>
+                </font>
+              </td>
+              <td bgcolor="#017299" width="1"><img src="resources/void.gif" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+            </tr>
+            <tr>
+              <td bgcolor="#0086b2" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+              <td bgcolor="#017299" width="492" height="1"><img src="resources/void.gif" alt="" width="492" height="1" vspace="0" hspace="0" border="0"/></td>
+              <td bgcolor="#017299" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+            </tr>
+          </table>
+        </td>
+      </tr>  
+      <tr>
+        <td width="10">&#160;</td>
+        <td width="484">
+          <font face="arial,helvetica,sanserif" color="#000000">
+            <xsl:apply-templates/>
+          </font>
+        </td>
+      </tr>  
+    </table>
+    <br/>
+  </xsl:template>
+
+  <xsl:template match="s3">
+    <table width="484" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td bgcolor="666699" colspan="2" width="484">
+          <table width="484" cellspacing="0" cellpadding="0" border="0">
+          <tr>
+            <td bgcolor="#039acc" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+            <td bgcolor="#039acc" width="482" height="1"><img src="resources/void.gif" alt="" width="482" height="1" vspace="0" hspace="0" border="0"/></td>
+            <td bgcolor="#0086b2" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+          </tr>
+          <tr>
+            <td bgcolor="#039acc" width="1"><img src="resources/void.gif" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+            <td bgcolor="#0086b2"  width="482">
+              <font face="arial,helvetica,sanserif" color="#ffffff">
+                <img src="resources/void.gif" alt="" width="2" height="2" vspace="0" hspace="0" border="0"/>
+                <b><xsl:value-of select="@title"/></b>
+              </font>
+            </td>
+            <td bgcolor="#017299" width="1"><img src="resources/void.gif" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+          </tr>
+          <tr>
+            <td bgcolor="#0086b2" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+            <td bgcolor="#017299" width="482" height="1"><img src="resources/void.gif" alt="" width="482" height="1" vspace="0" hspace="0" border="0"/></td>
+            <td bgcolor="#017299" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+          </tr>
+          </table>
+        </td>
+      </tr>  
+      <tr>
+        <td width="10">&#160;</td>
+        <td width="474">
+          <font size="-1" face="arial,helvetica,sanserif" color="#000000">
+            <xsl:apply-templates/>
+          </font>
+        </td>
+      </tr>  
+    </table>
+    <br/>
+  </xsl:template>
+
+  <xsl:template match="s4">
+    <table width="474" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <td bgcolor="666699" colspan="2" width="484">
+          <table width="474" cellspacing="0" cellpadding="0" border="0">
+          <tr>
+            <td bgcolor="#039acc" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+            <td bgcolor="#039acc" width="472" height="1"><img src="resources/void.gif" alt="" width="472" height="1" vspace="0" hspace="0" border="0"/></td>
+            <td bgcolor="#0086b2" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+          </tr>
+          <tr>
+            <td bgcolor="#039acc" width="1"><img src="resources/void.gif" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+            <td bgcolor="#0086b2"  width="472">
+              <font size="-1" face="arial,helvetica,sanserif" color="#ffffff">
+                <img src="resources/void.gif" alt="" width="2" height="2" vspace="0" hspace="0" border="0"/>
+                <b><xsl:value-of select="@title"/></b>
+              </font>
+            </td>
+            <td bgcolor="#017299" width="1"><img src="resources/void.gif" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+          </tr>
+          <tr>
+            <td bgcolor="#0086b2" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+            <td bgcolor="#017299" width="472" height="1"><img src="resources/void.gif" alt="" width="472" height="1" vspace="0" hspace="0" border="0"/></td>
+            <td bgcolor="#017299" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+          </tr>
+          </table>
+        </td>
+      </tr>  
+      <tr>
+        <td width="10">&#160;</td>
+        <td width="464">
+          <font size="-1" face="arial,helvetica,sanserif" color="#000000">
+            <xsl:apply-templates/>
+          </font>
+        </td>
+      </tr>  
+    </table>
+    <br/>
+  </xsl:template>
+
+<!-- ###################################################################### -->
+<!-- blocks -->
+
+  <xsl:template match="p">
+    <p><xsl:apply-templates/></p>
+  </xsl:template>
+
+  <xsl:template match="note">
+    <table width="100%" cellspacing="3" cellpadding="0" border="0">
+      <tr>
+        <td width="20" valign="top">
+          <img src="resources/note.gif" width="20" height="24" vspace="0" hspace="0" border="0" alt="Note"/>
+        </td>
+        <td valign="top">
+          <font size="-1" face="arial,helvetica,sanserif" color="#000000">
+            <i>
+              <xsl:apply-templates/>
+            </i>
+          </font>
+        </td>
+      </tr>  
+    </table>
+  </xsl:template>
+
+  <xsl:template match="ul">
+    <ul><xsl:apply-templates/></ul>
+  </xsl:template>
+
+  <xsl:template match="ol">
+    <ol><xsl:apply-templates/></ol>
+  </xsl:template>
+
+  <xsl:template match="li">
+    <li><xsl:apply-templates/></li>
+  </xsl:template>
+  
+    <!--Definition lists: gloss, term, label, item -->
+  <xsl:template match="gloss">
+    <dl><xsl:apply-templates/></dl>
+  </xsl:template>
+   <!-- <term> contains a single-word, multi-word or symbolic 
+       designation which is regarded as a technical term. --> 
+  <xsl:template match="term">
+    <dfn><xsl:apply-templates/></dfn>
+  </xsl:template>
+  <xsl:template match="label" priority="1">
+    <dt><xsl:apply-templates/></dt>
+  </xsl:template>
+  <xsl:template match="item" priority="2">
+    <dd>
+      <xsl:apply-templates/>
+    </dd>
+  </xsl:template>
+
+  <xsl:template match="source">
+  <div align="right">
+  <table width="464" cellspacing="4" cellpadding="0" border="0">
+    <tr>
+      <td bgcolor="#0086b2" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+      <td bgcolor="#0086b2" width="462" height="1"><img src="resources/void.gif" alt="" width="462" height="1" vspace="0" hspace="0" border="0"/></td>
+      <td bgcolor="#0086b2" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+    </tr>
+    <tr>
+      <td bgcolor="#0086b2" width="1"><img src="resources/void.gif" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+      <td bgcolor="#ffffff"  width="462">
+          <font size="-1"><pre><xsl:apply-templates/></pre></font>
+      </td>
+      <td bgcolor="#0086b2" width="1"><img src="resources/void.gif" alt="" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
+    </tr>
+    <tr>
+      <td bgcolor="#0086b2" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+      <td bgcolor="#0086b2" width="462" height="1"><img src="resources/void.gif" alt="" width="462" height="1" vspace="0" hspace="0" border="0"/></td>
+      <td bgcolor="#0086b2" width="1"   height="1"><img src="resources/void.gif" alt="" width="1"   height="1" vspace="0" hspace="0" border="0"/></td>
+    </tr>
+  </table>
+  </div>
+  </xsl:template>
+
+  <xsl:template match="table">
+    <table width="100%" border="0" cellspacing="2" cellpadding="2">
+      <xsl:apply-templates/>
+    </table>
+  </xsl:template>
+
+  <xsl:template match="tr">
+    <tr><xsl:apply-templates/></tr>
+  </xsl:template>
+
+  <xsl:template match="th">
+    <td bgcolor="#039acc" colspan="{@colspan}" rowspan="{@rowspan}" valign="center" align="center">
+      <font color="#ffffff" size="-1" face="arial,helvetica,sanserif">
+        <b><xsl:apply-templates/></b>&#160;
+      </font>
+    </td>
+  </xsl:template>
+
+  <xsl:template match="td">
+    <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" valign="top" align="left">
+      <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+        <xsl:apply-templates/>&#160;
+      </font>
+    </td>
+  </xsl:template>
+
+  <xsl:template match="tn">
+    <td bgcolor="#ffffff" colspan="{@colspan}" rowspan="{@rowspan}">
+      &#160;
+    </td>
+  </xsl:template>
+
+<!-- ###################################################################### -->
+<!-- markup -->
+
+  <xsl:template match="em">
+    <b><xsl:apply-templates/></b>
+  </xsl:template>
+
+  <xsl:template match="ref">
+    <i><xsl:apply-templates/></i>
+  </xsl:template>
+  
+  <xsl:template match="code">
+    <code><font face="courier, monospaced"><xsl:apply-templates/></font></code>
+  </xsl:template>
+  
+  <xsl:template match="br">
+    <br/>
+  </xsl:template>
+  
+<!-- ###################################################################### -->
+<!-- links -->
+
+  <xsl:template match="link">
+    <xsl:if test="string-length(@anchor)=0">
+      <xsl:if test="string-length(@idref)=0">
+        <xsl:apply-templates/>
+      </xsl:if>
+      <xsl:if test="string-length(@idref)>0">
+        <a href="{@idref}.html"><xsl:apply-templates/></a>
+      </xsl:if>
+    </xsl:if>
+
+    <xsl:if test="string-length(@anchor)>0">
+      <xsl:if test="string-length(@idref)=0">
+        <a href="#{@anchor}"><xsl:apply-templates/></a>
+      </xsl:if>
+      <xsl:if test="string-length(@idref)>0">
+        <a href="{@idref}.html#{@anchor}"><xsl:apply-templates/></a>
+      </xsl:if>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="anchor">
+    <a name="{@name}"><xsl:comment>anchor</xsl:comment></a>
+  </xsl:template>
+
+  <xsl:template match="jump">
+    <a href="{@href}"><xsl:apply-templates/></a>
+  </xsl:template>
+
+  <xsl:template match="img">
+    <img src="images/{@src}" alt="{@alt}" border="0" vspace="4" hspace="4" align="right"/>
+    <br clear="all"/>
+  </xsl:template>
+
+  <xsl:template match="resource-ref">
+    <xsl:variable name="resourceFile" 
+          select="document($stylebook.project)/book/resources/@source"/>
+    <xsl:variable name="xref" select="@idref"/>
+    <xsl:variable name="href"
+          select="document($resourceFile)/resources/resource[@id=$xref]/@location"/>
+    <xsl:variable name="label"
+          select="document($resourceFile)/resources/resource[@id=$xref]/@title"/>
+    <A href="{$href}" target="_top"><xsl:value-of select="$label"/></A>
+  </xsl:template>
+
+  <xsl:template match="human-resource-ref">
+    <xsl:variable name="resourceFile" 
+          select="document($stylebook.project)/book/resources/@source"/>  
+    <xsl:variable name="ref"  select="@idref"/>
+    <xsl:variable name="mailto"
+          select="document($resourceFile)/resources/human-resource[@id=$ref]/@mailto"/>
+   <xsl:variable name="name"
+          select="document($resourceFile)/resources/human-resource[@id=$ref]/@name"/>                          
+    <A href="mailto:{$mailto}"><xsl:value-of select="$name"/></A>
+  </xsl:template>
+
+<!-- ###################################################################### -->
+<!-- copy
+
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+-->
+</xsl:stylesheet>
diff --git a/stylebook/style/stylesheets/done.xsl b/stylebook/style/stylesheets/done.xsl
index a7e4753f..cc1bb745 100644
--- a/stylebook/style/stylesheets/done.xsl
+++ b/stylebook/style/stylesheets/done.xsl
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- DOCTYPE xsl:stylesheet -->
-
-<!-- XSL Style sheet, DTD omitted -->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:lxslt="http://xml.apache.org/xslt"
-    xmlns:redirect="org.apache.xalan.lib.Redirect"
-    extension-element-prefixes="redirect">
-
-  <xsl:output method="xml"/>
-  
-  <xsl:param name="xsltcdone" select="'.\XSLTCDONE'"/>
-  
-  <xsl:template match="Commits">
-  <xsl:comment>This XML fragment contains a list of source code updates to place in an &lt;s3&gt; section of readme.xml</xsl:comment>
-    <xsl:if test="count(Commit[@category='core'])>0">
-      <p> Core (Non-XSLTC) source code updates:</p>
-      <ul>
-      <xsl:for-each select="Commit[@category='core']">
-        <li><xsl:apply-templates select="Who|DateCommitted|Modified|Added|Removed|Log"/></li>
-      </xsl:for-each>
-      </ul>
-    </xsl:if>
-    <xsl:if test="count(Commit[@category='core'])=0">
-      <note>This release includes no updates of the non-XSLTC core source code.</note>
-    </xsl:if>
-    
-    <xsl:if test="count(Commit[@category='xsltc'])>0">
-      <redirect:write file="{$xsltcdone}">
-        <p>XSLTC source code updates:</p>
-        <ul>
-        <xsl:for-each select="Commit[@category='xsltc']">
-          <li><xsl:apply-templates select="Who|DateCommitted|Modified|Added|Removed|Log"/></li>
-        </xsl:for-each>
-        </ul>
-      </redirect:write>
-    </xsl:if>    
-    <xsl:if test="count(Commit[@category='xsltc'])=0">
-      <redirect:write file="{$xsltcdone}">
-        <note>This release includes no updates of the XSLTC source code.</note>
-      </redirect:write>
-    </xsl:if>
-    
-  </xsl:template>
-  
-  <xsl:template match="Who">
-    <ref>Committed by </ref><xsl:value-of select="."/>
-  </xsl:template>
-  <xsl:template match="DateCommitted">
-    <ref> on </ref><xsl:value-of select="."/><br/>
-  </xsl:template>    
-  <xsl:template match="Modified">    
-    <ref>Modified: </ref><xsl:value-of select="."/><br/>
-  </xsl:template>    
-  <xsl:template match="Added">    
-    <ref>Added: </ref><xsl:value-of select="."/><br/>
-  </xsl:template>    
-  <xsl:template match="Removed">    
-    <ref>Removed: </ref><xsl:value-of select="."/><br/>
-  </xsl:template>    
-    <xsl:template match="Log">    
-    <ref>Committer's log entry: </ref><xsl:value-of select="."/><br/><br/>
-  </xsl:template>
-  
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!-- DOCTYPE xsl:stylesheet -->
+
+<!-- XSL Style sheet, DTD omitted -->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:lxslt="http://xml.apache.org/xslt"
+    xmlns:redirect="org.apache.xalan.lib.Redirect"
+    extension-element-prefixes="redirect">
+
+  <xsl:output method="xml"/>
+  
+  <xsl:param name="xsltcdone" select="'.\XSLTCDONE'"/>
+  
+  <xsl:template match="Commits">
+  <xsl:comment>This XML fragment contains a list of source code updates to place in an &lt;s3&gt; section of readme.xml</xsl:comment>
+    <xsl:if test="count(Commit[@category='core'])>0">
+      <p> Core (Non-XSLTC) source code updates:</p>
+      <ul>
+      <xsl:for-each select="Commit[@category='core']">
+        <li><xsl:apply-templates select="Who|DateCommitted|Modified|Added|Removed|Log"/></li>
+      </xsl:for-each>
+      </ul>
+    </xsl:if>
+    <xsl:if test="count(Commit[@category='core'])=0">
+      <note>This release includes no updates of the non-XSLTC core source code.</note>
+    </xsl:if>
+    
+    <xsl:if test="count(Commit[@category='xsltc'])>0">
+      <redirect:write file="{$xsltcdone}">
+        <p>XSLTC source code updates:</p>
+        <ul>
+        <xsl:for-each select="Commit[@category='xsltc']">
+          <li><xsl:apply-templates select="Who|DateCommitted|Modified|Added|Removed|Log"/></li>
+        </xsl:for-each>
+        </ul>
+      </redirect:write>
+    </xsl:if>    
+    <xsl:if test="count(Commit[@category='xsltc'])=0">
+      <redirect:write file="{$xsltcdone}">
+        <note>This release includes no updates of the XSLTC source code.</note>
+      </redirect:write>
+    </xsl:if>
+    
+  </xsl:template>
+  
+  <xsl:template match="Who">
+    <ref>Committed by </ref><xsl:value-of select="."/>
+  </xsl:template>
+  <xsl:template match="DateCommitted">
+    <ref> on </ref><xsl:value-of select="."/><br/>
+  </xsl:template>    
+  <xsl:template match="Modified">    
+    <ref>Modified: </ref><xsl:value-of select="."/><br/>
+  </xsl:template>    
+  <xsl:template match="Added">    
+    <ref>Added: </ref><xsl:value-of select="."/><br/>
+  </xsl:template>    
+  <xsl:template match="Removed">    
+    <ref>Removed: </ref><xsl:value-of select="."/><br/>
+  </xsl:template>    
+    <xsl:template match="Log">    
+    <ref>Committer's log entry: </ref><xsl:value-of select="."/><br/><br/>
+  </xsl:template>
+  
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/stylebook/style/stylesheets/faqs2document.xsl b/stylebook/style/stylesheets/faqs2document.xsl
new file mode 100644
index 00000000..3c657fe0
--- /dev/null
+++ b/stylebook/style/stylesheets/faqs2document.xsl
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="faqs">
+    <s1 title="{@title}">
+      <s2 title="Questions">
+      	<br/>
+        <xsl:apply-templates select="group" mode="index"/>
+        <ul>
+          <xsl:apply-templates select="faq" mode="index"/>
+        </ul>
+      </s2>
+      <s2 title="Answers">
+      	<br/>
+        <xsl:apply-templates select="group/faq"/>
+        <br/>
+        <xsl:apply-templates select="faq"/>
+      </s2>
+    </s1>
+  </xsl:template>
+
+  <xsl:template match="group" mode="index">
+    <xsl:value-of select="@title"/>
+    <ul>
+      <xsl:apply-templates select="faq" mode="index"/>
+    </ul>
+  </xsl:template>
+
+  <xsl:template match="faq" mode="index">
+    <li>
+      <link anchor="faq-{generate-id(.)}">
+        <xsl:if test="string-length(@title)=0">
+          <xsl:value-of select="q"/>
+        </xsl:if>
+        <xsl:if test="string-length(@title)>0">
+          <xsl:value-of select="@title"/>
+        </xsl:if>
+      </link>
+    </li>
+  </xsl:template>
+
+  <xsl:template match="faq">
+    <anchor name="faq-{generate-id(.)}"/>
+    <s3 title="{q}">
+      <br/>
+      <xsl:apply-templates select="a"/>
+    </s3>
+  </xsl:template>
+
+  <xsl:template match="a">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/stylebook/style/stylesheets/group2document.xsl b/stylebook/style/stylesheets/group2document.xsl
new file mode 100644
index 00000000..19e1515b
--- /dev/null
+++ b/stylebook/style/stylesheets/group2document.xsl
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="group">
+    <s1 title="{@title}">
+      <xsl:apply-templates/>
+    </s1>
+  </xsl:template>
+
+  <xsl:template match="entry">
+    <s2 title="{@title}">
+      <p>
+        Read the <link idref="{@id}"><xsl:value-of select="@title"/></link>
+        document or jump directly to:
+      </p>
+      <ul>
+        <xsl:apply-templates/>
+      </ul>
+    </s2>
+  </xsl:template>
+
+  <xsl:template match="voice">
+    <li><link idref="{ancestor::*/@id}" anchor="faq-{position()}"><xsl:apply-templates/></link></li>
+  </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/stylebook_docgen.bat b/stylebook_docgen.bat
new file mode 100755
index 00000000..63499b8c
--- /dev/null
+++ b/stylebook_docgen.bat
@@ -0,0 +1,56 @@
+rem Stylebook execution extracted from old Ant build
+rem Some of the Xalan (especially xsltc) documentation was written in
+rem stylebook. It isn't clear that keeping it as source and rendering
+rem it at buildtime, rather than checking in the generated files, is
+rem actually a win -- not least because those files are probably pretty
+rem far out of date at this point.
+rem
+rem This, or something equivalent, should be being invoked as part of our
+rem maven "site" build.
+
+set stylebook_dir=".\stylebook"
+set stylebook_book="%stylebook_dir%\sources\xalan-jlocal.xml"
+set stylebook_style="%stylebook_dir%\style"
+set doc_generator="org.apache.stylebook.StyleBook"
+set doc_generator_styletar="%stylebook_dir%\xml-site-style.tar.gz"
+set xalan_cmdline_class="org.apache.xalan.xslt.Process"
+
+set stylebook_class_path="xml-apis.jar";"runtime.jar";"stylebook\stylebook-1.0-b3_xalan-2.jar";tools\*.jar;"serializer\target\classes";"xalan\target\classes"
+
+
+rem Note --directory affects any following options, so put it at EOL here
+rem Also note that this really should be unpacking into a scratch directory,
+rem or not unpacking at all except during execution; Oh Well
+tar -xf %doc_generator_styletar% --directory %stylebook_dir%
+
+echo "Generate Xalan-J 2.x design document"
+java -cp %stylebook_class_path% %doc_generator% loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=.\target\site\design\ .\stylebook\sources\xalandesign.xml .\stylebook\style
+
+
+rem Generate a PDF file, via collation, xml2fo.xsl, and FOP (if we have it)
+rem In Fact, this whole sequence is not being called in our normal Ant-driven builds either,
+rem so I've disabled it for now.
+if 0==1 (
+    java -cp %stylebook_class_path% %xalan_cmdline_class% -xsl .\stylebook\sources\xalan-collate.xsl -out .\stylebook\sources\xalan\xalan-collate.xml
+    java -cp %stylebook_class_path% %xalan_cmdline_class% -in .\stylebook\sources\xalan\xalan-collate.xml -xsl .\stylebook\style\stylesheets\xml2fo.xsl  -param resourceFile ..\..\sources\xalan\resources.xml -param project Xalan-Java -out .\target\site\sources\xalan\xalan-collate.fo
+)
+
+rem NOTE; Without the loaderConfig, we get complaints from
+rem book2project.xsl that it can't find
+rem org/apache/xerces/dom/DocumentImpl. loaderDesign is just saying that
+rem xslt shouild be called with design2project.xsl, so that seems
+rem harmless.
+
+echo "Generate XSLTC Architectural documentation"
+java -cp %stylebook_class_path% %doc_generator% loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=.\target\site\xsltc\ .\stylebook\sources\xsltc.xml .\stylebook\style
+
+rem NOTE; Ditto re loaderdesign.
+echo "Generate xalan-jlocal documentation"
+java -cp %stylebook_class_path% %doc_generator% loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=.\target\site\xalan\local .\stylebook\sources\xalan-jlocal.xml .\stylebook\style
+
+echo "autodocs equivalent"
+mkdir .\target\site\xalan
+java -cp %stylebook_class_path% %doc_generator% loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=.\target\site\xalan .\stylebook\sources\xalan-jsite.xml .\stylebook\style
+
+mkdir .\target\site\xsltc
+xcopy /s stylebook\sources\xsltc\README.x* target\site\xsltc\
diff --git a/stylebook_docgen.sh b/stylebook_docgen.sh
new file mode 100755
index 00000000..ebbff56e
--- /dev/null
+++ b/stylebook_docgen.sh
@@ -0,0 +1,55 @@
+# Stylebook execution extracted from old Ant build
+# Some of the Xalan (especially xsltc) documentation was written in
+# stylebook. It isn't clear that keeping it as source and rendering
+# it at buildtime, rather than checking in the generated files, is
+# actually a win -- not least because those files are probably pretty
+# far out of date at this point.
+#
+# This, or something equivalent, should be being invoked as part of our
+# maven "site" build.
+
+stylebook_dir="./stylebook"
+stylebook_book="${stylebook_dir}/sources/xalan-jlocal.xml"
+stylebook_style="${stylebook_dir}/style"
+doc_generator="org.apache.stylebook.StyleBook"
+doc_generator_styletar="${stylebook_dir}/xml-site-style.tar.gz"
+xalan_cmdline_class="org.apache.xalan.xslt.Process"
+
+stylebook_class_path="xml-apis.jar":"${parser_jar}":"${bcel_jar}":"runtime.jar":"stylebook/stylebook-1.0-b3_xalan-2.jar":tools/*.jar:"serializer/target/classes":"xalan/target/classes"
+
+
+# Note --directory affects any following options, so put it at EOL here
+# Also note that this really should be unpacking into a scratch directory,
+# or not unpacking at all except during execution; Oh Well
+tar -xf ${doc_generator_styletar} --directory ${stylebook_dir}
+
+echo "Generate Xalan-J 2.x design document"
+java -cp ${stylebook_class_path} ${doc_generator} loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./target/site/design/ ./stylebook/sources/xalandesign.xml ./stylebook/style
+
+
+# Generate a PDF file, via collation, xml2fo.xsl, and FOP (if we have it)
+# In Fact, this whole sequence is not being called in our normal Ant-driven builds either.
+if false; then 
+    java -cp ${stylebook_class_path} ${xalan_cmdline_class} -xsl ./stylebook/sources/xalan-collate.xsl -out ./stylebook/sources/xalan/xalan-collate.xml
+    java -cp ${stylebook_class_path} ${xalan_cmdline_class} -in ./stylebook/sources/xalan/xalan-collate.xml -xsl ./stylebook/style/stylesheets/xml2fo.xsl  -param resourceFile ../../sources/xalan/resources.xml -param project Xalan-Java -out ./target/site/sources/xalan/xalan-collate.fo
+fi
+
+# NOTE: Without the loaderConfig, we get complaints from
+# book2project.xsl that it can't find
+# org/apache/xerces/dom/DocumentImpl. loaderDesign is just saying that
+# xslt shouild be called with design2project.xsl, so that seems
+# harmless.
+
+echo "Generate XSLTC Architectural documentation"
+java -cp ${stylebook_class_path} ${doc_generator} loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./target/site/xsltc/ ./stylebook/sources/xsltc.xml ./stylebook/style
+
+# NOTE: Ditto re loaderdesign.
+echo "Generate xalan-jlocal documentation"
+java -cp ${stylebook_class_path} ${doc_generator} loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./target/site/xalan/local ./stylebook/sources/xalan-jlocal.xml ./stylebook/style
+
+echo "autodocs equivalent"
+mkdir -p ./target/site/xalan
+java -cp ${stylebook_class_path} ${doc_generator} loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=./target/site/xalan ./stylebook/sources/xalan-jsite.xml ./stylebook/style
+
+mkdir -p ./target/site/xsltc
+cp stylebook/sources/xsltc/README.x* target/site/xsltc/
diff --git a/tools/JLex.jar b/tools/JLex.jar
deleted file mode 100644
index 1c977f32..00000000
Binary files a/tools/JLex.jar and /dev/null differ
diff --git a/tools/ant.jar b/tools/ant.jar
deleted file mode 100644
index 7cf87e83..00000000
Binary files a/tools/ant.jar and /dev/null differ
diff --git a/tools/antRun b/tools/antRun
deleted file mode 100644
index f0a18f16..00000000
--- a/tools/antRun
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-# Args: DIR command
-cd "$1"
-CMD="$2"
-shift
-shift
-
-exec $CMD "$@"
diff --git a/tools/antRun.bat b/tools/antRun.bat
deleted file mode 100644
index a989b67d..00000000
--- a/tools/antRun.bat
+++ /dev/null
@@ -1,36 +0,0 @@
-@echo off
-rem
-rem ==========================================================================
-rem = Copyright 2004 The Apache Software Foundation.
-rem =
-rem = Licensed under the Apache License, Version 2.0 (the "License");
-rem = you may not use this file except in compliance with the License.
-rem = You may obtain a copy of the License at
-rem =
-rem =     http://www.apache.org/licenses/LICENSE-2.0
-rem =
-rem = Unless required by applicable law or agreed to in writing, software
-rem = distributed under the License is distributed on an "AS IS" BASIS,
-rem = WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem = See the License for the specific language governing permissions and
-rem = limitations under the License.
-rem ==========================================================================
-rem
-rem Change drive and directory to %1 (Win9X only for NT/2K use "cd /d")
-cd %1
-%1\
-set ANT_RUN_CMD=%2
-shift
-shift
-
-set PARAMS=
-:loop
-if ""%1 == "" goto runCommand
-set PARAMS=%PARAMS% %1
-shift
-goto loop
-
-:runCommand
-rem echo %ANT_RUN_CMD% %PARAMS%
-%ANT_RUN_CMD% %PARAMS%
-
diff --git a/tools/java_cup.jar b/tools/java_cup.jar
deleted file mode 100644
index 3e12262f..00000000
Binary files a/tools/java_cup.jar and /dev/null differ
diff --git a/xalan/.classpath b/xalan/.classpath
new file mode 100644
index 00000000..64a0cf9d
--- /dev/null
+++ b/xalan/.classpath
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="META-INF">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/xalan/.gitignore b/xalan/.gitignore
new file mode 100644
index 00000000..b83d2226
--- /dev/null
+++ b/xalan/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/xalan/.project b/xalan/.project
new file mode 100644
index 00000000..7bd125a8
--- /dev/null
+++ b/xalan/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>xalan</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/xalan/.settings/org.eclipse.core.resources.prefs b/xalan/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000..afad9066
--- /dev/null
+++ b/xalan/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
+encoding/src=UTF-8
diff --git a/xalan/.settings/org.eclipse.jdt.core.prefs b/xalan/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..2f5cc74c
--- /dev/null
+++ b/xalan/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/xalan/.settings/org.eclipse.m2e.core.prefs b/xalan/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000..f897a7f1
--- /dev/null
+++ b/xalan/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/xalan/pom.xml b/xalan/pom.xml
new file mode 100644
index 00000000..a47df1a4
--- /dev/null
+++ b/xalan/pom.xml
@@ -0,0 +1,225 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>xalan</groupId>
+    <artifactId>xalan-project</artifactId>
+    <version>2.7.3</version>
+  </parent>
+
+  <artifactId>xalan</artifactId>
+  <name>Apache Xalan-Java</name>
+  <description>Apache's XSLT processor</description>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <resources>
+      <resource>
+	<directory>META-INF</directory>
+	<includes>
+	  <include>LICENSE.txt</include>
+	  <include>NOTICE.txt</include>
+	</includes>
+      </resource>
+      <resource>
+	<directory>src/main/resources</directory>
+	<includes>
+	  <include>**/*.properties</include>
+	</includes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+	<artifactId>maven-compiler-plugin</artifactId>
+	<version>3.8.1</version>
+	<configuration>
+	  <source>1.8</source>
+	  <target>1.8</target>
+	</configuration>
+      </plugin>
+
+       <!-- https://github.com/vbmacher/cup-maven-plugin -->
+      <!-- NOTE: There is an XPathParser.java in both xalan/xsltc/compiler/ and
+               xpath/compiler/. THEY ARE NOT IDENTICAL. -->
+      <!-- Should .cup and .lex be in src/main/resources rather than
+	   src/main/java? -->
+      <plugin>
+        <groupId>com.github.vbmacher</groupId>
+        <artifactId>cup-maven-plugin</artifactId>
+        <version>11b-20160615-2</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <className>XPathParser</className>
+          <symbolsName>sym</symbolsName>
+          <cupDefinition>${project.basedir}/src/main/java/org/apache/xalan/xsltc/compiler/xpath.cup</cupDefinition>
+          <outputDirectory>${project.basedir}/src/main/java</outputDirectory>
+        </configuration>
+      </plugin>
+
+      <!-- https://jflex-de.github.io/jflex-web/jflex-maven-plugin/usage.html
+	   Must run after java_cup has produced the sym.java file
+	   sym.java + xpath.lex -> xpath.lex.java, moved to XPathLexer.java
+	   It Is Claimed that JFlex is a compatible replacement for JLex.
+      -->
+      <!-- https://mvnrepository.com/artifact/de.jflex/jflex -->
+      <plugin>
+        <groupId>de.jflex</groupId>
+        <artifactId>jflex-maven-plugin</artifactId>	
+	<version>1.9.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+	      <jlex>true</jlex> <!-- Strict jlex compatibility? -->
+              <outputDirectory>src/main/java</outputDirectory>
+              <lexDefinitions>
+                <lexDefinition>src/main/java/org/apache/xalan/xsltc/compiler/xpath.lex</lexDefinition>
+              </lexDefinitions>
+            </configuration>
+            </execution>
+        </executions>
+      </plugin>
+
+      <!--
+	  https://maven.apache.org/plugins/maven-shade-plugin/examples/includes-excludes.html -->
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-shade-plugin</artifactId>
+	<version>3.5.0</version>
+	<executions>
+	  <execution>
+	    <phase>package</phase>
+	    <goals>
+	      <goal>shade</goal>
+	    </goals>
+	    <configuration>
+	      <artifactSet>
+		<excludes>
+		  <!-- Their examples (testing) -->
+		  <exclude>junit:junit</exclude>
+		  <exclude>jmock:*</exclude>
+		  <exclude>org.apache.maven:lib:tests</exclude>
+		  <!-- What I think I need to exclude.
+		       Some are direct dependencies, some come in
+		       via maven packages. -->
+		  <exclude>com.github.vbmacher:java-cup</exclude>
+		  <exclude>commons-logging:commons-logging</exclude>
+		  <exclude>org.apache.commons:commons-lang3</exclude>
+		  <exclude>org.apache.ant:ant</exclude>
+		  <exclude>org.apache.ant:ant-launcher</exclude>
+		  <exclude>xalan:serializer</exclude>
+		  <exclude>de.jflex:jflex</exclude>	
+		</excludes>
+	      </artifactSet>
+	    </configuration>
+	  </execution>
+	</executions>
+      </plugin>
+
+    </plugins>
+  </build>
+
+
+  <dependencies>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>serializer</artifactId>
+      <version>2.7.3</version>
+    </dependency>
+
+    <!-- https://mvnrepository.com/artifact/org.apache.bcel/bcel -->
+    <dependency>
+      <groupId>org.apache.bcel</groupId>
+      <artifactId>bcel</artifactId>
+      <version>6.7.0</version>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/org.mozilla/rhino -->
+    <dependency>
+      <groupId>org.mozilla</groupId>
+      <artifactId>rhino</artifactId>
+      <version>1.7.14</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/org.apache.bsf/bsf-api -->
+    <dependency>
+      <groupId>org.apache.bsf</groupId>
+      <artifactId>bsf-api</artifactId>
+      <version>3.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/javax/javaee-api -->
+    <dependency>
+      <groupId>javax</groupId>
+      <artifactId>javaee-api</artifactId>
+      <version>6.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/javax.servlet/servlet-api -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version> <!-- jakata servlet is at 6.0 -->
+      <scope>provided</scope>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/xerces/xercesImpl -->
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/xml-apis/xml-apis -->
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.4.01</version>
+      <!-- We were actually using 1.4.02 in the Ant build. -->
+      <scope>provided</scope>
+    </dependency>
+
+
+    <!-- https://github.com/vbmacher/cup-maven-plugin -->
+    <dependency>
+      <groupId>com.github.vbmacher</groupId>
+      <artifactId>java-cup</artifactId>
+      <version>11b-20160615-2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.github.vbmacher</groupId>
+      <artifactId>java-cup-runtime</artifactId>
+      <version>11b-20160615-2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>de.jflex</groupId>
+      <artifactId>jflex</artifactId>
+      <version>1.9.1</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>regexp</groupId>
+      <artifactId>regexp</artifactId>
+      <version>1.3</version>
+    </dependency>
+  </dependencies>
+
+    <!-- Brazil is needed only for xsltc sample. -->
+</project>
diff --git a/xalan/src/main/java/MANIFEST.SERIALIZER b/xalan/src/main/java/MANIFEST.SERIALIZER
new file mode 100644
index 00000000..54be2912
--- /dev/null
+++ b/xalan/src/main/java/MANIFEST.SERIALIZER
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Created-By: @java.version@ (@java.vendor@)
+Main-Class: org.apache.xml.serializer.Version
+Class-Path: xml-apis.jar
+
+Name: org/apache/xml/serializer/
+Comment: Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input SAX events.
+Specification-Title: XSL Transformations (XSLT), at http://www.w3.org/TR/xslt
+Specification-Vendor: W3C Recommendation 16 November 1999
+Specification-Version: 1.0
+Implementation-Title: org.apache.xml.serializer
+Implementation-Version: @impl.version@
+Implementation-Vendor: Apache Software Foundation
+Implementation-URL: https://xalan.apache.org/xalan-j/usagepatterns.html
+
+Name: org/apache/xml/serializer/utils/
+Comment: Utilities used internally by the Serializer. Not for external use.
+Implementation-Title: org.apache.xml.serializer.utils
+Implementation-Version: @impl.version@
+Implementation-Vendor: Apache Software Foundation
diff --git a/serializer/src/main/resources/org/apache/xml/serializer/Version.src b/xalan/src/main/java/org/apache/xalan/Version.java
similarity index 87%
rename from serializer/src/main/resources/org/apache/xml/serializer/Version.src
rename to xalan/src/main/java/org/apache/xalan/Version.java
index deb26637..7b4a3953 100644
--- a/serializer/src/main/resources/org/apache/xml/serializer/Version.src
+++ b/xalan/src/main/java/org/apache/xalan/Version.java
@@ -18,23 +18,26 @@
 /*
  * $Id$
  */
-package org.apache.xml.serializer;
+package org.apache.xalan;
 
 /**
  * Administrative class to keep track of the version number of
- * the Serializer release.
+ * the Xalan release.
  * <P>This class implements the upcoming standard of having
  * org.apache.project-name.Version.getVersion() be a standard way 
- * to get version information.</P> 
+ * to get version information.  This class will replace the older 
+ * org.apache.xalan.processor.Version class.</P>
+ * <P>See also: org/apache/xalan/res/XSLTInfo.properties for 
+ * information about the version of the XSLT spec we support.</P>
  * @xsl.usage general
  */
-public final class Version
+public class Version
 {
 
   /**
-   * Get the basic version string for the current Serializer.
+   * Get the basic version string for the current Xalan release.
    * Version String formatted like 
-   * <CODE>"<B>Serializer</B> <B>Java</B> v.r[.dd| <B>D</B>nn]"</CODE>.
+   * <CODE>"<B>Xalan</B> <B>Java</B> v.r[.dd| <B>D</B>nn]"</CODE>.
    *
    * Futurework: have this read version info from jar manifest.
    *
@@ -59,11 +62,11 @@ public final class Version
   }
   
   /**
-   * Name of product: Serializer.
+   * Name of product: Xalan.
    */
   public static String getProduct()
   {
-    return "Serializer";
+    return "Xalan";
   }
 
   /**
@@ -88,7 +91,7 @@ public final class Version
    */
   public static int getMajorVersionNum()
   {
-    return @version.VERSION@;
+    return 2;
     
   }  
 
@@ -102,7 +105,7 @@ public final class Version
    */
   public static int getReleaseVersionNum()
   {
-    return @version.RELEASE@;
+    return 7;
   }
   
   /**
@@ -116,7 +119,7 @@ public final class Version
    */
   public static int getMaintenanceVersionNum()
   {
-    return @version.MINOR@;
+    return 3;
   }
 
   /**
@@ -139,10 +142,10 @@ public final class Version
   public static int getDevelopmentVersionNum()
   { 
     try {   
-        if ((new String("@version.DEVELOPER@")).length() == 0)
+        if ((new String("")).length() == 0)
           return 0;
         else  
-          return Integer.parseInt("@version.DEVELOPER@");
+          return Integer.parseInt("");
     } catch (NumberFormatException nfe) {
            return 0;
     }    
diff --git a/xalan/src/main/java/org/apache/xalan/lib/ExsltStrings.java b/xalan/src/main/java/org/apache/xalan/lib/ExsltStrings.java
index e5cad569..5285837d 100644
--- a/xalan/src/main/java/org/apache/xalan/lib/ExsltStrings.java
+++ b/xalan/src/main/java/org/apache/xalan/lib/ExsltStrings.java
@@ -184,9 +184,9 @@ public class ExsltStrings extends ExsltBase
    * <pre>
    * str:split('a, simple, list', ', ') gives the node set consisting of: 
    *
-   * <token>a</token>
-   * <token>simple</token>
-   * <token>list</token>
+   * &lt;tokent&gt;a&lt;/token&gt;
+   * &lt;tokent&gt;simple&lt;/token&gt;
+   * &lt;tokent&gt;list&lt;/token&gt;
    * </pre>
    * If the second argument is omitted, the default is the string '&#x20;' (i.e. a space).
    *
@@ -253,14 +253,14 @@ public class ExsltStrings extends ExsltBase
    * <pre>
    * str:tokenize('2001-06-03T11:40:23', '-T:') gives the node set consisting of: 
    *
-   * <token>2001</token>
-   * <token>06</token>
-   * <token>03</token>
-   * <token>11</token>
-   * <token>40</token>
-   * <token>23</token>
+   * &lt;tokent&gt;2001&lt;/token&gt;
+   * &lt;tokent&gt;06&lt;/token&gt;
+   * &lt;tokent&gt;03&lt;/token&gt;
+   * &lt;tokent&gt;11&lt;/token&gt;
+   * &lt;tokent&gt;40&lt;/token&gt;
+   * &lt;tokent&gt;23&lt;/token&gt;
    * </pre>
-   * If the second argument is omitted, the default is the string '&#x9;&#xA;&#xD;&#x20;' 
+   * If the second argument is omitted, the default is the string '&#x09;&#x0A;&#x0D;&#x20;' 
    * (i.e. whitespace characters). 
    * <p>
    * If the second argument is an empty string, the function returns a set of token 
diff --git a/xalan/src/main/java/org/apache/xalan/lib/Extensions.java b/xalan/src/main/java/org/apache/xalan/lib/Extensions.java
index 261f66ff..62b5c0d0 100644
--- a/xalan/src/main/java/org/apache/xalan/lib/Extensions.java
+++ b/xalan/src/main/java/org/apache/xalan/lib/Extensions.java
@@ -265,8 +265,8 @@ public class Extensions
 
   /**
    * Returns a NodeSet containing one text node for each token in the first argument.
-   * Delimiters are whitespace.  That is, the delimiters that are used are tab (&#x09),
-   * linefeed (&#x0A), return (&#x0D), and space (&#x20).
+   * Delimiters are whitespace.  That is, the delimiters that are used are tab (&amp;#x09),
+   * linefeed (&amp;#x0A), return (&amp;#x0D), and space (&amp;#x20).
    * Tokens are determined by a call to <code>StringTokenizer</code>.
    * If the first argument is an empty string or contains only delimiters, the result
    * will be an empty NodeSet.
diff --git a/xalan/src/main/java/org/apache/xalan/lib/PipeDocument.java b/xalan/src/main/java/org/apache/xalan/lib/PipeDocument.java
index c8b898ff..974ae17c 100644
--- a/xalan/src/main/java/org/apache/xalan/lib/PipeDocument.java
+++ b/xalan/src/main/java/org/apache/xalan/lib/PipeDocument.java
@@ -100,9 +100,9 @@ public class PipeDocument
  * Notes:</pre>
  * <ul>
  *   <li>The base URI for the source attribute is the XML "listing" document.<li/>
- *   <li>The target attribute is taken as is (base is the current user directory).<li/>
+ *   <li>The target attribute is taken as is (base is the current user directory).</li>
  *   <li>The stylsheet containg the extension element is the base URI for the
- *   stylesheet hrefs.<li/>
+ *   stylesheet hrefs.</li>
  * </ul>
  */
   public void pipeDocument(XSLProcessorContext context, ElemExtensionCall elem)
diff --git a/xalan/src/main/java/org/apache/xalan/lib/Redirect.java b/xalan/src/main/java/org/apache/xalan/lib/Redirect.java
index 090df7dc..6208ea46 100644
--- a/xalan/src/main/java/org/apache/xalan/lib/Redirect.java
+++ b/xalan/src/main/java/org/apache/xalan/lib/Redirect.java
@@ -77,44 +77,44 @@ import org.xml.sax.ContentHandler;
  *
  * <p>Example:</p>
  * <PRE>
- * &lt;?xml version="1.0"?>
+ * &lt;?xml version="1.0"?&gt;
  * &lt;xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
  *                 version="1.0"
  *                 xmlns:redirect="http://xml.apache.org/xalan/redirect"
- *                 extension-element-prefixes="redirect">
+ *                 extension-element-prefixes="redirect"&gt;
  *
- *   &lt;xsl:template match="/">
- *     &lt;out>
+ *   &lt;xsl:template match="/"&gt;
+ *     &lt;out&gt;
  *       default output.
- *     &lt;/out>
- *     &lt;redirect:open file="doc3.out"/>
- *     &lt;redirect:write file="doc3.out">
- *       &lt;out>
- *         &lt;redirect:write file="doc1.out">
- *           &lt;out>
+ *     &lt;/out&gt;
+ *     &lt;redirect:open file="doc3.out"/&gt;
+ *     &lt;redirect:write file="doc3.out"&gt;
+ *       &lt;out&gt;
+ *         &lt;redirect:write file="doc1.out"&gt;
+ *           &lt;out&gt;
  *             doc1 output.
- *             &lt;redirect:write file="doc3.out">
+ *             &lt;redirect:write file="doc3.out"&gt;
  *               Some text to doc3
- *             &lt;/redirect:write>
- *           &lt;/out>
- *         &lt;/redirect:write>
- *         &lt;redirect:write file="doc2.out">
- *           &lt;out>
+ *             &lt;/redirect:write&gt;
+ *           &lt;/out&gt;
+ *         &lt;/redirect:write&gt;
+ *         &lt;redirect:write file="doc2.out"&gt;
+ *           &lt;out&gt;
  *             doc2 output.
- *             &lt;redirect:write file="doc3.out">
+ *             &lt;redirect:write file="doc3.out"&gt;
  *               Some more text to doc3
- *               &lt;redirect:write select="doc/foo">
+ *               &lt;redirect:write select="doc/foo"&gt;
  *                 text for doc4
- *               &lt;/redirect:write>
- *             &lt;/redirect:write>
- *           &lt;/out>
- *         &lt;/redirect:write>
- *       &lt;/out>
- *     &lt;/redirect:write>
- *     &lt;redirect:close file="doc3.out"/>
- *   &lt;/xsl:template>
+ *               &lt;/redirect:write&gt;
+ *             &lt;/redirect:write&gt;
+ *           &lt;/out&gt;
+ *         &lt;/redirect:write&gt;
+ *       &lt;/out&gt;
+ *     &lt;/redirect:write&gt;
+ *     &lt;redirect:close file="doc3.out"/&gt;
+ *   &lt;/xsl:template&gt;
  *
- * &lt;/xsl:stylesheet>
+ * &lt;/xsl:stylesheet&gt;
  * </PRE>
  *
  * @author Scott Boag
diff --git a/xalan/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java
index b40abccc..00ee976d 100644
--- a/xalan/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java
@@ -115,9 +115,14 @@ public class ProcessorExsltFunction extends ProcessorTemplateElem
   }
   
   /**
-   * Non-recursive traversal of FunctionElement tree based on TreeWalker to verify that
-   * there are no literal result elements except within a func:result element and that
-   * the func:result element does not contain any following siblings except xsl:fallback.
+   * Non-recursive traversal of FunctionElement tree based on
+   * TreeWalker to verify that there are no literal result elements
+   * except within a func:result element and that the func:result
+   * element does not contain any following siblings except
+   * xsl:fallback.
+   * @param elem FunctionElement node to be examined
+   * @param handler StylesheetHandler to be called against each node in turn
+   * @throws SAXException if handler throws one
    */
   public void validate(ElemTemplateElement elem, StylesheetHandler handler)
     throws SAXException
diff --git a/xalan/src/main/java/org/apache/xalan/processor/ProcessorKey.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorKey.java
index 602649c7..e58087ea 100644
--- a/xalan/src/main/java/org/apache/xalan/processor/ProcessorKey.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorKey.java
@@ -31,12 +31,12 @@ import org.xml.sax.Attributes;
 /**
  * TransformerFactory for xsl:key markup.
  * <pre>
- * <!ELEMENT xsl:key EMPTY>
- * <!ATTLIST xsl:key
+ * &lt;!ELEMENT xsl:key EMPTY&gt;
+ * &lt;!ATTLIST xsl:key
  *   name %qname; #REQUIRED
  *   match %pattern; #REQUIRED
  *   use %expr; #REQUIRED
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#dtd">XSLT DTD</a>
  * @see <a href="http://www.w3.org/TR/xslt#key">key in XSLT Specification</a>
diff --git a/xalan/src/main/java/org/apache/xalan/processor/ProcessorLRE.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
index 464a6b89..14669826 100644
--- a/xalan/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
@@ -315,6 +315,7 @@ public class ProcessorLRE extends ProcessorTemplateElem
    * This method could be over-ridden by a class that extends this class.
    * @param handler non-null reference to current StylesheetHandler that is constructing the Templates.
    * @return an object that represents the stylesheet element.
+   * @throws TransformerConfigurationException if the handler throws one
    */
   protected Stylesheet getStylesheetRoot(StylesheetHandler handler) throws TransformerConfigurationException
   {
diff --git a/xalan/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
index 336e1e09..74bacdb6 100644
--- a/xalan/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
@@ -29,11 +29,11 @@ import org.xml.sax.Attributes;
  * A stylesheet can use the xsl:namespace-alias element to
  * declare that one namespace URI is an alias for another namespace URI.
  * <pre>
- * <!ELEMENT xsl:namespace-alias EMPTY>
- * <!ATTLIST xsl:namespace-alias
+ * &lt;!ELEMENT xsl:namespace-alias EMPTY&gt;
+ * &lt;!ATTLIST xsl:namespace-alias
  *   stylesheet-prefix CDATA #REQUIRED
  *   result-prefix CDATA #REQUIRED
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#dtd">XSLT DTD</a>
  * @see <a href="http://www.w3.org/TR/xslt#literal-result-element">literal-result-element in XSLT Specification</a>
diff --git a/xalan/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java
index 9154cf82..5823c858 100644
--- a/xalan/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java
@@ -31,8 +31,8 @@ import org.xml.sax.Attributes;
 /**
  * TransformerFactory for xsl:preserve-space markup.
  * <pre>
- * <!ELEMENT xsl:preserve-space EMPTY>
- * <!ATTLIST xsl:preserve-space elements CDATA #REQUIRED>
+ * &lt;!ELEMENT xsl:preserve-space EMPTY&gt;
+ * &lt;!ATTLIST xsl:preserve-space elements CDATA #REQUIRED&gt;
  * </pre>
  */
 class ProcessorPreserveSpace extends XSLTElementProcessor
diff --git a/xalan/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
index 9f77bef2..ce661c8f 100644
--- a/xalan/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
@@ -31,8 +31,8 @@ import org.xml.sax.Attributes;
 /**
  * TransformerFactory for xsl:strip-space markup.
  * <pre>
- * <!ELEMENT xsl:strip-space EMPTY>
- * <!ATTLIST xsl:strip-space elements CDATA #REQUIRED>
+ * &lt;!ELEMENT xsl:strip-space EMPTY&gt;
+ * &lt;!ATTLIST xsl:strip-space elements CDATA #REQUIRED&gt;
  * </pre>
  */
 class ProcessorStripSpace extends ProcessorPreserveSpace
diff --git a/xalan/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java
index 8d5159d9..f647bfa9 100644
--- a/xalan/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java
@@ -116,6 +116,7 @@ public class ProcessorStylesheetElement extends XSLTElementProcessor
   /**
    * This method can be over-ridden by a class that extends this one.
    * @param handler The calling StylesheetHandler/TemplatesBuilder.
+   * @return the root element of the new stylesheet
    */
   protected Stylesheet getStylesheetRoot(StylesheetHandler handler) throws TransformerConfigurationException
   {
diff --git a/xalan/src/main/java/org/apache/xalan/processor/StylesheetHandler.java b/xalan/src/main/java/org/apache/xalan/processor/StylesheetHandler.java
index e8b04382..421ecbaf 100644
--- a/xalan/src/main/java/org/apache/xalan/processor/StylesheetHandler.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/StylesheetHandler.java
@@ -139,6 +139,7 @@ public class StylesheetHandler extends DefaultHandler
    * Must be public for access by the AVT class.
    *
    * @param str A non-null reference to a valid or invalid XPath expression string.
+   * @param owningTemplate Template element from which this is applied
    *
    * @return A non-null reference to an XPath object that represents the string argument.
    *
@@ -563,7 +564,7 @@ public class StylesheetHandler extends DefaultHandler
    * @param rawName The qualified name (with prefix).
    * @param attributes The specified or defaulted attributes.
    *
-   * @throws org.xml.sax.SAXException
+   * @throws org.xml.sax.SAXException if the event could not be processed
    */
   public void startElement(
           String uri, String localName, String rawName, Attributes attributes)
diff --git a/xalan/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java b/xalan/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
index 3a7c78cd..022197be 100644
--- a/xalan/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
@@ -241,7 +241,7 @@ public class TransformerFactoryImpl extends SAXTransformerFactory
    *
    * @return A Source object capable of being used to create a Templates object.
    *
-   * @throws TransformerConfigurationException
+   * @throws TransformerConfigurationException wrapper if there is an underlying exception.
    */
   public Source getAssociatedStylesheet(
           Source source, String media, String title, String charset)
@@ -608,7 +608,7 @@ public class TransformerFactoryImpl extends SAXTransformerFactory
    *
    * @return An XMLFilter object, or null if this feature is not supported.
    *
-   * @throws TransformerConfigurationException
+   * @throws TransformerConfigurationException wrapper if one is thrown by underlying code
    */
   public XMLFilter newXMLFilter(Source src)
           throws TransformerConfigurationException
@@ -628,7 +628,7 @@ public class TransformerFactoryImpl extends SAXTransformerFactory
    *
    * @return An XMLFilter object, or null if this feature is not supported.
    *
-   * @throws TransformerConfigurationException
+   * @throws TransformerConfigurationException wrapper if TrAXFilter construction failed
    */
   public XMLFilter newXMLFilter(Templates templates)
           throws TransformerConfigurationException
@@ -668,7 +668,7 @@ public class TransformerFactoryImpl extends SAXTransformerFactory
    *
    * @return TransformerHandler ready to transform SAX events.
    *
-   * @throws TransformerConfigurationException
+   * @throws TransformerConfigurationException if handler could not be created.
    */
   public TransformerHandler newTransformerHandler(Source src)
           throws TransformerConfigurationException
@@ -742,7 +742,7 @@ public class TransformerFactoryImpl extends SAXTransformerFactory
    *
    * @return TransformerHandler ready to transform SAX events.
    *
-   * @throws TransformerConfigurationException
+   * @throws TransformerConfigurationException if handler could not be created
    */
   public TransformerHandler newTransformerHandler()
           throws TransformerConfigurationException
diff --git a/xalan/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java b/xalan/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
index 553832d1..367dbcb4 100644
--- a/xalan/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
@@ -86,6 +86,7 @@ public class XSLTElementProcessor extends ElemTemplateElement
    *                 document.
    * @return The new input source, or null to require the
    *         default behaviour.
+   * @throws org.xml.sax.SAXException if StylesheetHandler throws an error.
    */
   public InputSource resolveEntity(
           StylesheetHandler handler, String publicId, String systemId)
@@ -137,6 +138,7 @@ public class XSLTElementProcessor extends ElemTemplateElement
    * is sent to the current processor when any non-text event occurs.
    *
    * @param handler non-null reference to current StylesheetHandler that is constructing the Templates.
+   * @throws org.xml.sax.SAXException if StylesheetHandler throws an error.
    */
   public void startNonText(StylesheetHandler handler) throws org.xml.sax.SAXException
   {
@@ -152,6 +154,7 @@ public class XSLTElementProcessor extends ElemTemplateElement
    * @param localName The local name (without prefix), or empty string if not namespace processing.
    * @param rawName The qualified name (with prefix).
    * @param attributes The specified or defaulted attributes.
+   * @throws org.xml.sax.SAXException if StylesheetHandler throws an error.
    */
   public void startElement(
           StylesheetHandler handler, String uri, String localName, String rawName, Attributes attributes)
@@ -171,6 +174,7 @@ public class XSLTElementProcessor extends ElemTemplateElement
    * @param uri The Namespace URI, or an empty string.
    * @param localName The local name (without prefix), or empty string if not namespace processing.
    * @param rawName The qualified name (with prefix).
+   * @throws org.xml.sax.SAXException if StylesheetHandler throws an error.
    */
   public void endElement(
           StylesheetHandler handler, String uri, String localName, String rawName)
@@ -192,6 +196,7 @@ public class XSLTElementProcessor extends ElemTemplateElement
    * @param start The start position in the character array.
    * @param length The number of characters to use from the
    *               character array.
+   * @throws org.xml.sax.SAXException if StylesheetHandler throws an error.
    */
   public void characters(
           StylesheetHandler handler, char ch[], int start, int length)
@@ -210,6 +215,7 @@ public class XSLTElementProcessor extends ElemTemplateElement
    * @param start The start position in the character array.
    * @param length The number of characters to use from the
    *               character array.
+   * @throws org.xml.sax.SAXException if StylesheetHandler throws an error.
    */
   public void ignorableWhitespace(
           StylesheetHandler handler, char ch[], int start, int length)
@@ -227,12 +233,12 @@ public class XSLTElementProcessor extends ElemTemplateElement
    * @param target The processing instruction target.
    * @param data The processing instruction data, or null if
    *             none is supplied.
+   * @throws org.xml.sax.SAXException if StylesheetHandler throws an error.
    */
   public void processingInstruction(
           StylesheetHandler handler, String target, String data)
             throws org.xml.sax.SAXException
   {
-
     // no op
   }
 
@@ -242,11 +248,11 @@ public class XSLTElementProcessor extends ElemTemplateElement
    *
    * @param handler non-null reference to current StylesheetHandler that is constructing the Templates.
    * @param name The name of the skipped entity.
+   * @throws org.xml.sax.SAXException never
    */
   public void skippedEntity(StylesheetHandler handler, String name)
           throws org.xml.sax.SAXException
   {
-
     // no op
   }
 
@@ -258,6 +264,7 @@ public class XSLTElementProcessor extends ElemTemplateElement
    *                error reporting.
    * @param attributes The list of attributes.
    * @param target The target element where the properties will be set.
+   * @throws org.xml.sax.SAXException if StylesheetHandler throws an error.
    */
   void setPropertiesFromAttributes(
           StylesheetHandler handler, String rawName, Attributes attributes, 
@@ -279,7 +286,7 @@ public class XSLTElementProcessor extends ElemTemplateElement
    * attribute is not defined.
    * @return the attributes not allowed on this element.
    *
-   * @throws TransformerException
+   * @throws org.xml.sax.SAXException if StylesheetHandler throws an error.
    */
   Attributes setPropertiesFromAttributes(
           StylesheetHandler handler, String rawName, Attributes attributes, 
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources.java
index e71f2b1a..84dfc167 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources.java
@@ -1450,7 +1450,7 @@ public class XSLTErrorResources extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ca.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ca.java
index 6cf2211f..eff09ad9 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ca.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ca.java
@@ -1468,7 +1468,7 @@ public class XSLTErrorResources_ca extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_cs.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_cs.java
index 98c77a65..f0d240e7 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_cs.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_cs.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_cs extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_de.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_de.java
index 6d25e79d..c8d6c9cb 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_de.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_de.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_de extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_es.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_es.java
index 77b58728..b44f920a 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_es.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_es.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_es extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_fr.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_fr.java
index 1ab47a9b..5beb9f18 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_fr.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_fr.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_fr extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_hu.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_hu.java
index 628bd07b..3ff9e1b9 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_hu.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_hu.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_hu extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_it.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_it.java
index 8a9048c2..6c71248f 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_it.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_it.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_it extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ja.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ja.java
index 3b557584..95b8f824 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ja.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ja.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_ja extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ko.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ko.java
index d31922c9..887f0315 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ko.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ko.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_ko extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pl.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pl.java
index 3161b723..779a9271 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pl.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pl.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_pl extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pt_BR.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pt_BR.java
index e6a37188..1f591794 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pt_BR.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pt_BR.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_pt_BR extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ru.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ru.java
index de027de2..19520133 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ru.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ru.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_ru extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sk.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sk.java
index 6133f3a4..44760889 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sk.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sk.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_sk extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sl.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sl.java
index 74fac024..0c03fda0 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sl.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sl.java
@@ -1456,7 +1456,7 @@ public class XSLTErrorResources_sl extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_tr.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_tr.java
index 6cd831fe..25b58199 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_tr.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_tr.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_tr extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh.java
index 0d2c80bc..eec15708 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_zh extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh_TW.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh_TW.java
index 71aff268..0e3ad7da 100644
--- a/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh_TW.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh_TW.java
@@ -1469,7 +1469,7 @@ public class XSLTErrorResources_zh_TW extends ListResourceBundle
    *
    *   @param className the name of the class that implements the resource bundle.
    *   @return the ResourceBundle
-   *   @throws MissingResourceException
+   *   @throws MissingResourceException if the requested resources can not be loaded
    */
   public static final XSLTErrorResources loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xalan/serialize/SerializerFactory.java b/xalan/src/main/java/org/apache/xalan/serialize/SerializerFactory.java
index 0c7741c7..b2d22d1c 100644
--- a/xalan/src/main/java/org/apache/xalan/serialize/SerializerFactory.java
+++ b/xalan/src/main/java/org/apache/xalan/serialize/SerializerFactory.java
@@ -49,7 +49,7 @@ public abstract class SerializerFactory
      * @return A suitable serializer, or null
      * @throws IllegalArgumentException (apparently -sc) if method is
      * null or an appropriate serializer can't be found
-     * @throws WrappedRuntimeException (apparently -sc) if an
+     * @throws org.apache.xml.utils.WrappedRuntimeException (apparently -sc) if an
      * exception is thrown while trying to find serializer
      * @deprecated Use org.apache.xml.serializer.SerializerFactory
      */
diff --git a/xalan/src/main/java/org/apache/xalan/serialize/SerializerUtils.java b/xalan/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
index 487f6241..fdb9a788 100644
--- a/xalan/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
+++ b/xalan/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
@@ -46,10 +46,10 @@ public class SerializerUtils
      * attribute templates as need be, and processing the xsl:use
      * attribute.
      *
-     * @param handler SerializationHandler to which the attributes are added.
+     * @param handler SerializationHandler to which the attributes are written
      * @param attr Attribute node to add to SerializationHandler.
      *
-     * @throws TransformerException
+     * @throws TransformerException if handler objects
      */
     public static void addAttribute(SerializationHandler handler, int attr)
         throws TransformerException
@@ -86,9 +86,10 @@ public class SerializerUtils
     /**
      * Copy DOM attributes to the result element.
      *
+     * @param handler SerializationHandler to which the attributes are written
      * @param src Source node with the attributes
      *
-     * @throws TransformerException
+     * @throws TransformerException if handler objects
      */
     public static void addAttributes(SerializationHandler handler, int src)
         throws TransformerException
@@ -110,10 +111,11 @@ public class SerializerUtils
      * Given a result tree fragment, walk the tree and
      * output it to the SerializationHandler.
      *
+     * @param handler SerializationHandler to which the attributes are written
      * @param obj Result tree fragment object
      * @param support XPath context for the result tree fragment
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException if handler objects
      */
     public static void outputResultTreeFragment(
         SerializationHandler handler,
@@ -144,16 +146,17 @@ public class SerializerUtils
     }
 
     /**
-     * Copy <KBD>xmlns:</KBD> attributes in if not already in scope.
+     * Copy <code>xmlns:</code> attributes in if not already in scope.
      *
      * As a quick hack to support ClonerToResultTree, this can also be used
      * to copy an individual namespace node.
      *
-     * @param src Source Node
-     * NEEDSDOC @param type
-     * NEEDSDOC @param dtm
+     * @param handler SerializationHandler to which the attributes are written
+     * @param src int Source Node index in DTM
+     * @param type int Source Node type in DTM
+     * @param dtm Document Table Model containing the source node
      *
-     * @throws TransformerException
+     * @throws TransformerException if handler objects
      */
     public static void processNSDecls(
         SerializationHandler handler,
@@ -206,7 +209,7 @@ public class SerializerUtils
     /**
      * Returns whether a namespace is defined
      *
-     *
+     * @param serializer SerializationHandler to which the attributes are written
      * @param attr Namespace attribute node
      * @param dtm The DTM that owns attr.
      *
@@ -240,10 +243,11 @@ public class SerializerUtils
      * If it's not, it still needs to be declared at this point.
      * TODO: This needs to be done at an earlier stage in the game... -sb
      *
-     * NEEDSDOC @param dtm
-     * NEEDSDOC @param namespace
+     * @param handler SerializationHandler to which the attributes are written
+     * @param dtm Document Table Model containing the source node
+     * @param namespace DTM index number representing namespace of this node
      *
-     * @throws org.xml.sax.SAXException
+     * @throws org.xml.sax.SAXException if handler objects
      */
     public static void ensureNamespaceDeclDeclared(
         SerializationHandler handler,
diff --git a/xalan/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java b/xalan/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java
index 4b4a6d51..db259280 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java
@@ -27,8 +27,8 @@ import org.apache.xml.utils.QName;
 /**
  * Implement xsl:decimal-format.
  * <pre>
- * <!ELEMENT xsl:decimal-format EMPTY>
- * <!ATTLIST xsl:decimal-format
+ * &lt;!ELEMENT xsl:decimal-format EMPTY&gt;
+ * &lt;!ATTLIST xsl:decimal-format
  *   name %qname; #IMPLIED
  *   decimal-separator %char; "."
  *   grouping-separator %char; ","
@@ -36,11 +36,11 @@ import org.apache.xml.utils.QName;
  *   minus-sign %char; "-"
  *   NaN CDATA "NaN"
  *   percent %char; "%"
- *   per-mille %char; "&#x2030;"
+ *   per-mille %char; "&amp;#x2030;"
  *   zero-digit %char; "0"
  *   digit %char; "#"
  *   pattern-separator %char; ";"
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#format-number">format-number in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemApplyImport.java b/xalan/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
index c6f25b07..67437f22 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
@@ -29,7 +29,7 @@ import org.apache.xml.dtm.DTM;
 /**
  * Implement xsl:apply-imports.
  * <pre>
- * <!ELEMENT xsl:apply-imports EMPTY>
+ * &lt;!ELEMENT xsl:apply-imports EMPTY&gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#apply-imports">apply-imports in XSLT Specification</a>
  * @xsl.usage advanced
@@ -98,7 +98,7 @@ public class ElemApplyImport extends ElemTemplateElement
 
   /**
    * Add a child to the child list.
-   * <!ELEMENT xsl:apply-imports EMPTY>
+   * &lt;!ELEMENT xsl:apply-imports EMPTY&gt;
    *
    * @param newChild New element to append to this element's children list
    *
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemAttribute.java b/xalan/src/main/java/org/apache/xalan/templates/ElemAttribute.java
index 924f4406..62ce571c 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemAttribute.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemAttribute.java
@@ -206,12 +206,12 @@ public class ElemAttribute extends ElemElement
 
   /**
    * Add a child to the child list.
-   * <!ELEMENT xsl:attribute %char-template;>
-   * <!ATTLIST xsl:attribute
+   * &lt;!ELEMENT xsl:attribute %char-template;&gt;
+   * &lt;!ATTLIST xsl:attribute
    *   name %avt; #REQUIRED
    *   namespace %avt; #IMPLIED
    *   %space-att;
-   * >
+   * &gt;
    *
    * @param newChild Child to append to the list of this node's children
    *
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java b/xalan/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
index a27f1edd..4cb3edb7 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
@@ -136,11 +136,11 @@ public class ElemAttributeSet extends ElemUse
 
   /**
    * Add a child to the child list.
-   * <!ELEMENT xsl:attribute-set (xsl:attribute)*>
-   * <!ATTLIST xsl:attribute-set
+   * &lt;!ELEMENT xsl:attribute-set (xsl:attribute)*&gt;
+   * &lt;!ATTLIST xsl:attribute-set
    *   name %qname; #REQUIRED
    *   use-attribute-sets %qnames; #IMPLIED
-   * >
+   * &gt;
    *
    * @param newChild Child to be added to this node's list of children
    *
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java b/xalan/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
index 8c06b6b4..be7f7ea9 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
@@ -325,11 +325,11 @@ public class ElemCallTemplate extends ElemForEach
 
   /**
    * Add a child to the child list.
-   * <!ELEMENT xsl:apply-templates (xsl:sort|xsl:with-param)*>
-   * <!ATTLIST xsl:apply-templates
+   * &lt;!ELEMENT xsl:apply-templates (xsl:sort|xsl:with-param)*&gt;
+   * &lt;!ATTLIST xsl:apply-templates
    *   select %expr; "node()"
    *   mode %qname; #IMPLIED
-   * >
+   * &gt;
    *
    * @param newChild Child to add to this node's children list
    *
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemChoose.java b/xalan/src/main/java/org/apache/xalan/templates/ElemChoose.java
index d243c94b..8a803fb0 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemChoose.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemChoose.java
@@ -30,8 +30,8 @@ import org.apache.xpath.objects.XObject;
 /**
  * Implement xsl:choose.
  * <pre>
- * <!ELEMENT xsl:choose (xsl:when+, xsl:otherwise?)>
- * <!ATTLIST xsl:choose %space-att;>
+ * &lt;!ELEMENT xsl:choose (xsl:when+, xsl:otherwise?)&gt;
+ * &lt;!ATTLIST xsl:choose %space-att;&gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#section-Conditional-Processing-with-xsl:choose">XXX in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemComment.java b/xalan/src/main/java/org/apache/xalan/templates/ElemComment.java
index 73790ca2..6abf5714 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemComment.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemComment.java
@@ -28,8 +28,8 @@ import org.apache.xalan.transformer.TransformerImpl;
 /**
  * Implement xsl:comment.
  * <pre>
- * <!ELEMENT xsl:comment %char-template;>
- * <!ATTLIST xsl:comment %space-att;>
+ * &lt;!ELEMENT xsl:comment %char-template;&gt;
+ * &lt;!ATTLIST xsl:comment %space-att;&gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#section-Creating-Comments">section-Creating-Comments in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemCopy.java b/xalan/src/main/java/org/apache/xalan/templates/ElemCopy.java
index b0ba6325..60f0e634 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemCopy.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemCopy.java
@@ -32,11 +32,11 @@ import org.apache.xpath.XPathContext;
 /**
  * Implement xsl:copy.
  * <pre>
- * <!ELEMENT xsl:copy %template;>
- * <!ATTLIST xsl:copy
+ * &lt;!ELEMENT xsl:copy %template;&gt;
+ * &lt;!ATTLIST xsl:copy
  *   %space-att;
  *   use-attribute-sets %qnames; #IMPLIED
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#copying">copying in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemCopyOf.java b/xalan/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
index 5fadba64..c776ee53 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
@@ -37,8 +37,8 @@ import org.apache.xpath.objects.XObject;
 /**
  * Implement xsl:copy-of.
  * <pre>
- * <!ELEMENT xsl:copy-of EMPTY>
- * <!ATTLIST xsl:copy-of select %expr; #REQUIRED>
+ * &lt;!ELEMENT xsl:copy-of EMPTY&gt;
+ * &lt;!ATTLIST xsl:copy-of select %expr; #REQUIRED&gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#copy-of">copy-of in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemElement.java b/xalan/src/main/java/org/apache/xalan/templates/ElemElement.java
index 3ebbc4f8..0da2bacb 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemElement.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemElement.java
@@ -33,13 +33,13 @@ import org.xml.sax.SAXException;
 /**
  * Implement xsl:element
  * <pre>
- * <!ELEMENT xsl:element %template;>
- * <!ATTLIST xsl:element
+ * &lt;!ELEMENT xsl:element %template;&gt;
+ * &lt;!ATTLIST xsl:element
  *   name %avt; #REQUIRED
  *   namespace %avt; #IMPLIED
  *   use-attribute-sets %qnames; #IMPLIED
  *   %space-att;
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#section-Creating-Elements-with-xsl:element">XXX in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemFallback.java b/xalan/src/main/java/org/apache/xalan/templates/ElemFallback.java
index a6a48a90..d58b42e2 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemFallback.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemFallback.java
@@ -27,8 +27,8 @@ import org.apache.xalan.transformer.TransformerImpl;
 /**
  * Implement xsl:fallback.
  * <pre>
- * <!ELEMENT xsl:fallback %template;>
- * <!ATTLIST xsl:fallback %space-att;>
+ * &lt;!ELEMENT xsl:fallback %template;&gt;
+ * &lt;!ATTLIST xsl:fallback %space-att;&gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#fallback">fallback in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemForEach.java b/xalan/src/main/java/org/apache/xalan/templates/ElemForEach.java
index 7f4123a6..c4a90143 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemForEach.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemForEach.java
@@ -41,17 +41,17 @@ import java.io.IOException;
 /**
  * Implement xsl:for-each.
  * <pre>
- * <!ELEMENT xsl:for-each
+ * &lt;!ELEMENT xsl:for-each
  *  (#PCDATA
  *   %instructions;
  *   %result-elements;
  *   | xsl:sort)
- * >
+ * &gt;
  *
- * <!ATTLIST xsl:for-each
+ * &lt;!ATTLIST xsl:for-each
  *   select %expr; #REQUIRED
  *   %space-att;
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#for-each">for-each in XSLT Specification</a>
  * @xsl.usage advanced
@@ -475,11 +475,11 @@ public class ElemForEach extends ElemTemplateElement implements ExpressionOwner
 
   /**
    * Add a child to the child list.
-   * <!ELEMENT xsl:apply-templates (xsl:sort|xsl:with-param)*>
-   * <!ATTLIST xsl:apply-templates
+   * &lt;!ELEMENT xsl:apply-templates (xsl:sort|xsl:with-param)*&gt;
+   * &lt;!ATTLIST xsl:apply-templates
    *   select %expr; "node()"
    *   mode %qname; #IMPLIED
-   * >
+   * &gt;
    *
    * @param newChild Child to add to child list
    *
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemIf.java b/xalan/src/main/java/org/apache/xalan/templates/ElemIf.java
index e4f1ae05..3b1e5960 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemIf.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemIf.java
@@ -30,11 +30,11 @@ import org.apache.xpath.objects.XObject;
 /**
  * Implement xsl:if.
  * <pre>
- * <!ELEMENT xsl:if %template;>
- * <!ATTLIST xsl:if
+ * &lt;!ELEMENT xsl:if %template;&gt;
+ * &lt;!ATTLIST xsl:if
  *   test %expr; #REQUIRED
  *   %space-att;
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#section-Conditional-Processing-with-xsl:if">XXX in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemMessage.java b/xalan/src/main/java/org/apache/xalan/templates/ElemMessage.java
index 8d702d70..cc0eb254 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemMessage.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemMessage.java
@@ -29,11 +29,11 @@ import org.apache.xalan.transformer.TransformerImpl;
 /**
  * Implement xsl:message.
  * <pre>
- * <!ELEMENT xsl:message %template;>
- * <!ATTLIST xsl:message
+ * &lt;!ELEMENT xsl:message %template;&gt;
+ * &lt;!ATTLIST xsl:message
  *   %space-att;
  *   terminate (yes|no) "no"
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#message">message in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java b/xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java
index d65c5a54..eaa2b722 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java
@@ -56,8 +56,8 @@ import org.xml.sax.SAXException;
 /**
  * Implement xsl:number.
  * <pre>
- * <!ELEMENT xsl:number EMPTY>
- * <!ATTLIST xsl:number
+ * &lt;!ELEMENT xsl:number EMPTY&gt;
+ * &lt;!ATTLIST xsl:number
  *    level (single|multiple|any) "single"
  *    count %pattern; #IMPLIED
  *    from %pattern; #IMPLIED
@@ -67,7 +67,7 @@ import org.xml.sax.SAXException;
  *    letter-value %avt; #IMPLIED
  *    grouping-separator %avt; #IMPLIED
  *    grouping-size %avt; #IMPLIED
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#number">number in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemOtherwise.java b/xalan/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
index f8fffd84..66ff9989 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
@@ -24,8 +24,8 @@ package org.apache.xalan.templates;
 /**
  * Implement xsl:otherwise.
  * <pre>
- * <!ELEMENT xsl:otherwise %template;>
- * <!ATTLIST xsl:otherwise %space-att;>
+ * &lt;! xsl:otherwise %template;&gt;
+ * &lt;!ATTLIST xsl:otherwise %space-att;&gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#section-Conditional-Processing-with-xsl:choose">XXX in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemPI.java b/xalan/src/main/java/org/apache/xalan/templates/ElemPI.java
index 56f95c63..bd8bc466 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemPI.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemPI.java
@@ -30,11 +30,11 @@ import org.apache.xpath.XPathContext;
 /**
  * Implement xsl:processing-instruction.
  * <pre>
- * <!ELEMENT xsl:processing-instruction %char-template;>
- * <!ATTLIST xsl:processing-instruction
+ * &lt;!ELEMENT xsl:processing-instruction %char-template;&gt;
+ * &lt;!ATTLIST xsl:processing-instruction
  *   name %avt; #REQUIRED
  *   %space-att;
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#section-Creating-Processing-Instructions">section-Creating-Processing-Instructions in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemParam.java b/xalan/src/main/java/org/apache/xalan/templates/ElemParam.java
index c0a4038e..9a271375 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemParam.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemParam.java
@@ -29,11 +29,11 @@ import org.apache.xpath.objects.XObject;
 /**
  * Implement xsl:param.
  * <pre>
- * <!ELEMENT xsl:param %template;>
- * <!ATTLIST xsl:param
+ * &lt;! xsl:param %template;&gt;
+ * &lt;!ATTLIST xsl:param
  *   name %qname; #REQUIRED
  *   select %expr; #IMPLIED
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#variables">variables in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemSort.java b/xalan/src/main/java/org/apache/xalan/templates/ElemSort.java
index 93da544e..1cc91a9c 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemSort.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemSort.java
@@ -29,16 +29,16 @@ import org.w3c.dom.Node;
 /**
  * Implement xsl:sort.
  * <pre>
- * <!ELEMENT xsl:sort EMPTY>
- * <!ATTLIST xsl:sort
+ * &lt;!ELEMENT xsl:sort EMPTY&gt;
+ * &lt;!ATTLIST xsl:sort
  *   select %expr; "."
  *   lang %avt; #IMPLIED
  *   data-type %avt; "text"
  *   order %avt; "ascending"
  *   case-order %avt; #IMPLIED
- * >
- * <!-- xsl:sort cannot occur after any other elements or
- * any non-whitespace character -->
+ * &gt;
+ * &lt;!-- xsl:sort cannot occur after any other elements or
+ * any non-whitespace character --&gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#sorting">sorting in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemTemplate.java b/xalan/src/main/java/org/apache/xalan/templates/ElemTemplate.java
index 5add0aa3..5858372c 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemTemplate.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemTemplate.java
@@ -31,20 +31,20 @@ import org.apache.xpath.XPathContext;
 /**
  * Implement xsl:template.
  * <pre>
- * <!ELEMENT xsl:template
+ * &lt;!ELEMENT xsl:template
  *  (#PCDATA
  *   %instructions;
  *   %result-elements;
  *   | xsl:param)
- * >
+ * &gt;
  *
- * <!ATTLIST xsl:template
+ * &lt;!ATTLIST xsl:template
  *   match %pattern; #IMPLIED
  *   name %qname; #IMPLIED
  *   priority %priority; #IMPLIED
  *   mode %qname; #IMPLIED
  *   %space-att;
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#section-Defining-Template-Rules">section-Defining-Template-Rules in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java b/xalan/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
index 807c0b72..cd4b08d5 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
@@ -113,14 +113,12 @@ public class ElemTemplateElement extends UnImplNode
     return getNodeName();
   }
 
-
   /**
    * This function will be called on top-level elements
    * only, just before the transform begins.
    *
    * @param transformer The XSLT TransformerFactory.
-   *
-   * @throws TransformerException
+   * @throws TransformerException if initialization could not complete
    */
   public void runtimeInit(TransformerImpl transformer) throws TransformerException{}
 
@@ -177,6 +175,8 @@ public class ElemTemplateElement extends UnImplNode
   /**
    * This function is called during recomposition to
    * control how this element is composed.
+   * @param root StylesheetRoot at base of tree to recompose
+   * @throws TransformerException if recomposition fails
    */
   public void recompose(StylesheetRoot root) throws TransformerException
   {
@@ -187,6 +187,8 @@ public class ElemTemplateElement extends UnImplNode
    * recomposed, and allows the template to set remaining
    * values that may be based on some other property that
    * depends on recomposition.
+   * @param sroot StylesheetRoot at base of tree to compose
+   * @throws TransformerException if composition fails
    */
   public void compose(StylesheetRoot sroot) throws TransformerException
   {
@@ -202,6 +204,8 @@ public class ElemTemplateElement extends UnImplNode
   
   /**
    * This after the template's children have been composed.
+   * @param sroot StylesheetRoot at base of tree to compose
+   * @throws TransformerException if composition fails
    */
   public void endCompose(StylesheetRoot sroot) throws TransformerException
   {
@@ -249,7 +253,7 @@ public class ElemTemplateElement extends UnImplNode
    * @param newChild Child to be added to child list
    *
    * @return Child just added to the child list
-   * @throws DOMException
+   * @throws DOMException if the child would be poorly formed or misplaced
    */
   public Node appendChild(Node newChild) throws DOMException
   {
@@ -389,7 +393,7 @@ public class ElemTemplateElement extends UnImplNode
    *
    * @return The new child
    *
-   * @throws DOMException
+   * @throws DOMException if the replacement could not be made
    */
   public Node replaceChild(Node newChild, Node oldChild) throws DOMException
   {
@@ -429,7 +433,7 @@ public class ElemTemplateElement extends UnImplNode
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException if the insertion was not possible
    */
   public Node insertBefore(Node newChild, Node refChild) throws DOMException
   {
@@ -499,7 +503,7 @@ public class ElemTemplateElement extends UnImplNode
    *
    * @return The new child
    *
-   * @throws DOMException
+   * @throws DOMException if the replacement could not be performed
    */
   public ElemTemplateElement replaceChild(ElemTemplateElement newChildElem, 
                                           ElemTemplateElement oldChildElem)
@@ -831,7 +835,7 @@ public class ElemTemplateElement extends UnImplNode
    * @param nsSupport non-null reference to NamespaceSupport from 
    * the ContentHandler.
    *
-   * @throws TransformerException
+   * @throws TransformerException if the prefixes could not be bound
    */
   public void setPrefixes(NamespaceSupport nsSupport) throws TransformerException
   {
@@ -847,7 +851,7 @@ public class ElemTemplateElement extends UnImplNode
    * the ContentHandler.
    * @param excludeXSLDecl true if XSLT namespaces should be ignored.
    *
-   * @throws TransformerException
+   * @throws TransformerException if the prefixes could not be set
    */
   public void setPrefixes(NamespaceSupport nsSupport, boolean excludeXSLDecl)
           throws TransformerException
@@ -974,6 +978,7 @@ public class ElemTemplateElement extends UnImplNode
    * @see <a href="http://www.w3.org/TR/xslt#extension-element">extension-element in XSLT Specification</a>
    *
    * @param prefix non-null reference to prefix that might be excluded.
+   * @param uri non-null reference to URI that might be excluded
    *
    * @return true if the prefix should normally be excluded.
    */
@@ -996,7 +1001,7 @@ public class ElemTemplateElement extends UnImplNode
    *
    * @return true if the given namespace should be excluded.
    *
-   * @throws TransformerException
+   * @throws TransformerException if exclusion could not be performed
    */
   private boolean excludeResultNSDecl(String prefix, String uri)
           throws TransformerException
@@ -1024,7 +1029,7 @@ public class ElemTemplateElement extends UnImplNode
    * Note that this method builds m_prefixTable with aliased 
    * namespaces, *not* the original namespaces.
    *
-   * @throws TransformerException
+   * @throws TransformerException if prefixes could not be resolved
    */
   public void resolvePrefixTables() throws TransformerException
   {
@@ -1159,7 +1164,7 @@ public class ElemTemplateElement extends UnImplNode
    *
    * @param transformer non-null reference to the the current transform-time state.
    *
-   * @throws TransformerException
+   * @throws TransformerException if the handler objected to the prefix mappings
    */
   void executeNSDecls(TransformerImpl transformer) throws TransformerException
   {
@@ -1173,7 +1178,7 @@ public class ElemTemplateElement extends UnImplNode
    * @param transformer non-null reference to the the current transform-time state.
    * @param ignorePrefix string prefix to not startPrefixMapping
    *
-   * @throws TransformerException
+   * @throws TransformerException if the handler objected to the prefix mappings
    */
   void executeNSDecls(TransformerImpl transformer, String ignorePrefix) throws TransformerException
   {  
@@ -1528,7 +1533,7 @@ public class ElemTemplateElement extends UnImplNode
    *
    * @return true if the whitespace should be stripped.
    *
-   * @throws TransformerException
+   * @throws TransformerException if stylesheet root can't answer the question
    */
   public boolean shouldStripWhiteSpace(
           org.apache.xpath.XPathContext support, 
@@ -1629,6 +1634,7 @@ public class ElemTemplateElement extends UnImplNode
   /**
    * Call the children visitors.
    * @param visitor The visitor whose appropriate method will be called.
+   * @param callAttributes has no effect in this implementation
    */
   protected void callChildVisitors(XSLTVisitor visitor, boolean callAttributes)
   {
@@ -1636,8 +1642,8 @@ public class ElemTemplateElement extends UnImplNode
       node != null;
       node = node.m_nextSibling)
       {
-      node.callVisitors(visitor);
-    }
+	  node.callVisitors(visitor);
+      }
   }
   
   /**
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemText.java b/xalan/src/main/java/org/apache/xalan/templates/ElemText.java
index ac171be4..b5c7729c 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemText.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemText.java
@@ -27,10 +27,10 @@ import org.apache.xalan.res.XSLTErrorResources;
  * This primarily acts as a marker on the element
  * stack to signal that whitespace should be preserved.
  * <pre>
- * <!ELEMENT xsl:text (#PCDATA)>
- * <!ATTLIST xsl:text
+ * &lt;!ELEMENT xsl:text (#PCDATA)&gt;
+ * &lt;!ATTLIST xsl:text
  *   disable-output-escaping (yes|no) "no"
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#section-Creating-Text">section-Creating-Text in XSLT Specification</a>
  * @xsl.usage advanced
@@ -47,7 +47,7 @@ public class ElemText extends ElemTemplateElement
 
   /**
    * Set the "disable-output-escaping" attribute.
-   * Normally, the xml output method escapes & and < (and
+   * Normally, the xml output method escapes &amp; and &lt; (and
    * possibly other characters) when outputting text nodes.
    * This ensures that the output is well-formed XML. However,
    * it is sometimes convenient to be able to produce output
@@ -72,7 +72,7 @@ public class ElemText extends ElemTemplateElement
 
   /**
    * Get the "disable-output-escaping" attribute.
-   * Normally, the xml output method escapes & and < (and
+   * Normally, the xml output method escapes &amp; and &lt; (and
    * possibly other characters) when outputting text nodes.
    * This ensures that the output is well-formed XML. However,
    * it is sometimes convenient to be able to produce output
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java b/xalan/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
index bcf01761..22648260 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
@@ -120,7 +120,7 @@ public class ElemTextLiteral extends ElemTemplateElement
 
   /**
    * Set the "disable-output-escaping" attribute.
-   * Normally, the xml output method escapes & and < (and
+   * Normally, the xml output method escapes &amp; and &lt; (and
    * possibly other characters) when outputting text nodes.
    * This ensures that the output is well-formed XML. However,
    * it is sometimes convenient to be able to produce output
@@ -145,7 +145,7 @@ public class ElemTextLiteral extends ElemTemplateElement
 
   /**
    * Get the "disable-output-escaping" attribute.
-   * Normally, the xml output method escapes & and < (and
+   * Normally, the xml output method escapes &amp; and &lt; (and
    * possibly other characters) when outputting text nodes.
    * This ensures that the output is well-formed XML. However,
    * it is sometimes convenient to be able to produce output
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemValueOf.java b/xalan/src/main/java/org/apache/xalan/templates/ElemValueOf.java
index 5cf4d4d7..b9b9d37e 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemValueOf.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemValueOf.java
@@ -35,11 +35,11 @@ import org.xml.sax.SAXException;
 /**
  * Implement xsl:value-of.
  * <pre>
- * <!ELEMENT xsl:value-of EMPTY>
- * <!ATTLIST xsl:value-of
+ * &lt;!ELEMENT xsl:value-of EMPTY&gt;
+ * &lt;!ATTLIST xsl:value-of
  *   select %expr; #REQUIRED
  *   disable-output-escaping (yes|no) "no"
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#value-of">value-of in XSLT Specification</a>
  * @xsl.usage advanced
@@ -102,7 +102,7 @@ public class ElemValueOf extends ElemTemplateElement
 
   /**
    * Set the "disable-output-escaping" attribute.
-   * Normally, the xml output method escapes & and < (and
+   * Normally, the xml output method escapes &amp; and &lt; (and
    * possibly other characters) when outputting text nodes.
    * This ensures that the output is well-formed XML. However,
    * it is sometimes convenient to be able to produce output
@@ -127,7 +127,7 @@ public class ElemValueOf extends ElemTemplateElement
 
   /**
    * Get the "disable-output-escaping" attribute.
-   * Normally, the xml output method escapes & and < (and
+   * Normally, the xml output method escapes &amp; and &lt; (and
    * possibly other characters) when outputting text nodes.
    * This ensures that the output is well-formed XML. However,
    * it is sometimes convenient to be able to produce output
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemVariable.java b/xalan/src/main/java/org/apache/xalan/templates/ElemVariable.java
index 12b9374f..92905eac 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemVariable.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemVariable.java
@@ -35,11 +35,11 @@ import org.apache.xalan.res.XSLTErrorResources;
 /**
  * Implement xsl:variable.
  * <pre>
- * <!ELEMENT xsl:variable %template;>
- * <!ATTLIST xsl:variable
+ * &lt;!ELEMENT xsl:variable %template;&gt;
+ * &lt;!ATTLIST xsl:variable
  *   name %qname; #REQUIRED
  *   select %expr; #IMPLIED
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#variables">variables in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemWhen.java b/xalan/src/main/java/org/apache/xalan/templates/ElemWhen.java
index 3ca759da..c404da2e 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemWhen.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemWhen.java
@@ -25,11 +25,11 @@ import org.apache.xpath.XPath;
 /**
  * Implement xsl:when.
  * <pre>
- * <!ELEMENT xsl:when %template;>
- * <!ATTLIST xsl:when
+ * &lt;!ELEMENT xsl:when %template;&gt;
+ * &lt;!ATTLIST xsl:when
  *   test %expr; #REQUIRED
  *   %space-att;
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#section-Conditional-Processing-with-xsl:choose">XXX in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/ElemWithParam.java b/xalan/src/main/java/org/apache/xalan/templates/ElemWithParam.java
index b638bc81..f0f865b4 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/ElemWithParam.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemWithParam.java
@@ -35,11 +35,11 @@ import org.apache.xpath.objects.XString;
  * Implement xsl:with-param.  xsl:with-param is allowed within
  * both xsl:call-template and xsl:apply-templates.
  * <pre>
- * <!ELEMENT xsl:with-param %template;>
- * <!ATTLIST xsl:with-param
+ * &lt;!ELEMENT xsl:with-param %template;&gt;
+ * &lt;!ATTLIST xsl:with-param
  *   name %qname; #REQUIRED
  *   select %expr; #IMPLIED
- * >
+ * &gt;
  * </pre>
  * @see <a href="http://www.w3.org/TR/xslt#element-with-param">element-with-param in XSLT Specification</a>
  * @xsl.usage advanced
diff --git a/xalan/src/main/java/org/apache/xalan/templates/Stylesheet.java b/xalan/src/main/java/org/apache/xalan/templates/Stylesheet.java
index a37e7759..6364d4af 100644
--- a/xalan/src/main/java/org/apache/xalan/templates/Stylesheet.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/Stylesheet.java
@@ -44,7 +44,7 @@ import org.apache.xml.utils.SystemIDResolver;
  * defined in the <a href="XSLTAttributeDef#getSetterMethodName">getSetterMethodName</a>
  * function.</p>
  * <p><pre>
- * <!ENTITY % top-level "
+ * &lt;!ENTITY % top-level "
  *  (xsl:import*,
  *   (xsl:include
  *   | xsl:strip-space
@@ -58,22 +58,22 @@ import org.apache.xml.utils.SystemIDResolver;
  *   | xsl:template
  *   | xsl:namespace-alias
  *   %non-xsl-top-level;)*)
- * ">
+ * "&gt;
  *
- * <!ENTITY % top-level-atts '
+ * &lt;!ENTITY % top-level-atts '
  *   extension-element-prefixes CDATA #IMPLIED
  *   exclude-result-prefixes CDATA #IMPLIED
  *   id ID #IMPLIED
  *   version NMTOKEN #REQUIRED
  *   xmlns:xsl CDATA #FIXED "http://www.w3.org/1999/XSL/Transform"
  *   %space-att;
- * '>
+ * '&gt;
  *
- * <!ELEMENT xsl:stylesheet %top-level;>
- * <!ATTLIST xsl:stylesheet %top-level-atts;>
+ * &lt;!ELEMENT xsl:stylesheet %top-level;&gt;
+ * &lt;!ATTLIST xsl:stylesheet %top-level-atts;&gt;
  *
- * <!ELEMENT xsl:transform %top-level;>
- * <!ATTLIST xsl:transform %top-level-atts;>
+ * &lt;!ELEMENT xsl:transform %top-level;&gt;
+ * &lt;!ATTLIST xsl:transform %top-level-atts;&gt;
  *
  * </p></pre>
  * @see <a href="http://www.w3.org/TR/xslt#section-Stylesheet-Structure">section-Stylesheet-Structure in XSLT Specification</a>
diff --git a/xalan/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java b/xalan/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java
index 453059bb..fcb0d6cf 100644
--- a/xalan/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java
+++ b/xalan/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java
@@ -25,6 +25,7 @@ import org.apache.xml.dtm.DTM;
 import org.apache.xml.dtm.ref.DTMTreeWalker;
 import org.apache.xml.serializer.SerializationHandler;
 import org.apache.xpath.XPathContext;
+import javax.xml.transform.TransformerException;
 
 /**
  * Handle a walk of a tree, but screen out attributes for
diff --git a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/xpath.lex b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/xpath.lex
index e3719415..7008db28 100644
--- a/xalan/src/main/java/org/apache/xalan/xsltc/compiler/xpath.lex
+++ b/xalan/src/main/java/org/apache/xalan/xsltc/compiler/xpath.lex
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/* Modified from Jlex manual lookahead to JFlex RE LA */
 /*
  * $Id$
  */
@@ -22,7 +23,7 @@
  * @author Jacek Ambroziak
  * @author Santiago Pericas-Geertsen
  * @author Morten Jorgensen
- *
+ * @author Joseph Kesselman
  */
 
 package org.apache.xalan.xsltc.compiler;
@@ -46,29 +47,10 @@ import java_cup.runtime.Symbol;
         }
 
         /**
-         * If symbol is not followed by '::' or '(', then treat it as a
+	 * Lookahead disambiguation is now handled in the patterns: If
+         * symbol is not followed by '::' or '(', then treat it as a
          * name instead of an axis or function (Jira-1912).
-         */ 
-        Symbol disambiguateAxisOrFunction(int ss) throws Exception {
-            // Peek in the input buffer without changing the internal state
-            int index = yy_buffer_index;
-
-            // Skip whitespace
-            while (index < yy_buffer_read && isWhitespace(yy_buffer[index])) {
-                index++;
-            }
-
-            // If end of buffer, can't disambiguate :(
-            if (index >= yy_buffer_read) {
-                // Can't disambiguate, so return as symbol
-                return new Symbol(ss);
-            }
-
-            // Return symbol if next token is '::' or '('
-            return (yy_buffer[index] == ':' && yy_buffer[index+1] == ':' ||
-                    yy_buffer[index] == '(') ?
-                    newSymbol(ss) : newSymbol(sym.QNAME, yytext());
-        }
+	 */
 
         /**
          * If symbol is first token or if it follows any of the operators
@@ -189,6 +171,8 @@ HighSurrogate=[\uD800-\uDBFF]
 
 LowSurrogate=[\uDC00-\uDFFF]
 
+%state COMMENT  
+
 %%
 
 "*"                      { return disambiguateStar(); }
@@ -210,32 +194,66 @@ LowSurrogate=[\uDC00-\uDFFF]
 ">"                      { return newSymbol(sym.GT); }
 "<="                     { return newSymbol(sym.LE); }
 ">="                     { return newSymbol(sym.GE); }
-"id"                     { return disambiguateAxisOrFunction(sym.ID); }
-"key"                    { return disambiguateAxisOrFunction(sym.KEY); }
-"text()"                 { return newSymbol(sym.TEXT); }
-"text"+[ \t\r\n\f]+"()"  { return newSymbol(sym.TEXT); }
-"node()"                 { return newSymbol(sym.NODE); }
-"node"+[ \t\r\n\f]+"()"  { return newSymbol(sym.NODE); }
-"comment()"                 { return newSymbol(sym.COMMENT); }
-"comment"+[ \t\r\n\f]+"()"  { return newSymbol(sym.COMMENT); }
-"processing-instruction" { return disambiguateAxisOrFunction(sym.PIPARAM); }
-"processing-instruction()"                { return newSymbol(sym.PI); }
-"processing-instruction"+[ \t\r\n\f]+"()" { return newSymbol(sym.PI); }
-"or"                     { return disambiguateOperator(sym.OR); }
-"and"                    { return disambiguateOperator(sym.AND); }
-"child"                  { return disambiguateAxisOrFunction(sym.CHILD); }
-"attribute"              { return disambiguateAxisOrFunction(sym.ATTRIBUTE); }
-"ancestor"               { return disambiguateAxisOrFunction(sym.ANCESTOR); }
-"ancestor-or-self"       { return disambiguateAxisOrFunction(sym.ANCESTORORSELF); }
-"descendant"             { return disambiguateAxisOrFunction(sym.DESCENDANT); }
-"descendant-or-self"     { return disambiguateAxisOrFunction(sym.DESCENDANTORSELF); }
-"following"              { return disambiguateAxisOrFunction(sym.FOLLOWING); }
-"following-sibling"      { return disambiguateAxisOrFunction(sym.FOLLOWINGSIBLING); }
-"namespace"              { return disambiguateAxisOrFunction(sym.NAMESPACE); }
-"parent"                 { return disambiguateAxisOrFunction(sym.PARENT); }
-"preceding"              { return disambiguateAxisOrFunction(sym.PRECEDING); }
-"preceding-sibling"      { return disambiguateAxisOrFunction(sym.PRECEDINGSIBLING); }
-"self"                   { return disambiguateAxisOrFunction(sym.SELF); }
+
+"id"/\s*"("		 { return newSymbol(sym.ID); }
+"id"/\s*"::"		 { return newSymbol(sym.ID); }
+
+"key"/\s*"("		 { return newSymbol(sym.KEY); }
+"key"/\s*"::"		 { return newSymbol(sym.KEY); }
+
+"text"\s*"()"		 { return newSymbol(sym.TEXT); }
+"node"\s*"()"            { return newSymbol(sym.NODE); }
+"comment"\s*"()"         { return newSymbol(sym.COMMENT); }
+
+"processing-instruction"\s*"()"  { return newSymbol(sym.PI); }
+/* NOTE: This may be redundent with next rule. */
+"processing-instruction"/\s*"::" { return newSymbol(sym.PIPARAM); }
+/* NOTE PI's departure from usual fallthrough (QNAME) */
+"processing-instruction" 	 { return newSymbol(sym.PIPARAM); }
+
+"or"                    { return disambiguateOperator(sym.OR); }
+"and"                   { return disambiguateOperator(sym.AND); }
+
+"child"/\s*"("          { return newSymbol(sym.CHILD); }
+"child"/\s*"::"         { return newSymbol(sym.CHILD); }
+
+
+"attribute"/\s*"::"     { return newSymbol(sym.ATTRIBUTE); }
+"attribute"/\s*"("      { return newSymbol(sym.ATTRIBUTE); }
+
+"ancestor"/\s*"::"      { return newSymbol(sym.ANCESTOR); }
+"ancestor"/\s*"("       { return newSymbol(sym.ANCESTOR); }
+
+"ancestor-or-self"/\s*"::" { return newSymbol(sym.ANCESTORORSELF); }
+"ancestor-or-self"/\s*"("  { return newSymbol(sym.ANCESTORORSELF); }
+
+"descendant"/\s*"::"    { return newSymbol(sym.DESCENDANT); }
+"descendant"/\s*"("     { return newSymbol(sym.DESCENDANT); }
+
+"descendant-or-self"/\s*"::"     { return newSymbol(sym.DESCENDANTORSELF); }
+"descendant-or-self"/\s*"("      { return newSymbol(sym.DESCENDANTORSELF); }
+
+"following"/\s*"::"     { return newSymbol(sym.FOLLOWING); }
+"following"/\s*"("      { return newSymbol(sym.FOLLOWING); }
+
+"following-sibling"/\s*"::"     { return newSymbol(sym.FOLLOWINGSIBLING); }
+"following-sibling"/\s*"("      { return newSymbol(sym.FOLLOWINGSIBLING); }
+
+"namespace"/\s*"::"     { return newSymbol(sym.NAMESPACE); }
+"namespace"/\s*"("      { return newSymbol(sym.NAMESPACE); }
+
+"parent"/\s*"::"        { return newSymbol(sym.PARENT); }
+"parent"/\s*"("         { return newSymbol(sym.PARENT); }
+
+"preceding"/\s*"::"     { return newSymbol(sym.PRECEDING); }
+"preceding"/\s*"("      { return newSymbol(sym.PRECEDING); }
+
+"preceding-sibling"/\s*"::"	{ return newSymbol(sym.PRECEDINGSIBLING); }
+"preceding-sibling"/\s*"("      { return newSymbol(sym.PRECEDINGSIBLING); }
+
+"self"/\s*"::"		 { return newSymbol(sym.SELF); }
+"self"/\s*"("		 { return newSymbol(sym.SELF); }
+
 "["                      { return newSymbol(sym.LBRACK); }
 "]"                      { return newSymbol(sym.RBRACK); }
 "("                      { return newSymbol(sym.LPAREN); }
@@ -253,5 +271,5 @@ LowSurrogate=[\uDC00-\uDFFF]
 ({NCName}":")?{NCName}   { return newSymbol(sym.QNAME, yytext()); }
 ({NCName}":")?"*"        { return newSymbol(sym.QNAME, yytext()); }
 ({NCName}":")?"@*"       { return newSymbol(sym.QNAME, yytext()); }
-[ \t\r\n\f]              { /* ignore white space. */ }
+\s		         { /* ignore white space. */ }
 .                        { throw new Exception(yytext()); }
diff --git a/xalan/src/main/java/org/apache/xml/res/XMLMessages.java b/xalan/src/main/java/org/apache/xml/res/XMLMessages.java
index c1e31641..6185ac6c 100644
--- a/xalan/src/main/java/org/apache/xml/res/XMLMessages.java
+++ b/xalan/src/main/java/org/apache/xml/res/XMLMessages.java
@@ -160,7 +160,7 @@ public class XMLMessages
    *
    * @param className The class name of the resource bundle.
    * @return the ResourceBundle
-   * @throws MissingResourceException
+   * @throws MissingResourceException if the resource bundle can not be retrieved
    */
   public static ListResourceBundle loadResourceBundle(String className)
           throws MissingResourceException
diff --git a/xalan/src/main/java/org/apache/xml/utils/BoolStack.java b/xalan/src/main/java/org/apache/xml/utils/BoolStack.java
index b36ed707..7bb62197 100644
--- a/xalan/src/main/java/org/apache/xml/utils/BoolStack.java
+++ b/xalan/src/main/java/org/apache/xml/utils/BoolStack.java
@@ -19,7 +19,7 @@
  * $Id$
  */
 package org.apache.xml.utils;
-
+import java.util.EmptyStackException;
 
 /**
  * Simple stack for boolean values.
diff --git a/xalan/src/main/java/org/apache/xml/utils/IntStack.java b/xalan/src/main/java/org/apache/xml/utils/IntStack.java
index 7969913c..ce9a28ec 100644
--- a/xalan/src/main/java/org/apache/xml/utils/IntStack.java
+++ b/xalan/src/main/java/org/apache/xml/utils/IntStack.java
@@ -19,7 +19,6 @@
  * $Id$
  */
 package org.apache.xml.utils;
-
 import java.util.EmptyStackException;
 
 /**
diff --git a/xalan/src/main/java/org/apache/xml/utils/ObjectStack.java b/xalan/src/main/java/org/apache/xml/utils/ObjectStack.java
index 7b406f6f..b91c4eaa 100644
--- a/xalan/src/main/java/org/apache/xml/utils/ObjectStack.java
+++ b/xalan/src/main/java/org/apache/xml/utils/ObjectStack.java
@@ -19,7 +19,6 @@
  * $Id$
  */
 package org.apache.xml.utils;
-
 import java.util.EmptyStackException;
 
 /**
diff --git a/xalan/src/main/java/org/apache/xml/utils/UnImplNode.java b/xalan/src/main/java/org/apache/xml/utils/UnImplNode.java
index 8f29913d..f4d29850 100644
--- a/xalan/src/main/java/org/apache/xml/utils/UnImplNode.java
+++ b/xalan/src/main/java/org/apache/xml/utils/UnImplNode.java
@@ -43,7 +43,8 @@ import org.w3c.dom.UserDataHandler;
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.TypeInfo;
 /**
- * To be subclassed by classes that wish to fake being nodes.
+ * No-op Node implementation. To be subclassed by classes that wish to
+ * fake being nodes.
  * @xsl.usage internal
  */
 public class UnImplNode implements Node, Element, NodeList, Document
@@ -87,9 +88,9 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @param newChild New node to append to the list of this node's children
    *
-   * @return null
+   * @return null, meaning the append can't be done
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Node appendChild(Node newChild) throws DOMException
   {
@@ -283,9 +284,10 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @param oldAttr Attribute to be removed from this node's list of attributes
    *
-   * @return null
+   * @return null, meaning the remove could not be done in this implementation
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
+
    */
   public Attr removeAttributeNode(Attr oldAttr) throws DOMException
   {
@@ -300,9 +302,9 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @param newAttr Attribute node to be added to this node's list of attributes
    *
-   * @return null
+   * @return null, meaning attribute could not be set in this implementation.
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Attr setAttributeNode(Attr newAttr) throws DOMException
   {
@@ -329,13 +331,11 @@ public class UnImplNode implements Node, Element, NodeList, Document
   }
 
   /**
-   * Unimplemented. See org.w3c.dom.Element
-   *
-   *
-   * @param name
-   * @param x
-   *
-   * @return false
+   * Unimplemented
+   * {@inheritDoc}
+   * @see org.w3c.dom.Element#hasAttributeNS(String,String)
+   * @return false 
+   * @throws DOMException always, "not supported!"
    */
   public boolean hasAttributeNS(String name, String x)
   {
@@ -346,12 +346,11 @@ public class UnImplNode implements Node, Element, NodeList, Document
   }
 
   /**
-   * Unimplemented. See org.w3c.dom.Element
-   *
+   * Unimplemented.
+   * @see org.w3c.dom.Element#getAttributeNode(String)
    *
    * @param name Attribute node name
-   *
-   * @return null
+   * @return null; always, "not supported!" empty in this implementation.
    */
   public Attr getAttributeNode(String name)
   {
@@ -362,11 +361,12 @@ public class UnImplNode implements Node, Element, NodeList, Document
   }
 
   /**
-   * Unimplemented. See org.w3c.dom.Element
+   * Unimplemented. 
+   * @see org.w3c.dom.Element#removeAttribute(String)
    *
    * @param name Attribute node name to remove from list of attributes
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public void removeAttribute(String name) throws DOMException
   {
@@ -374,12 +374,13 @@ public class UnImplNode implements Node, Element, NodeList, Document
   }
 
   /**
-   * Unimplemented. See org.w3c.dom.Element
+   * Unimplemented. 
+   * @see org.w3c.dom.Element#setAttribute(String,String)
    *
    * @param name Name of attribute to set
    * @param value Value of attribute
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public void setAttribute(String name, String value) throws DOMException
   {
@@ -387,11 +388,12 @@ public class UnImplNode implements Node, Element, NodeList, Document
   }
 
   /**
-   * Unimplemented. See org.w3c.dom.Element
+   * Unimplemented. 
+   * @see org.w3c.dom.Element#getAttribute(String)
    *
    * @param name Name of attribute to get
    *
-   * @return null
+   * @return null always, "not supported!" (no match) in this implementation
    */
   public String getAttribute(String name)
   {
@@ -403,8 +405,9 @@ public class UnImplNode implements Node, Element, NodeList, Document
 
   /**
    * Unimplemented. Introduced in DOM Level 2.
+   * {@inheritDoc}
    *
-   * @return false
+   * @return false; this implementation will never have attributes
    */
   public boolean hasAttributes()
   {
@@ -415,12 +418,14 @@ public class UnImplNode implements Node, Element, NodeList, Document
   }
 
   /**
-   * Unimplemented. See org.w3c.dom.Element
+   * Unimplemented. 
+   * {@inheritDoc}
+   * @see org.w3c.dom.Element#getElementsByTagNameNS(String,String)
    *
    * @param namespaceURI Namespace URI of the element
    * @param localName Local part of qualified name of the element
    *
-   * @return null
+   * @return null always, "not supported!", in this implementation
    */
   public NodeList getElementsByTagNameNS(String namespaceURI,
                                          String localName)
@@ -438,7 +443,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Attr setAttributeNodeNS(Attr newAttr) throws DOMException
   {
@@ -470,7 +475,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    * @param namespaceURI Namespace URI of attribute node to remove
    * @param localName Local part of qualified name of attribute node to remove
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public void removeAttributeNS(String namespaceURI, String localName)
           throws DOMException
@@ -485,7 +490,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    * NEEDSDOC @param qualifiedName
    * @param value value of attribute
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public void setAttributeNS(
           String namespaceURI, String qualifiedName, String value)
@@ -543,7 +548,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public String getNodeValue() throws DOMException
   {
@@ -558,7 +563,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @param nodeValue Value to set this node to
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public void setNodeValue(String nodeValue) throws DOMException
   {
@@ -572,7 +577,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    * NEEDSDOC @param value
    * @return value Node value
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
 
   // public String getValue ()
@@ -586,19 +591,18 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @param value Value to set this node to
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public void setValue(String value) throws DOMException
   {
     error(XMLErrorResources.ER_FUNCTION_NOT_SUPPORTED);  //"setValue not supported!");
   }
 
-  /**
-   *  Returns the name of this attribute.
-   *
-   * @return the name of this attribute.
-   */
-
+  // /**
+  //  *  Returns the name of this attribute.
+  //  *
+  //  * @return the name of this attribute.
+  //  */
   // public String getName()
   // {
   //  return this.getNodeName();
@@ -608,6 +612,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    * Unimplemented. See org.w3c.dom.Node
    *
    * @return null
+   * @throws DOMException always, "not supported!"
    */
   public Element getOwnerElement()
   {
@@ -651,7 +656,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Node insertBefore(Node newChild, Node refChild) throws DOMException
   {
@@ -669,7 +674,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Node replaceChild(Node newChild, Node oldChild) throws DOMException
   {
@@ -686,7 +691,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Node removeChild(Node oldChild) throws DOMException
   {
@@ -746,7 +751,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @param prefix Prefix to set for this node
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public void setPrefix(String prefix) throws DOMException
   {
@@ -812,7 +817,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Element createElement(String tagName) throws DOMException
   {
@@ -872,7 +877,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public CDATASection createCDATASection(String data) throws DOMException
   {
@@ -890,7 +895,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public ProcessingInstruction createProcessingInstruction(
           String target, String data) throws DOMException
@@ -908,7 +913,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Attr createAttribute(String name) throws DOMException
   {
@@ -925,7 +930,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public EntityReference createEntityReference(String name)
           throws DOMException
@@ -947,7 +952,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Node importNode(Node importedNode, boolean deep) throws DOMException
   {
@@ -965,7 +970,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Element createElementNS(String namespaceURI, String qualifiedName)
           throws DOMException
@@ -984,7 +989,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Attr createAttributeNS(String namespaceURI, String qualifiedName)
           throws DOMException
@@ -1016,7 +1021,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @param data data to set for this node
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public void setData(String data) throws DOMException
   {
@@ -1031,7 +1036,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public String substringData(int offset, int count) throws DOMException
   {
@@ -1046,7 +1051,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @param arg String data to append
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public void appendData(String arg) throws DOMException
   {
@@ -1056,10 +1061,10 @@ public class UnImplNode implements Node, Element, NodeList, Document
   /**
    * Unimplemented.
    *
-   * @param offset Start offset of substring to insert.
-   * NEEDSDOC @param arg
+   * @param offset Start offset at which to insert data
+   * @param arg String to be inserted.
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public void insertData(int offset, String arg) throws DOMException
   {
@@ -1072,7 +1077,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    * @param offset Start offset of substring to delete.
    * @param count The length of the substring to delete.
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public void deleteData(int offset, int count) throws DOMException
   {
@@ -1086,7 +1091,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    * @param count The length of the substring to replace.
    * @param arg substring to replace with
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public void replaceData(int offset, int count, String arg)
           throws DOMException
@@ -1101,7 +1106,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * @return null, unimplemented
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Text splitText(int offset) throws DOMException
   {
@@ -1119,7 +1124,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    *
    * NEEDSDOC (adoptNode) @return
    *
-   * @throws DOMException
+   * @throws DOMException always, "not supported!"
    */
   public Node adoptNode(Node source) throws DOMException
   {
@@ -1157,7 +1162,7 @@ public class UnImplNode implements Node, Element, NodeList, Document
    * of this document. This is <code>null</code> when unspecified.
    * @since DOM Level 3
    *
-   * NEEDSDOC @param encoding
+   * @param encoding String containing the encoding name for this document
    */
   public void setInputEncoding(String encoding)
   {
@@ -1288,9 +1293,6 @@ public class UnImplNode implements Node, Element, NodeList, Document
      * <code>Text</code> nodes, as well as any user data or event listeners
      * registered on the nodes.
      * @param arg The node to compare equality with.
-     * @param deep If <code>true</code>, recursively compare the subtrees; if
... 1423 lines suppressed ...


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org