=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 000000000..2f5cc74c3
--- /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 000000000..f897a7f1c
--- /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 000000000..af9abcafb
--- /dev/null
+++ b/serializer/pom.xml
@@ -0,0 +1,110 @@
+
+ 4.0.0
+
+ xalan
+ xalan-project
+ 2.7.3
+
+
+ serializer
+ XML Serializer
+ Apache's XML serialization layer, as used in the Xalan XSLT processor
+
+
+
+
+ org.apache.bcel
+ bcel
+ 6.7.0
+
+
+
+ commons-logging
+ commons-logging
+ 1.2
+ provided
+
+
+
+ javax
+ javaee-api
+ 6.0
+ provided
+
+
+
+ javax.servlet
+ servlet-api
+ 2.5
+ provided
+
+
+
+ xerces
+ xercesImpl
+ 2.12.2
+ provided
+
+
+
+ xml-apis
+ xml-apis
+ 1.4.01
+
+ provided
+
+
+
+
+
+
+
+ maven-compiler-plugin
+ 3.8.1
+
+ 1.8
+ 1.8
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.5.0
+
+
+ package
+
+ shade
+
+
+
+
+
+ junit:junit
+ jmock:*
+ org.apache.maven:lib:tests
+
+ com.github.vbmacher:java-cup
+ commons-logging:commons-logging
+ org.apache.commons:commons-lang3
+ org.apache.ant:ant
+ org.apache.ant:ant-launcher
+ org.apache.bcel:bcel
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/apache/xml/serializer/Encodings.properties b/serializer/resources/org/apache/xml/serializer/Encodings.properties
similarity index 100%
rename from src/org/apache/xml/serializer/Encodings.properties
rename to serializer/resources/org/apache/xml/serializer/Encodings.properties
diff --git a/src/org/apache/xml/serializer/HTMLEntities.properties b/serializer/resources/org/apache/xml/serializer/HTMLEntities.properties
similarity index 100%
rename from src/org/apache/xml/serializer/HTMLEntities.properties
rename to serializer/resources/org/apache/xml/serializer/HTMLEntities.properties
diff --git a/src/org/apache/xml/serializer/Version.src b/serializer/resources/org/apache/xml/serializer/Version.src
similarity index 100%
rename from src/org/apache/xml/serializer/Version.src
rename to serializer/resources/org/apache/xml/serializer/Version.src
diff --git a/src/org/apache/xml/serializer/XMLEntities.properties b/serializer/resources/org/apache/xml/serializer/XMLEntities.properties
similarity index 100%
rename from src/org/apache/xml/serializer/XMLEntities.properties
rename to serializer/resources/org/apache/xml/serializer/XMLEntities.properties
diff --git a/src/org/apache/xml/serializer/output_html.properties b/serializer/resources/org/apache/xml/serializer/output_html.properties
similarity index 100%
rename from src/org/apache/xml/serializer/output_html.properties
rename to serializer/resources/org/apache/xml/serializer/output_html.properties
diff --git a/src/org/apache/xml/serializer/output_text.properties b/serializer/resources/org/apache/xml/serializer/output_text.properties
similarity index 100%
rename from src/org/apache/xml/serializer/output_text.properties
rename to serializer/resources/org/apache/xml/serializer/output_text.properties
diff --git a/src/org/apache/xml/serializer/output_unknown.properties b/serializer/resources/org/apache/xml/serializer/output_unknown.properties
similarity index 100%
rename from src/org/apache/xml/serializer/output_unknown.properties
rename to serializer/resources/org/apache/xml/serializer/output_unknown.properties
diff --git a/src/org/apache/xml/serializer/output_xml.properties b/serializer/resources/org/apache/xml/serializer/output_xml.properties
similarity index 100%
rename from src/org/apache/xml/serializer/output_xml.properties
rename to serializer/resources/org/apache/xml/serializer/output_xml.properties
diff --git a/src/org/apache/xml/serializer/package.html b/serializer/resources/org/apache/xml/serializer/package.html
similarity index 100%
rename from src/org/apache/xml/serializer/package.html
rename to serializer/resources/org/apache/xml/serializer/package.html
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 98%
rename from src/org/apache/xml/serializer/DOM3Serializer.java
rename to serializer/src/main/java/org/apache/xml/serializer/DOM3Serializer.java
index 82e6470da..d05c37743 100644
--- a/src/org/apache/xml/serializer/DOM3Serializer.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/DOM3Serializer.java
@@ -45,7 +45,7 @@
*
* Example:
*
- * public class TestDOM3 {
+ * public class TestDOM3 {
*
* public static void main(String args[]) throws Exception {
* // Get document to serialize
@@ -55,7 +55,8 @@
* 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/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 91%
rename from src/org/apache/xml/serializer/EmptySerializer.java
rename to serializer/src/main/java/org/apache/xml/serializer/EmptySerializer.java
index fba7de2cc..3bcd49ddd 100644
--- a/src/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 ContentHandler asContentHandler() throws IOException
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 void close()
aMethodIsCalled();
}
/**
+ * @return Properties object describing the serializer's configuration
* @see SerializationHandler#getOutputFormat()
*/
public Properties getOutputFormat()
@@ -117,6 +141,7 @@ public Properties getOutputFormat()
return null;
}
/**
+ * @return the OutputStream that this serializer would write to
* @see SerializationHandler#getOutputStream()
*/
public OutputStream getOutputStream()
@@ -125,6 +150,7 @@ public OutputStream getOutputStream()
return null;
}
/**
+ * @return the Writer this serializer uses to write to the OutputStream
* @see SerializationHandler#getWriter()
*/
public Writer getWriter()
@@ -133,6 +159,7 @@ public Writer getWriter()
return null;
}
/**
+ * return
* @see SerializationHandler#reset()
*/
public boolean reset()
@@ -155,6 +182,7 @@ public void setCdataSectionElements(Vector URI_and_localNames)
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 void setTransformer(Transformer transformer)
public Transformer getTransformer()
{
aMethodIsCalled();
- return null;
+ return null;
}
/**
* @see SerializationHandler#flushPending()
@@ -559,7 +587,14 @@ public String getVersion()
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/src/org/apache/xml/serializer/EncodingInfo.java b/serializer/src/main/java/org/apache/xml/serializer/EncodingInfo.java
similarity index 96%
rename from src/org/apache/xml/serializer/EncodingInfo.java
rename to serializer/src/main/java/org/apache/xml/serializer/EncodingInfo.java
index 840405b2f..e3fc76705 100644
--- a/src/org/apache/xml/serializer/EncodingInfo.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/EncodingInfo.java
@@ -42,9 +42,9 @@
* m_last). It will handle a certain range of values
* explicitly (m_explFirst to m_explLast).
* If the unicode point is before that explicit range, that is it
- * is in the range m_first <= value < m_explFirst, then it will delegate to another EncodingInfo object for The root
+ * is in the range m_first <= value < m_explFirst, then it will delegate to another EncodingInfo object for The root
* of such a tree, m_before. Likewise for values in the range
- * m_explLast < value <= m_last, but delgating to m_after
+ * m_explLast < value <= m_last, but delgating to m_after
*
* 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
*
* This method is not a public API.
* @xsl.usage internal
@@ -118,6 +119,7 @@ public boolean isInEncoding(char ch) {
* 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
*
* This method is not a public API.
* @xsl.usage internal
@@ -167,23 +169,24 @@ public EncodingInfo(String name, String javaName, char highChar)
*/
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 boolean isInEncoding(char ch1) {
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 @@ else if (data[0] == '?' && ch != '?')
* 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
*
* This method is not a public API.
* @xsl.usage internal
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 90%
rename from src/org/apache/xml/serializer/ExtendedContentHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java
index 8cf35d3ff..df3358eb0 100644
--- a/src/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 void addAttribute(
/**
* 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 void addAttributes(org.xml.sax.Attributes atts)
* 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 void addAttributes(org.xml.sax.Attributes atts)
* 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 void addAttributes(org.xml.sax.Attributes atts)
* 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 void addAttributes(org.xml.sax.Attributes atts)
* 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 void addAttributes(org.xml.sax.Attributes atts)
* @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 void startElement(String uri, String localName, String qName)
/**
* 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 void startElement(String uri, String localName, String qName)
*
* @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 void namespaceAfterStartElement(String uri, String prefix)
* @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 boolean startPrefixMapping(
/**
* 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 boolean startPrefixMapping(
* @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 void addUniqueAttribute(String qName, String value, int flags)
* @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/src/org/apache/xml/serializer/ExtendedLexicalHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java
similarity index 95%
rename from src/org/apache/xml/serializer/ExtendedLexicalHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java
index bb7f90f53..837e32485 100644
--- a/src/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/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 96%
rename from src/org/apache/xml/serializer/NamespaceMappings.java
rename to serializer/src/main/java/org/apache/xml/serializer/NamespaceMappings.java
index 91d25d342..0497c8656 100644
--- a/src/org/apache/xml/serializer/NamespaceMappings.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/NamespaceMappings.java
@@ -33,22 +33,22 @@
*
*
For example:
*
- *
- *
- *
- *
- *
- *
- *
- *
+ * <chapter xmlns:p1="def">
+ * <paragraph xmlns:p2="ghi">
+ * <sentence xmlns:p3="jkl">
+ * </sentence>
+ * </paragraph>
+ * <paragraph xlmns:p4="mno">
+ * </paragraph>
+ * </chapter>
*
*
- * When the element is encounted the prefix "p1" associated with uri
+ * When the <chapter> element is encounted the prefix "p1" associated with uri
* "def" is pushed on the stack with depth 1.
- * When the first is encountered "p2" and "ghi" are pushed with
+ * When the first <paragraph> is encountered "p2" and "ghi" are pushed with
* depth 2.
- * When the is encountered "p3" and "jkl" are pushed with depth 3.
- * When occurs the popNamespaces(3) will pop "p3"/"jkl" off the
+ * When the <sentence> is encountered "p3" and "jkl" are pushed with depth 3.
+ * When </sentence> 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 @@ boolean popNamespace(String prefix)
* @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/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 87%
rename from src/org/apache/xml/serializer/SerializationHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/SerializationHandler.java
index fca975f3c..6e0c8fd09 100644
--- a/src/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
*
* 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/src/org/apache/xml/serializer/Serializer.java b/serializer/src/main/java/org/apache/xml/serializer/Serializer.java
similarity index 98%
rename from src/org/apache/xml/serializer/Serializer.java
rename to serializer/src/main/java/org/apache/xml/serializer/Serializer.java
index 933d1c6ef..19b249158 100644
--- a/src/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 XSLT 1.0 recommendation }
+ * <a href="http://www.w3.org/TR/1999/REC-xslt-19991116"> XSLT 1.0 recommendation</a>
*
* The non-standard property keys supported are defined in {@link OutputPropertiesFactory}.
*
diff --git a/src/org/apache/xml/serializer/SerializerBase.java b/serializer/src/main/java/org/apache/xml/serializer/SerializerBase.java
similarity index 96%
rename from src/org/apache/xml/serializer/SerializerBase.java
rename to serializer/src/main/java/org/apache/xml/serializer/SerializerBase.java
index 1df30014e..c0c3585c0 100644
--- a/src/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 @@ protected void fireEndElem(String name)
* @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 @@ protected void fireCharEvent(char[] chars, int start, int length)
*/
protected boolean m_needToCallStartDocument = true;
- /** True if a trailing "]]>" still needs to be written to be
+ /** True if a trailing "]]>" 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 void comment(String data) throws SAXException
* 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 String getEncoding()
/**
* 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 String getNamespaceURIFromPrefix(String prefix)
* 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 Transformer getTransformer()
* 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 void warning(SAXParseException exc) throws SAXException
/**
* 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 @@ private void flushMyWriter()
* @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 @@ protected void fireCDATAEvent(char[] chars, int start, int length)
* @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 @@ protected void fireCommentEvent(char[] chars, int start, int length)
/**
* 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 void fireEndEntity(String name)
/**
* 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 @@ protected void fireStartDoc()
/**
* 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 @@ protected void fireEndDoc()
* 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 @@ protected void fireStartElem(String elemName)
}
- /**
- * 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 @@ protected void fireEscapingEvent(String name, String data)
/**
* 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 @@ protected void fireEntityReference(String name)
*
* @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 void startDocument() throws org.xml.sax.SAXException
* 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 @@ private void addCDATAElement(String uri, String localName)
/**
- * Return true if nothing has been sent to this result tree yet.
+ * @return true if nothing has been sent to this result tree yet.
*
* This is not a public API.
- *
* @xsl.usage internal
*/
public boolean documentIsEmpty() {
@@ -1455,9 +1454,9 @@ public boolean documentIsEmpty() {
}
/**
- * 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 attribute
+ * CDATA sections are specified in the <xsl:output> attribute
* cdata-section-names or in the JAXP equivalent property.
* In any case the format of the value of such a property is:
*
@@ -1561,8 +1560,8 @@ public String getOutputProperty(String name) {
* not the default value. If there is a default
* value, but no non-default value this method
* will return null.
- *
- *
+ * @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/src/org/apache/xml/serializer/SerializerConstants.java b/serializer/src/main/java/org/apache/xml/serializer/SerializerConstants.java
similarity index 91%
rename from src/org/apache/xml/serializer/SerializerConstants.java
rename to serializer/src/main/java/org/apache/xml/serializer/SerializerConstants.java
index 41cb45605..49a06dbd5 100644
--- a/src/org/apache/xml/serializer/SerializerConstants.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/SerializerConstants.java
@@ -27,13 +27,11 @@
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 ]]< in a CDATA section context by ending the
+ * last CDATA section with ]] and starting the next CDATA section
+ * with <
*/
static final String CDATA_CONTINUE = "]]]]>";
- /**
- * The constant "]]>"
- */
static final String CDATA_DELIMITER_CLOSE = "]]>";
static final String CDATA_DELIMITER_OPEN = "
- * 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 XSLT 1.0 recommendation }
+ *
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 1.0
+ * recommendation
*
*
* The value of the "cdata-section-elements" property key is a whitespace
@@ -79,13 +81,13 @@ private 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/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 97%
rename from src/org/apache/xml/serializer/ToHTMLSAXHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToHTMLSAXHandler.java
index 097d3a04d..9b5e87bc8 100644
--- a/src/org/apache/xml/serializer/ToHTMLSAXHandler.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToHTMLSAXHandler.java
@@ -79,7 +79,6 @@ public OutputStream getOutputStream()
}
/**
- * Returns null
* @return null
* @see Serializer#getWriter()
*/
@@ -90,14 +89,19 @@ public Writer getWriter()
/**
* 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 void serialize(Node node) throws IOException
/**
* 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 void ignorableWhitespace(char[] ch, int start, int length)
* 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 void skippedEntity(String arg0) throws SAXException
* @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 void startEntity(String arg0) throws SAXException
*
* @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 void close()
* 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 void endElement(String elementName) throws SAXException
* @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/src/org/apache/xml/serializer/ToHTMLStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
similarity index 98%
rename from src/org/apache/xml/serializer/ToHTMLStream.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
index 453fac601..38e4632fd 100644
--- a/src/org/apache/xml/serializer/ToHTMLStream.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
@@ -676,10 +676,7 @@ public ToHTMLStream()
/**
* 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 @@ private void outputDocTypeDecl(String name) throws SAXException {
/**
* 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 final void endDocument() throws org.xml.sax.SAXException
/**
* 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 @@ else if (
/**
* 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 @@ else if (m_doIndent && (!m_inBlockElem || isBlockElement))
* @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 @@ private boolean isHHSign(String str)
* Write the specified string after substituting non ASCII characters,
* with %HH, 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 @@ else if (cleanLength == 1)
* @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 @@ else if (cleanLength == 1)
* 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 final void characters(char chars[], int start, int length)
* 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 final void cdata(char ch[], int start, int length)
* 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 @@ else if (m_needToCallStartDocument)
*
* @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 final void endElement(String elemName) throws SAXException
* @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 void processAttributes(java.io.Writer writer, int nAttrs)
}
/**
- * 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 > 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 void startDTD(String name, String publicId, String systemId)
/**
* 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/src/org/apache/xml/serializer/ToSAXHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
similarity index 98%
rename from src/org/apache/xml/serializer/ToSAXHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
index 0373f1dd4..75d423de7 100644
--- a/src/org/apache/xml/serializer/ToSAXHandler.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
@@ -113,7 +113,7 @@ public void startDTD(String arg0, String arg1, String arg2)
*
* @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 @@ protected void closeCDATA() throws SAXException
* 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 void startElement(String qName) throws SAXException {
* 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/src/org/apache/xml/serializer/ToStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToStream.java
similarity index 98%
rename from src/org/apache/xml/serializer/ToStream.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToStream.java
index 1134eb7ee..6340f2416 100644
--- a/src/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 '/>' syntax for XHTML.
*/
protected boolean m_spaceBeforeClose = false;
@@ -184,9 +184,9 @@ public ToStream()
}
/**
- * 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 @@ public void serialize(Node node) throws IOException
/**
* 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 @@ public void internalEntityDecl(String name, String value)
* @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 @@ void outputEntityDecl(String name, String value) throws IOException
/**
* 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 @@ public boolean setEscaping(boolean escape)
*
* @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 @@ protected void indent(int depth) throws IOException
/**
* 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 @@ protected void indent() throws IOException
* Prints n 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 @@ public void externalEntityDecl(
}
/**
- * 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 @@ protected boolean escapingNotNeeded(char ch)
* 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 @@ protected int writeUTF16Surrogate(char c, char ch[], int i, int end)
*
* @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 @@ int accumDefaultEntity(
* @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 @@ else if (Encodings.isHighUTF16Surrogate(c))
*
* @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 @@ public void endNonEscaping() throws org.xml.sax.SAXException
*
The contents of the un-escaping section will be delivered through the
* regular characters 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 @@ public void startNonEscaping() throws org.xml.sax.SAXException
* 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 @@ private boolean isEscapingDisabled()
* @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 @@ protected void charactersRaw(char ch[], int start, int length)
* 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 @@ private static boolean isNELorLSEPCharacter(char ch)
* @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 @@ private int processDirty(
*
* @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 @@ public void characters(String s) throws org.xml.sax.SAXException
* @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 @@ else if ((!escapingNotNeeded(ch) ||
* @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 @@ else if (m_cdataTagOpen)
* @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 @@ void outputDocTypeDecl(String name, boolean closeDecl) throws SAXException
* @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 @@ public void processAttributes(java.io.Writer writer, int nAttrs) throws IOExcept
}
/**
- * Returns the specified string after substituting specials ,
+ * Writes the specified string after substituting specials ,
* and UTF-16 surrogates for chracter references &#xnn.
*
+ * @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 @@ else if (m_encodingInfo.isInEncoding(ch)) {
* @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 @@ public void endPrefixMapping(String prefix) throws org.xml.sax.SAXException
* @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 @@ public void startEntity(String name) throws org.xml.sax.SAXException
/**
* For the enclosing elements starting tag write out
- * out any attributes followed by ">"
+ * out any attributes followed by the > 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 @@ public void setCdataSectionElements(Vector URI_and_localNames)
* 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 @@ public void unparsedEntityDecl(String name, String pubID, String sysID, String n
}
/**
- * 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/src/org/apache/xml/serializer/ToTextSAXHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
similarity index 97%
rename from src/org/apache/xml/serializer/ToTextSAXHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
index 78c6ab08b..c203eb8ad 100644
--- a/src/org/apache/xml/serializer/ToTextSAXHandler.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
@@ -69,9 +69,7 @@ public ToTextSAXHandler(ContentHandler hdlr, LexicalHandler lex, String encoding
super(hdlr, lex, encoding);
}
- /**
- * From XSLTC
- */
+ // This constructor supports XSLTC
public ToTextSAXHandler(ContentHandler handler, String encoding)
{
super(handler,encoding);
@@ -120,9 +118,9 @@ public Writer getWriter()
}
/**
- * 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/src/org/apache/xml/serializer/ToTextStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToTextStream.java
similarity index 98%
rename from src/org/apache/xml/serializer/ToTextStream.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToTextStream.java
index 312bc8b87..cf22d68a1 100644
--- a/src/org/apache/xml/serializer/ToTextStream.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToTextStream.java
@@ -57,8 +57,6 @@ public ToTextStream()
*
* @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 @@ protected void startDocumentInternal() throws org.xml.sax.SAXException
*
* @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 void endDocument() throws org.xml.sax.SAXException
* 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 void startElement(
* 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 void charactersRaw(char ch[], int start, int length)
* @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 void cdata(char ch[], int start, int length)
* @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 void ignorableWhitespace(char ch[], int start, int length)
* 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 void comment(char ch[], int start, int length)
*
* @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/src/org/apache/xml/serializer/ToUnknownStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
similarity index 99%
rename from src/org/apache/xml/serializer/ToUnknownStream.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
index e7ed0e010..b4777772a 100644
--- a/src/org/apache/xml/serializer/ToUnknownStream.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
@@ -37,9 +37,9 @@
/**
- *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 then the wrapped object is an HTML
+ * tag is seen. If the first tag is <html> 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/src/org/apache/xml/serializer/ToXMLSAXHandler.java b/serializer/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
similarity index 97%
rename from src/org/apache/xml/serializer/ToXMLSAXHandler.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
index eb18c8a2f..a9b9cc4f5 100644
--- a/src/org/apache/xml/serializer/ToXMLSAXHandler.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
@@ -83,14 +83,17 @@ public Writer getWriter()
/**
* 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 @@ protected void closeStartTag() throws SAXException
* 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 ToXMLSAXHandler(
/**
* Start an element in the output document. This might be an XML element
- * (data type) or a CDATA section.
+ * (<elem>data</elem> type) or a CDATA section.
*/
public void startElement(
String elementNamespaceURI,
@@ -570,9 +572,11 @@ public void namespaceAfterStartElement(
}
/**
- *
- * @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 void processingInstruction(String target, String data)
/**
* 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/src/org/apache/xml/serializer/ToXMLStream.java b/serializer/src/main/java/org/apache/xml/serializer/ToXMLStream.java
similarity index 97%
rename from src/org/apache/xml/serializer/ToXMLStream.java
rename to serializer/src/main/java/org/apache/xml/serializer/ToXMLStream.java
index e1ca8447b..da444c348 100644
--- a/src/org/apache/xml/serializer/ToXMLStream.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/ToXMLStream.java
@@ -102,8 +102,6 @@ public void CopyFrom(ToXMLStream xmlListener)
*
* @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 void startDocumentInternal() throws org.xml.sax.SAXException
*
* @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 void endDocument() throws org.xml.sax.SAXException
* The contents of the whitespace preserving section will be delivered
* through the regular characters 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 void startPreserving() throws org.xml.sax.SAXException
*
* @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 void endPreserving() throws org.xml.sax.SAXException
* 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 @@ else if (m_needToCallStartDocument)
*
* @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 void addUniqueAttribute(String name, String value, int flags)
/**
* 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 void namespaceAfterStartElement(
* 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/src/org/apache/xml/serializer/TransformStateSetter.java b/serializer/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
similarity index 91%
rename from src/org/apache/xml/serializer/TransformStateSetter.java
rename to serializer/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
index 0375773be..2f8dc9491 100644
--- a/src/org/apache/xml/serializer/TransformStateSetter.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
@@ -25,7 +25,7 @@
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/src/org/apache/xml/serializer/TreeWalker.java b/serializer/src/main/java/org/apache/xml/serializer/TreeWalker.java
similarity index 96%
rename from src/org/apache/xml/serializer/TreeWalker.java
rename to serializer/src/main/java/org/apache/xml/serializer/TreeWalker.java
index 756a5da4f..fd3e225f1 100644
--- a/src/org/apache/xml/serializer/TreeWalker.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/TreeWalker.java
@@ -24,6 +24,7 @@
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.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 TreeWalker(ContentHandler ch) {
* 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 TreeWalker(ContentHandler contentHandler, String systemId)
*
* @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 void traverse(Node pos) throws org.xml.sax.SAXException
* @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 void traverse(Node pos, Node top) throws org.xml.sax.SAXException
/**
* 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 @@ private final void dispatachChars(Node node)
*
*
* @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 @@ else if (colon > 0) {
}
else
{
-
// warning("Can not output entity to a pure SAX ContentHandler");
}
}
@@ -443,7 +446,7 @@ else if (colon > 0) {
*
* @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/java/org/apache/xml/serializer/Version.java b/serializer/src/main/java/org/apache/xml/serializer/Version.java
new file mode 100644
index 000000000..240d56199
--- /dev/null
+++ b/serializer/src/main/java/org/apache/xml/serializer/Version.java
@@ -0,0 +1,150 @@
+/*
+ * 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.xml.serializer;
+
+/**
+ * Administrative class to keep track of the version number of
+ * the Serializer release.
+ *
This class implements the upcoming standard of having
+ * org.apache.project-name.Version.getVersion() be a standard way
+ * to get version information.
+ * @xsl.usage general
+ */
+public final class Version
+{
+
+ /**
+ * Get the basic version string for the current Serializer.
+ * Version String formatted like
+ * "Serializer Java v.r[.dd| D nn]".
+ *
+ * Futurework: have this read version info from jar manifest.
+ *
+ * @return String denoting our current version
+ */
+ public static String getVersion()
+ {
+ return getProduct()+" "+getImplementationLanguage()+" "
+ +getMajorVersionNum()+"."+getReleaseVersionNum()+"."
+ +( (getDevelopmentVersionNum() > 0) ?
+ ("D"+getDevelopmentVersionNum()) : (""+getMaintenanceVersionNum()));
+ }
+
+ /**
+ * Print the processor version to the command line.
+ *
+ * @param argv command line arguments, unused.
+ */
+ public static void main(String argv[])
+ {
+ System.out.println(getVersion());
+ }
+
+ /**
+ * @return String name of product: Serializer.
+ */
+ public static String getProduct()
+ {
+ return "Serializer";
+ }
+
+ /**
+ * @return String implementation Language: Java.
+ */
+ public static String getImplementationLanguage()
+ {
+ return "Java";
+ }
+
+
+ /**
+ * @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
+ * version.
+ *
+ * Clients should carefully consider the implications
+ * of new versions as external interfaces and behaviour
+ * may have changed.
+ */
+ public static int getMajorVersionNum()
+ {
+ return 2;
+
+ }
+
+ /**
+ * @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.
+ * - API or behaviour change.
+ * - its designated as a reference release.
+ */
+ public static int getReleaseVersionNum()
+ {
+ return 7;
+ }
+
+ /**
+ * @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
+ * with the release and contains no API changes.
+ * When missing, it designates the final and complete
+ * development drop for a release.
+ */
+ public static int getMaintenanceVersionNum()
+ {
+ return 3;
+ }
+
+ /**
+ * @return int Development Drop Number.
+ * Optional identifier designates development drop of
+ * a specific release. D01 is the first development drop
+ * of a new release.
+ *
+ * Development drops are works in progress towards a
+ * compeleted, final release. A specific development drop
+ * may not completely implement all aspects of a new
+ * feature, which may take several development drops to
+ * complete. At the point of the final drop for the
+ * release, the D suffix will be omitted.
+ *
+ * Each 'D' drops can contain functional enhancements as
+ * well as defect fixes. 'D' drops may not be as stable as
+ * the final releases.
+ */
+ public static int getDevelopmentVersionNum()
+ {
+ try {
+ if ((new String("")).length() == 0)
+ return 0;
+ else
+ return Integer.parseInt("");
+ } catch (NumberFormatException nfe) {
+ return 0;
+ }
+ }
+}
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 97%
rename from src/org/apache/xml/serializer/XSLOutputAttributes.java
rename to serializer/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java
index f5676f783..a285b154e 100644
--- a/src/org/apache/xml/serializer/XSLOutputAttributes.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java
@@ -28,7 +28,7 @@
*
* In an XSLT stylesheet these attributes appear for example as:
*
- *
* The xsl:output attributes covered in this interface are:
*
@@ -215,7 +215,7 @@ interface XSLOutputAttributes
* "{http://xml.apache.org/xalan}indent-amount"
* "{http://xml.apache.org/xalan}line-separator"
*
- * @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
* "{http://xml.apache.org/xalan}indent-amount"
* "{http://xml.apache.org/xalan}line-separator"
*
- * @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/src/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
similarity index 97%
rename from src/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
index 3f765d9e6..e382ba5d7 100644
--- a/src/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
@@ -87,7 +87,7 @@ public LSSerializerFilter getNodeFilter() {
}
/**
- * 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/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 99%
rename from src/org/apache/xml/serializer/dom3/LSSerializerImpl.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java
index c2ce783e6..7ce20c3b6 100644
--- a/src/org/apache/xml/serializer/dom3/LSSerializerImpl.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java
@@ -1363,9 +1363,7 @@ public boolean writeToURI(Node nodeArg, String uri) throws LSException {
*
* @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 @@ protected String getXMLVersion(Node nodeArg) {
/**
* 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/src/org/apache/xml/serializer/dom3/NamespaceSupport.java b/serializer/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
similarity index 79%
rename from src/org/apache/xml/serializer/dom3/NamespaceSupport.java
rename to serializer/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
index 445f3eb9d..a7eb6bffa 100644
--- a/src/org/apache/xml/serializer/dom3/NamespaceSupport.java
+++ b/serializer/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
@@ -150,6 +150,9 @@ public void popContext() {
} // 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 boolean declarePrefix(String prefix, String uri) {
} // 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 String getURI(String prefix) {
} // 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 String getPrefix(String uri) {
} // 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 Enumeration getAllPrefixes() {
}
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 String toString(){
return buf.toString();
}
-}
-
+ }
+
} // class NamespaceSupport
diff --git a/serializer/src/main/java/org/apache/xml/serializer/package.html b/serializer/src/main/java/org/apache/xml/serializer/package.html
new file mode 100644
index 000000000..d4dffd139
--- /dev/null
+++ b/serializer/src/main/java/org/apache/xml/serializer/package.html
@@ -0,0 +1,43 @@
+
+
+
+ Xalan Serializer Package.
+
+ Processes SAX events into streams.
+
+ The {@link org.apache.xml.serializer.SerializerFactory} is used to
+ create a {@link org.apache.xml.serializer.Serializer} from a set of
+ output properties (see {@link javax.xml.transform.OutputKeys}).
+ {@link org.apache.xml.serializer.ToStream} acts as the main
+ baseclass for the Xalan serializer implementations.
+ {@link org.apache.xml.serializer.ToHTMLStream} derives from this
+ to implement HTML serialization.
+ {@link org.apache.xml.serializer.ToTextStream}
+ implements plain text serialization.
+ {@link org.apache.xml.serializer.ToXMLStream}
+ implements XML serialization.
+
+ XML mapping from characters to entity references is defined in
+ XMLEntities.res. HTML entity reference mapping is defined in HTMLEntities.res.
+
+ Encoding information is defined in {@link org.apache.xml.serializer.Encodings}.
+
+
+
+
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 99%
rename from src/org/apache/xml/serializer/utils/BoolStack.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/BoolStack.java
index 68cea4229..e1f49d6bc 100644
--- a/src/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/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 95%
rename from src/org/apache/xml/serializer/utils/XML11Char.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/XML11Char.java
index b32249ed5..f6756cc15 100644
--- a/src/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 static boolean isXML11Space(int c) {
} // 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.
*
* If the program chooses to apply the mask directly to the
@@ -177,7 +177,7 @@ public static boolean isXML11Valid(int c) {
} // 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 static boolean isXML11Invalid(int c) {
} // 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 static boolean isXML11ValidLiteral(int c) {
} // 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 static boolean isXML11Content(int c) {
} // 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 static boolean isXML11InternalEntityContent(int c) {
} // 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 static boolean isXML11NameStart(int c) {
} // 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 static boolean isXML11Name(int c) {
} // 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 static boolean isXML11NCNameStart(int c) {
} // 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 static boolean isXML11NCName(int c) {
} // 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/src/org/apache/xml/serializer/utils/XMLChar.java b/serializer/src/main/java/org/apache/xml/serializer/utils/XMLChar.java
similarity index 97%
rename from src/org/apache/xml/serializer/utils/XMLChar.java
rename to serializer/src/main/java/org/apache/xml/serializer/utils/XMLChar.java
index a0d8c8523..f38e8f096 100644
--- a/src/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 static boolean isSupplemental(int c) {
}
/**
- * 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 static int supplemental(char h, char l) {
}
/**
- * 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 static char highSurrogate(int c) {
}
/**
- * 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 static char lowSurrogate(int c) {
}
/**
- * 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 static boolean isHighSurrogate(int c) {
}
/**
- * 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 static boolean isLowSurrogate(int c) {
/**
- * 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.
*
* If the program chooses to apply the mask directly to the
@@ -794,7 +794,7 @@ public static boolean isValid(int c) {
} // 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 static boolean isInvalid(int c) {
} // 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 static boolean isContent(int c) {
} // 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 '<', '&', and '%'.
*
* @param c The character to check.
@@ -823,7 +823,7 @@ public static boolean isMarkup(int c) {
} // 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 static boolean isSpace(int c) {
} // 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 static boolean isNameStart(int c) {
} // 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 static boolean isName(int c) {
} // 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 static boolean isNCNameStart(int c) {
} // 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 static boolean isNCName(int c) {
} // 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 static boolean isValidNmtoken(String nmtoken) {
// 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 static boolean isValidIANAEncoding(String ianaEncoding) {
} // 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 000000000..dcc37db88
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 000000000..37049cbfe
Binary files /dev/null and b/serializer/tools/xalan2jtaglet.jar differ
diff --git a/src/org/apache/xalan/Version.java b/src/org/apache/xalan/Version.java
new file mode 100644
index 000000000..7b4a39538
--- /dev/null
+++ b/src/org/apache/xalan/Version.java
@@ -0,0 +1,153 @@
+/*
+ * 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;
+
+/**
+ * Administrative class to keep track of the version number of
+ * the Xalan release.
+ *
This class implements the upcoming standard of having
+ * org.apache.project-name.Version.getVersion() be a standard way
+ * to get version information. This class will replace the older
+ * org.apache.xalan.processor.Version class.
+ * See also: org/apache/xalan/res/XSLTInfo.properties for
+ * information about the version of the XSLT spec we support.
+ * @xsl.usage general
+ */
+public class Version
+{
+
+ /**
+ * Get the basic version string for the current Xalan release.
+ * Version String formatted like
+ * "Xalan Java v.r[.dd| D nn]".
+ *
+ * Futurework: have this read version info from jar manifest.
+ *
+ * @return String denoting our current version
+ */
+ public static String getVersion()
+ {
+ return getProduct()+" "+getImplementationLanguage()+" "
+ +getMajorVersionNum()+"."+getReleaseVersionNum()+"."
+ +( (getDevelopmentVersionNum() > 0) ?
+ ("D"+getDevelopmentVersionNum()) : (""+getMaintenanceVersionNum()));
+ }
+
+ /**
+ * Print the processor version to the command line.
+ *
+ * @param argv command line arguments, unused.
+ */
+ public static void main(String argv[])
+ {
+ System.out.println(getVersion());
+ }
+
+ /**
+ * Name of product: Xalan.
+ */
+ public static String getProduct()
+ {
+ return "Xalan";
+ }
+
+ /**
+ * Implementation Language: Java.
+ */
+ public static String getImplementationLanguage()
+ {
+ return "Java";
+ }
+
+
+ /**
+ * 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
+ * version.
+ *
+ * Clients should carefully consider the implications
+ * of new versions as external interfaces and behaviour
+ * may have changed.
+ */
+ public static int getMajorVersionNum()
+ {
+ return 2;
+
+ }
+
+ /**
+ * Release Number.
+ * Release number. This changes when:
+ * - a new set of functionality is to be added, eg,
+ * implementation of a new W3C specification.
+ * - API or behaviour change.
+ * - its designated as a reference release.
+ */
+ public static int getReleaseVersionNum()
+ {
+ return 7;
+ }
+
+ /**
+ * Maintenance Drop Number.
+ * Optional identifier used to designate maintenance
+ * drop applied to a specific release and contains
+ * fixes for defects reported. It maintains compatibility
+ * with the release and contains no API changes.
+ * When missing, it designates the final and complete
+ * development drop for a release.
+ */
+ public static int getMaintenanceVersionNum()
+ {
+ return 3;
+ }
+
+ /**
+ * Development Drop Number.
+ * Optional identifier designates development drop of
+ * a specific release. D01 is the first development drop
+ * of a new release.
+ *
+ * Development drops are works in progress towards a
+ * compeleted, final release. A specific development drop
+ * may not completely implement all aspects of a new
+ * feature, which may take several development drops to
+ * complete. At the point of the final drop for the
+ * release, the D suffix will be omitted.
+ *
+ * Each 'D' drops can contain functional enhancements as
+ * well as defect fixes. 'D' drops may not be as stable as
+ * the final releases.
+ */
+ public static int getDevelopmentVersionNum()
+ {
+ try {
+ if ((new String("")).length() == 0)
+ return 0;
+ else
+ 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 6ca533d35..000000000
--- 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:
- * java org.apache.xalan.xsltc.utils.JavaCupRedirect [args] -stdin filename.ext
- *
- * @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 '
- 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 469b3bd7c..000000000
Binary files a/src/xml-commons-external-1.3.02-src.tar.gz and /dev/null differ
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/stylebook/sources/entities.src b/stylebook/sources/entities.src
new file mode 100644
index 000000000..b58c39218
--- /dev/null
+++ b/stylebook/sources/entities.src
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ '>
+
+
+ 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 &xslt4jc-short; Design.
+ '>
+
+For &xslt4jc-short; changes since &xslt4jc-short; was incorporated into &xslt4j;, see
+
'>
+
+
+
+
+ You can use the JAXP interfaces to compile and run translets.
+ For an overview of the usage patterns these samples illustrate, see
+
+
+ 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.
+ Run this sample from the translets subdirectory with
+ java JAXPTransletOneTransformation
+ View the result in todo.html.
+
+ 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.
+ Run this sample from the translets subdirectory with
+ java JAXPTransletMultipleTransformations
+ View the results in todo.html and todotoo.html.
+
+ Other &xslt4jc-short; samples are located in the following samples subdirectories:
+
+ CompiledServlet
+ CompiledBrazil
+ CompiledJAXP
+ CompiledApplet
+ CompiledEJB
+
+ For information about each of these samples, consult the README file in the subdirectory.
+ &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).
+ To run the Brazil-handler demo, download Brazil from sunlabs:
+ http://research.sun.com/research/download/index.html
+ The translet must be specified as a pure class name,
+ accessible through the Brazil-handler's classpath. For
+ example:
+ translet=mk054
+ The document must be specified as a valid URL. For example:
+ document=http://server/path/to/filename.xml
+ If the file is local to the Brazil handler, it has to be
+ specified using the "file:filename.xml" format.
+ In order to run the Brazil-handler demo, you also need to
+ make the Brazil and javax classes available from your
+ classpath
+ To run the servlet demo, download the java extensions for servlets from Sun:
+
+
+ http://java.sun.com/products/servlet/download.html
+
+ '>
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/stylebook/sources/xalan/DONE b/stylebook/sources/xalan/DONE
new file mode 100644
index 000000000..e69de29bb
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/stylebook/sources/xalan/xalan-collate.xml b/stylebook/sources/xalan/xalan-collate.xml
new file mode 100644
index 000000000..947ac93d7
--- /dev/null
+++ b/stylebook/sources/xalan/xalan-collate.xml
@@ -0,0 +1,107 @@
+
+
+
+ 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.
+ 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.
+ In general, the "read" APIs to DTM resemble those of the W3C Document Object Model
+ (
+ DTM is intended to be a read-only model, and so does not attempt to replicate the DOM's write or
+ create-node operations.
+ The details of constructing a DTM vary depending on which implementation of this API you are
+ using. Two reference implementations are currently available:
+
+ SAX2DTM (built via a SAX stream)
+ DOM2DTM (which provides DTM access to an existing DOM)
+
+ Both DTMs can be built incrementally (see
+ For the convenience of user-written extensions, a proxy mechanism presents the contents of the
+ DTM as a read-only subset of the DOM.
+
+
+
+ Xalan-Java implements two DTM performance features that you can control with the TransformerFactory
+ setAttribute(String name, Object value) method.
+
+
+ Attribute name (URL)
+ Default setting
+ Description
+
+
+ "http://xml.apache.org/xalan/features/incremental"
+ false
+
+
+ "http://xml.apache.org/xalan/features/optimize"
+ true
+
+
+ Both of these DTM settings are described below.
+
+
+
+ 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.
+ 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.
+ The incremental feature is not currently supported by the XSLT Compiling processor, XSLTC.
+ Example: setting incremental transforms to true (for the XSLT Interpretive processor):
+ 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);
+ ...
+
+
+
+ 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.
+
+
+
+
+ The DTM also provides a setting that you can use to track location information for each node in
+ the source document. See
+
+
+
+
+
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/stylebook/style/resources/bottom.gif b/stylebook/style/resources/bottom.gif
new file mode 100644
index 000000000..f39031efa
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 000000000..08b880a74
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 000000000..134580f37
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 000000000..3bf0be395
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 000000000..d383d3dd9
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 000000000..01d095ce4
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 000000000..5719c7ef0
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 000000000..48a9782ce
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 000000000..6227d1d86
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 000000000..02e7611bb
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 000000000..fd25c3943
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 000000000..53538c3f6
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 000000000..339422266
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 000000000..bcb50e386
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 000000000..2f89588ff
--- /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 000000000..e7749432f
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 000000000..75b945d25
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 000000000..51a8e5a04
--- /dev/null
+++ b/stylebook/style/stylesheets/any2header.xsl
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 000000000..2a29c06f5
--- /dev/null
+++ b/stylebook/style/stylesheets/any2project.xsl
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 000000000..34ac963e8
--- /dev/null
+++ b/stylebook/style/stylesheets/book2group.xsl
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 000000000..41d34e2a9
--- /dev/null
+++ b/stylebook/style/stylesheets/book2project.xsl
@@ -0,0 +1,257 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 000000000..dccbcfce7
--- /dev/null
+++ b/stylebook/style/stylesheets/changes2document.xsl
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 000000000..f50cdf2f9
--- /dev/null
+++ b/stylebook/style/stylesheets/context2footer.xsl
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 000000000..3c25e5217
--- /dev/null
+++ b/stylebook/style/stylesheets/context2label.xsl
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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/stylebook/style/stylesheets/directory2project.xsl b/stylebook/style/stylesheets/directory2project.xsl
new file mode 100644
index 000000000..48a4581c8
--- /dev/null
+++ b/stylebook/style/stylesheets/directory2project.xsl
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 000000000..1c2de8f20
--- /dev/null
+++ b/stylebook/style/stylesheets/document2html.xsl
@@ -0,0 +1,445 @@
+
+
+
+
+
+
+
+
+
+
+
+ <xsl:value-of select="@title"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Copyright ©
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ anchor
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xdocs/style/stylesheets/done.xsl b/stylebook/style/stylesheets/done.xsl
similarity index 97%
rename from xdocs/style/stylesheets/done.xsl
rename to stylebook/style/stylesheets/done.xsl
index a7e4753fd..cc1bb745e 100644
--- a/xdocs/style/stylesheets/done.xsl
+++ b/stylebook/style/stylesheets/done.xsl
@@ -1,67 +1,67 @@
-
-
-
-
-
-
-
-
-
- This XML fragment contains a list of source code updates to place in an <s3> section of readme.xml
-
- Core (Non-XSLTC) source code updates:
-
-
-
- This release includes no updates of the non-XSLTC core source code.
-
-
-
-
- XSLTC source code updates:
-
-
-
-
-
- This release includes no updates of the XSLTC source code.
-
-
-
-
-
-
- [Committed by ]
-
- [ on ]
-
- [Modified: ]
-
- [Added: ]
-
- [Removed: ]
-
- [Committer's log entry: ]
-
+
+
+
+
+
+
+
+
+
+ This XML fragment contains a list of source code updates to place in an <s3> section of readme.xml
+
+ Core (Non-XSLTC) source code updates:
+
+
+
+ This release includes no updates of the non-XSLTC core source code.
+
+
+
+
+ XSLTC source code updates:
+
+
+
+
+
+ This release includes no updates of the XSLTC source code.
+
+
+
+
+
+
+ [Committed by ]
+
+ [ on ]
+
+ [Modified: ]
+
+ [Added: ]
+
+ [Removed: ]
+
+ [Committer's log entry: ]
+
\ 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 000000000..3c657fe0a
--- /dev/null
+++ b/stylebook/style/stylesheets/faqs2document.xsl
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/stylebook/style/stylesheets/group2document.xsl b/stylebook/style/stylesheets/group2document.xsl
new file mode 100644
index 000000000..19e1515bc
--- /dev/null
+++ b/stylebook/style/stylesheets/group2document.xsl
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Read the
+
+
+
+
+
+
+
+
\ No newline at end of file
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/stylebook_docgen.bat b/stylebook_docgen.bat
new file mode 100755
index 000000000..63499b8c0
--- /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 000000000..ebbff56e7
--- /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 1c977f32a..000000000
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 7cf87e838..000000000
Binary files a/tools/ant.jar and /dev/null differ
diff --git a/tools/antRun b/tools/antRun
deleted file mode 100644
index f0a18f165..000000000
--- 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 a989b67d4..000000000
--- 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 3e12262fb..000000000
Binary files a/tools/java_cup.jar and /dev/null differ
diff --git a/xalan/.classpath b/xalan/.classpath
new file mode 100644
index 000000000..64a0cf9dd
--- /dev/null
+++ b/xalan/.classpath
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xalan/.gitignore b/xalan/.gitignore
new file mode 100644
index 000000000..b83d22266
--- /dev/null
+++ b/xalan/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/xalan/.project b/xalan/.project
new file mode 100644
index 000000000..7bd125a81
--- /dev/null
+++ b/xalan/.project
@@ -0,0 +1,23 @@
+
+
+ xalan
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ org.eclipse.m2e.core.maven2Nature
+
+
diff --git a/xalan/.settings/org.eclipse.core.resources.prefs b/xalan/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..afad90662
--- /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/=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 000000000..2f5cc74c3
--- /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 000000000..f897a7f1c
--- /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 000000000..a47df1a45
--- /dev/null
+++ b/xalan/pom.xml
@@ -0,0 +1,225 @@
+
+ 4.0.0
+
+ xalan
+ xalan-project
+ 2.7.3
+
+
+ xalan
+ Apache Xalan-Java
+ Apache's XSLT processor
+
+ UTF-8
+
+
+ src/main/java
+
+
+ META-INF
+
+ LICENSE.txt
+ NOTICE.txt
+
+
+
+ src/main/resources
+
+ **/*.properties
+
+
+
+
+
+ maven-compiler-plugin
+ 3.8.1
+
+ 1.8
+ 1.8
+
+
+
+
+
+
+
+ com.github.vbmacher
+ cup-maven-plugin
+ 11b-20160615-2
+
+
+
+ generate
+
+
+
+
+ XPathParser
+ sym
+ ${project.basedir}/src/main/java/org/apache/xalan/xsltc/compiler/xpath.cup
+ ${project.basedir}/src/main/java
+
+
+
+
+
+
+ de.jflex
+ jflex-maven-plugin
+ 1.9.1
+
+
+
+ generate
+
+
+ true
+ src/main/java
+
+ src/main/java/org/apache/xalan/xsltc/compiler/xpath.lex
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.5.0
+
+
+ package
+
+ shade
+
+
+
+
+
+ junit:junit
+ jmock:*
+ org.apache.maven:lib:tests
+
+ com.github.vbmacher:java-cup
+ commons-logging:commons-logging
+ org.apache.commons:commons-lang3
+ org.apache.ant:ant
+ org.apache.ant:ant-launcher
+ xalan:serializer
+ de.jflex:jflex
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xalan
+ serializer
+ 2.7.3
+
+
+
+
+ org.apache.bcel
+ bcel
+ 6.7.0
+
+
+
+ commons-logging
+ commons-logging
+ 1.2
+ provided
+
+
+
+ org.mozilla
+ rhino
+ 1.7.14
+ provided
+
+
+
+ org.apache.bsf
+ bsf-api
+ 3.1
+ provided
+
+
+
+ javax
+ javaee-api
+ 6.0
+ provided
+
+
+
+ javax.servlet
+ servlet-api
+ 2.5
+ provided
+
+
+
+ xerces
+ xercesImpl
+ 2.12.2
+ provided
+
+
+
+ xml-apis
+ xml-apis
+ 1.4.01
+
+ provided
+
+
+
+
+
+ com.github.vbmacher
+ java-cup
+ 11b-20160615-2
+ provided
+
+
+ com.github.vbmacher
+ java-cup-runtime
+ 11b-20160615-2
+
+
+
+ de.jflex
+ jflex
+ 1.9.1
+ provided
+
+
+
+ regexp
+ regexp
+ 1.3
+
+
+
+
+
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/xalan/src/main/java/MANIFEST.SERIALIZER b/xalan/src/main/java/MANIFEST.SERIALIZER
new file mode 100644
index 000000000..54be29121
--- /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/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/xalan/src/main/java/org/apache/xalan/Version.java b/xalan/src/main/java/org/apache/xalan/Version.java
new file mode 100644
index 000000000..7b4a39538
--- /dev/null
+++ b/xalan/src/main/java/org/apache/xalan/Version.java
@@ -0,0 +1,153 @@
+/*
+ * 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;
+
+/**
+ * Administrative class to keep track of the version number of
+ * the Xalan release.
+ * This class implements the upcoming standard of having
+ * org.apache.project-name.Version.getVersion() be a standard way
+ * to get version information. This class will replace the older
+ * org.apache.xalan.processor.Version class.
+ * See also: org/apache/xalan/res/XSLTInfo.properties for
+ * information about the version of the XSLT spec we support.
+ * @xsl.usage general
+ */
+public class Version
+{
+
+ /**
+ * Get the basic version string for the current Xalan release.
+ * Version String formatted like
+ * "Xalan Java v.r[.dd| D nn]".
+ *
+ * Futurework: have this read version info from jar manifest.
+ *
+ * @return String denoting our current version
+ */
+ public static String getVersion()
+ {
+ return getProduct()+" "+getImplementationLanguage()+" "
+ +getMajorVersionNum()+"."+getReleaseVersionNum()+"."
+ +( (getDevelopmentVersionNum() > 0) ?
+ ("D"+getDevelopmentVersionNum()) : (""+getMaintenanceVersionNum()));
+ }
+
+ /**
+ * Print the processor version to the command line.
+ *
+ * @param argv command line arguments, unused.
+ */
+ public static void main(String argv[])
+ {
+ System.out.println(getVersion());
+ }
+
+ /**
+ * Name of product: Xalan.
+ */
+ public static String getProduct()
+ {
+ return "Xalan";
+ }
+
+ /**
+ * Implementation Language: Java.
+ */
+ public static String getImplementationLanguage()
+ {
+ return "Java";
+ }
+
+
+ /**
+ * 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
+ * version.
+ *
+ * Clients should carefully consider the implications
+ * of new versions as external interfaces and behaviour
+ * may have changed.
+ */
+ public static int getMajorVersionNum()
+ {
+ return 2;
+
+ }
+
+ /**
+ * Release Number.
+ * Release number. This changes when:
+ * - a new set of functionality is to be added, eg,
+ * implementation of a new W3C specification.
+ * - API or behaviour change.
+ * - its designated as a reference release.
+ */
+ public static int getReleaseVersionNum()
+ {
+ return 7;
+ }
+
+ /**
+ * Maintenance Drop Number.
+ * Optional identifier used to designate maintenance
+ * drop applied to a specific release and contains
+ * fixes for defects reported. It maintains compatibility
+ * with the release and contains no API changes.
+ * When missing, it designates the final and complete
+ * development drop for a release.
+ */
+ public static int getMaintenanceVersionNum()
+ {
+ return 3;
+ }
+
+ /**
+ * Development Drop Number.
+ * Optional identifier designates development drop of
+ * a specific release. D01 is the first development drop
+ * of a new release.
+ *
+ * Development drops are works in progress towards a
+ * compeleted, final release. A specific development drop
+ * may not completely implement all aspects of a new
+ * feature, which may take several development drops to
+ * complete. At the point of the final drop for the
+ * release, the D suffix will be omitted.
+ *
+ * Each 'D' drops can contain functional enhancements as
+ * well as defect fixes. 'D' drops may not be as stable as
+ * the final releases.
+ */
+ public static int getDevelopmentVersionNum()
+ {
+ try {
+ if ((new String("")).length() == 0)
+ return 0;
+ else
+ return Integer.parseInt("");
+ } catch (NumberFormatException nfe) {
+ return 0;
+ }
+ }
+}
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 96%
rename from src/org/apache/xalan/lib/ExsltStrings.java
rename to xalan/src/main/java/org/apache/xalan/lib/ExsltStrings.java
index e5cad5697..5285837d5 100644
--- a/src/org/apache/xalan/lib/ExsltStrings.java
+++ b/xalan/src/main/java/org/apache/xalan/lib/ExsltStrings.java
@@ -184,9 +184,9 @@ public static String padding(double length)
*
* str:split('a, simple, list', ', ') gives the node set consisting of:
*
- * a
- * simple
- * list
+ * <tokent>a</token>
+ * <tokent>simple</token>
+ * <tokent>list</token>
*
* If the second argument is omitted, the default is the string ' ' (i.e. a space).
*
@@ -253,14 +253,14 @@ public static NodeList split(String str)
*
* str:tokenize('2001-06-03T11:40:23', '-T:') gives the node set consisting of:
*
- * 2001
- * 06
- * 03
- * 11
- * 40
- * 23
+ * <tokent>2001</token>
+ * <tokent>06</token>
+ * <tokent>03</token>
+ * <tokent>11</token>
+ * <tokent>40</token>
+ * <tokent>23</token>
*
- * If the second argument is omitted, the default is the string '
'
+ * If the second argument is omitted, the default is the string '
'
* (i.e. whitespace characters).
*
* If the second argument is an empty string, the function returns a set of token
diff --git a/src/org/apache/xalan/lib/Extensions.java b/xalan/src/main/java/org/apache/xalan/lib/Extensions.java
similarity index 99%
rename from src/org/apache/xalan/lib/Extensions.java
rename to xalan/src/main/java/org/apache/xalan/lib/Extensions.java
index 261f66ff1..62b5c0d03 100644
--- a/src/org/apache/xalan/lib/Extensions.java
+++ b/xalan/src/main/java/org/apache/xalan/lib/Extensions.java
@@ -265,8 +265,8 @@ public static NodeList tokenize(String toTokenize, String delims)
/**
* 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 ( ),
- * linefeed (
), return (
), and space ( ).
+ * Delimiters are whitespace. That is, the delimiters that are used are tab (	),
+ * linefeed (
), return (
), and space ( ).
* Tokens are determined by a call to StringTokenizer.
* If the first argument is an empty string or contains only delimiters, the result
* will be an empty NodeSet.
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 99%
rename from src/org/apache/xalan/lib/PipeDocument.java
rename to xalan/src/main/java/org/apache/xalan/lib/PipeDocument.java
index c8b898ff4..974ae17c3 100644
--- a/src/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:
*
* The base URI for the source attribute is the XML "listing" document. The target attribute is taken as is (base is the current user directory). The target attribute is taken as is (base is the current user directory).
* The stylsheet containg the extension element is the base URI for the
- * stylesheet hrefs.
*/
public void pipeDocument(XSLProcessorContext context, ElemExtensionCall elem)
diff --git a/src/org/apache/xalan/lib/Redirect.java b/xalan/src/main/java/org/apache/xalan/lib/Redirect.java
similarity index 94%
rename from src/org/apache/xalan/lib/Redirect.java
rename to xalan/src/main/java/org/apache/xalan/lib/Redirect.java
index 090df7dce..6208ea46d 100644
--- a/src/org/apache/xalan/lib/Redirect.java
+++ b/xalan/src/main/java/org/apache/xalan/lib/Redirect.java
@@ -77,44 +77,44 @@
*
* Example:
*
- * <?xml version="1.0"?>
+ * <?xml version="1.0"?>
* <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">
*
- * <xsl:template match="/">
- * <out>
+ * <xsl:template match="/">
+ * <out>
* default output.
- * </out>
- * <redirect:open file="doc3.out"/>
- * <redirect:write file="doc3.out">
- * <out>
- * <redirect:write file="doc1.out">
- * <out>
+ * </out>
+ * <redirect:open file="doc3.out"/>
+ * <redirect:write file="doc3.out">
+ * <out>
+ * <redirect:write file="doc1.out">
+ * <out>
* doc1 output.
- * <redirect:write file="doc3.out">
+ * <redirect:write file="doc3.out">
* Some text to doc3
- * </redirect:write>
- * </out>
- * </redirect:write>
- * <redirect:write file="doc2.out">
- * <out>
+ * </redirect:write>
+ * </out>
+ * </redirect:write>
+ * <redirect:write file="doc2.out">
+ * <out>
* doc2 output.
- * <redirect:write file="doc3.out">
+ * <redirect:write file="doc3.out">
* Some more text to doc3
- * <redirect:write select="doc/foo">
+ * <redirect:write select="doc/foo">
* text for doc4
- * </redirect:write>
- * </redirect:write>
- * </out>
- * </redirect:write>
- * </out>
- * </redirect:write>
- * <redirect:close file="doc3.out"/>
- * </xsl:template>
+ * </redirect:write>
+ * </redirect:write>
+ * </out>
+ * </redirect:write>
+ * </out>
+ * </redirect:write>
+ * <redirect:close file="doc3.out"/>
+ * </xsl:template>
*
- * </xsl:stylesheet>
+ * </xsl:stylesheet>
*
*
* @author Scott Boag
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 93%
rename from src/org/apache/xalan/processor/ProcessorExsltFunction.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java
index b40abcccb..00ee976d9 100644
--- a/src/org/apache/xalan/processor/ProcessorExsltFunction.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java
@@ -115,9 +115,14 @@ public void endElement(
}
/**
- * 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/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 98%
rename from src/org/apache/xalan/processor/ProcessorKey.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorKey.java
index 602649c77..e58087ea3 100644
--- a/src/org/apache/xalan/processor/ProcessorKey.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorKey.java
@@ -31,12 +31,12 @@
/**
* TransformerFactory for xsl:key markup.
*
- *
- *
+ * >
*
* @see XSLT DTD
* @see key in XSLT Specification
diff --git a/src/org/apache/xalan/processor/ProcessorLRE.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
similarity index 99%
rename from src/org/apache/xalan/processor/ProcessorLRE.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
index 464a6b893..14669826e 100644
--- a/src/org/apache/xalan/processor/ProcessorLRE.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
@@ -315,6 +315,7 @@ else if (isUnknownTopLevel)
* 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/src/org/apache/xalan/processor/ProcessorNamespaceAlias.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
similarity index 97%
rename from src/org/apache/xalan/processor/ProcessorNamespaceAlias.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
index 336e1e099..74bacdb65 100644
--- a/src/org/apache/xalan/processor/ProcessorNamespaceAlias.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
@@ -29,11 +29,11 @@
* A stylesheet can use the xsl:namespace-alias element to
* declare that one namespace URI is an alias for another namespace URI.
*
- *
- *
+ * >
*
* @see XSLT DTD
* @see literal-result-element in XSLT Specification
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 96%
rename from src/org/apache/xalan/processor/ProcessorPreserveSpace.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java
index 9154cf82e..5823c8581 100644
--- a/src/org/apache/xalan/processor/ProcessorPreserveSpace.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java
@@ -31,8 +31,8 @@
/**
* TransformerFactory for xsl:preserve-space markup.
*
- *
- *
+ * <!ELEMENT xsl:preserve-space EMPTY>
+ * <!ATTLIST xsl:preserve-space elements CDATA #REQUIRED>
*
*/
class ProcessorPreserveSpace extends XSLTElementProcessor
diff --git a/src/org/apache/xalan/processor/ProcessorStripSpace.java b/xalan/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
similarity index 96%
rename from src/org/apache/xalan/processor/ProcessorStripSpace.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
index 9f77bef25..ce661c8f2 100644
--- a/src/org/apache/xalan/processor/ProcessorStripSpace.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
@@ -31,8 +31,8 @@
/**
* TransformerFactory for xsl:strip-space markup.
*
- *
- *
+ * <!ELEMENT xsl:strip-space EMPTY>
+ * <!ATTLIST xsl:strip-space elements CDATA #REQUIRED>
*
*/
class ProcessorStripSpace extends ProcessorPreserveSpace
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 98%
rename from src/org/apache/xalan/processor/ProcessorStylesheetElement.java
rename to xalan/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java
index 8d5159d9e..f647bfa98 100644
--- a/src/org/apache/xalan/processor/ProcessorStylesheetElement.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java
@@ -116,6 +116,7 @@ public void startElement(
/**
* 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/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 99%
rename from src/org/apache/xalan/processor/StylesheetHandler.java
rename to xalan/src/main/java/org/apache/xalan/processor/StylesheetHandler.java
index e8b04382a..421ecbaf6 100644
--- a/src/org/apache/xalan/processor/StylesheetHandler.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/StylesheetHandler.java
@@ -139,6 +139,7 @@ void init(TransformerFactoryImpl processor)
* 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 @@ private void flushCharacters() throws org.xml.sax.SAXException
* @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/src/org/apache/xalan/processor/TransformerFactoryImpl.java b/xalan/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
similarity index 98%
rename from src/org/apache/xalan/processor/TransformerFactoryImpl.java
rename to xalan/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
index 3a7c78cdc..022197be0 100644
--- a/src/org/apache/xalan/processor/TransformerFactoryImpl.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
@@ -241,7 +241,7 @@ javax.xml.transform.Templates processFromNode(Node node, String systemID)
*
* @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 @@ else if (name.equals(FEATURE_SOURCE_LOCATION))
*
* @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 XMLFilter newXMLFilter(Source src)
*
* @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 XMLFilter newXMLFilter(Templates templates)
*
* @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 TransformerHandler newTransformerHandler(Templates templates)
*
* @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/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 94%
rename from src/org/apache/xalan/processor/XSLTElementProcessor.java
rename to xalan/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
index 553832d11..367dbcb4e 100644
--- a/src/org/apache/xalan/processor/XSLTElementProcessor.java
+++ b/xalan/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
@@ -86,6 +86,7 @@ void setElemDef(XSLTElementDef def)
* 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 void unparsedEntityDecl(StylesheetHandler handler, String name,
* 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 void startNonText(StylesheetHandler handler) throws org.xml.sax.SAXExcept
* @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 void startElement(
* @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 void endElement(
* @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 void characters(
* @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 void ignorableWhitespace(
* @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 void processingInstruction(
*
* @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 void skippedEntity(StylesheetHandler handler, String name)
* 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 @@ void setPropertiesFromAttributes(
* 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/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 99%
rename from src/org/apache/xalan/res/XSLTErrorResources.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources.java
index e71f2b1ad..84dfc1672 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources.java
@@ -1450,7 +1450,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_ca.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ca.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_ca.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ca.java
index 6cf2211f5..eff09ad93 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_ca.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ca.java
@@ -1468,7 +1468,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_cs.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_cs.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_cs.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_cs.java
index 98c77a658..f0d240e75 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_cs.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_cs.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_de.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_de.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_de.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_de.java
index 6d25e79df..c8d6c9cbf 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_de.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_de.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/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 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_es.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_es.java
index 77b58728f..b44f920a6 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_es.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_es.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_fr.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_fr.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_fr.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_fr.java
index 1ab47a9be..5beb9f182 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_fr.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_fr.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_hu.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_hu.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_hu.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_hu.java
index 628bd07b0..3ff9e1b9b 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_hu.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_hu.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_it.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_it.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_it.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_it.java
index 8a9048c27..6c71248f5 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_it.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_it.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_ja.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ja.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_ja.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ja.java
index 3b5575844..95b8f8247 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_ja.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ja.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_ko.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ko.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_ko.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ko.java
index d31922c98..887f03156 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_ko.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ko.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_pl.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pl.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_pl.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pl.java
index 3161b7236..779a92718 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_pl.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pl.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_pt_BR.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_pt_BR.java
similarity index 99%
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
index e6a371882..1f591794d 100644
--- a/src/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 Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_ru.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ru.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_ru.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ru.java
index de027de2c..195201330 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_ru.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_ru.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_sk.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sk.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_sk.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sk.java
index 6133f3a4c..44760889d 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_sk.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sk.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_sl.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sl.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_sl.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sl.java
index 74fac0241..0c03fda0d 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_sl.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_sl.java
@@ -1456,7 +1456,7 @@ public Object[][] getContents()
*
* @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/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 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_tr.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_tr.java
index 6cd831fe1..25b581994 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_tr.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_tr.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/src/org/apache/xalan/res/XSLTErrorResources_zh.java b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh.java
similarity index 99%
rename from src/org/apache/xalan/res/XSLTErrorResources_zh.java
rename to xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh.java
index 0d2c80bcb..eec15708d 100644
--- a/src/org/apache/xalan/res/XSLTErrorResources_zh.java
+++ b/xalan/src/main/java/org/apache/xalan/res/XSLTErrorResources_zh.java
@@ -1469,7 +1469,7 @@ public Object[][] getContents()
*
* @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/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 99%
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
index 71aff268f..0e3ad7da2 100644
--- a/src/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 Object[][] getContents()
*
* @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/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 98%
rename from src/org/apache/xalan/serialize/SerializerFactory.java
rename to xalan/src/main/java/org/apache/xalan/serialize/SerializerFactory.java
index 0c7741c7b..b2d22d1c6 100644
--- a/src/org/apache/xalan/serialize/SerializerFactory.java
+++ b/xalan/src/main/java/org/apache/xalan/serialize/SerializerFactory.java
@@ -49,7 +49,7 @@ private 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/src/org/apache/xalan/serialize/SerializerUtils.java b/xalan/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
similarity index 88%
rename from src/org/apache/xalan/serialize/SerializerUtils.java
rename to xalan/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
index 487f6241e..fdb9a7887 100644
--- a/src/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 static void addAttribute(SerializationHandler handler, int attr)
/**
* 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 static void addAttributes(SerializationHandler handler, int src)
* 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 static void outputResultTreeFragment(
}
/**
- * Copy xmlns: attributes in if not already in scope.
+ * Copy xmlns: 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 @@ else if (type == DTM.NAMESPACE_NODE)
/**
* 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 static boolean isDefinedNSDecl(
* 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/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 98%
rename from src/org/apache/xalan/templates/DecimalFormatProperties.java
rename to xalan/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java
index 4b4a6d51e..db2592808 100644
--- a/src/org/apache/xalan/templates/DecimalFormatProperties.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java
@@ -27,8 +27,8 @@
/**
* Implement xsl:decimal-format.
*
- *
- *
+ * >
*
* @see format-number in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemApplyImport.java b/xalan/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
similarity index 97%
rename from src/org/apache/xalan/templates/ElemApplyImport.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
index c6f25b075..67437f22c 100644
--- a/src/org/apache/xalan/templates/ElemApplyImport.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
@@ -29,7 +29,7 @@
/**
* Implement xsl:apply-imports.
*
- *
+ * <!ELEMENT xsl:apply-imports EMPTY>
*
* @see apply-imports in XSLT Specification
* @xsl.usage advanced
@@ -98,7 +98,7 @@ public void execute(
/**
* Add a child to the child list.
- *
+ * <!ELEMENT xsl:apply-imports EMPTY>
*
* @param newChild New element to append to this element's children list
*
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 98%
rename from src/org/apache/xalan/templates/ElemAttribute.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemAttribute.java
index 924f4406d..62ce571cd 100644
--- a/src/org/apache/xalan/templates/ElemAttribute.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemAttribute.java
@@ -206,12 +206,12 @@ void constructNode(
/**
* Add a child to the child list.
- *
- *
+ * >
*
* @param newChild Child to append to the list of this node's children
*
diff --git a/src/org/apache/xalan/templates/ElemAttributeSet.java b/xalan/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
similarity index 97%
rename from src/org/apache/xalan/templates/ElemAttributeSet.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
index a27f1edd4..4cb3edb79 100644
--- a/src/org/apache/xalan/templates/ElemAttributeSet.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
@@ -136,11 +136,11 @@ public void execute(
/**
* Add a child to the child list.
- *
- *
+ * >
*
* @param newChild Child to be added to this node's list of children
*
diff --git a/src/org/apache/xalan/templates/ElemCallTemplate.java b/xalan/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
similarity index 98%
rename from src/org/apache/xalan/templates/ElemCallTemplate.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
index 8c06b6b42..be7f7ea9a 100644
--- a/src/org/apache/xalan/templates/ElemCallTemplate.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
@@ -325,11 +325,11 @@ public void setParamElem(ElemWithParam ParamElem)
/**
* Add a child to the child list.
- *
- *
+ * >
*
* @param newChild Child to add to this node's children list
*
diff --git a/src/org/apache/xalan/templates/ElemChoose.java b/xalan/src/main/java/org/apache/xalan/templates/ElemChoose.java
similarity index 98%
rename from src/org/apache/xalan/templates/ElemChoose.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemChoose.java
index d243c94b7..8a803fb0b 100644
--- a/src/org/apache/xalan/templates/ElemChoose.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemChoose.java
@@ -30,8 +30,8 @@
/**
* Implement xsl:choose.
*
- *
- *
+ * <!ELEMENT xsl:choose (xsl:when+, xsl:otherwise?)>
+ * <!ATTLIST xsl:choose %space-att;>
*
* @see XXX in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemComment.java b/xalan/src/main/java/org/apache/xalan/templates/ElemComment.java
similarity index 97%
rename from src/org/apache/xalan/templates/ElemComment.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemComment.java
index 73790ca21..6abf57142 100644
--- a/src/org/apache/xalan/templates/ElemComment.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemComment.java
@@ -28,8 +28,8 @@
/**
* Implement xsl:comment.
*
- *
- *
+ * <!ELEMENT xsl:comment %char-template;>
+ * <!ATTLIST xsl:comment %space-att;>
*
* @see section-Creating-Comments in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemCopy.java b/xalan/src/main/java/org/apache/xalan/templates/ElemCopy.java
similarity index 98%
rename from src/org/apache/xalan/templates/ElemCopy.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemCopy.java
index b0ba63259..60f0e6349 100644
--- a/src/org/apache/xalan/templates/ElemCopy.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemCopy.java
@@ -32,11 +32,11 @@
/**
* Implement xsl:copy.
*
- *
- *
+ * >
*
* @see copying in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemCopyOf.java b/xalan/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
similarity index 98%
rename from src/org/apache/xalan/templates/ElemCopyOf.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
index 5fadba64c..c776ee536 100644
--- a/src/org/apache/xalan/templates/ElemCopyOf.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
@@ -37,8 +37,8 @@
/**
* Implement xsl:copy-of.
*
- *
- *
+ * <!ELEMENT xsl:copy-of EMPTY>
+ * <!ATTLIST xsl:copy-of select %expr; #REQUIRED>
*
* @see copy-of in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemElement.java b/xalan/src/main/java/org/apache/xalan/templates/ElemElement.java
similarity index 99%
rename from src/org/apache/xalan/templates/ElemElement.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemElement.java
index 3ebbc4f84..0da2bacbf 100644
--- a/src/org/apache/xalan/templates/ElemElement.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemElement.java
@@ -33,13 +33,13 @@
/**
* Implement xsl:element
*
- *
- *
+ * >
*
* @see XXX in XSLT Specification
* @xsl.usage advanced
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 97%
rename from src/org/apache/xalan/templates/ElemFallback.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemFallback.java
index a6a48a909..d58b42e24 100644
--- a/src/org/apache/xalan/templates/ElemFallback.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemFallback.java
@@ -27,8 +27,8 @@
/**
* Implement xsl:fallback.
*
- *
- *
+ * <!ELEMENT xsl:fallback %template;>
+ * <!ATTLIST xsl:fallback %space-att;>
*
* @see fallback in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemForEach.java b/xalan/src/main/java/org/apache/xalan/templates/ElemForEach.java
similarity index 98%
rename from src/org/apache/xalan/templates/ElemForEach.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemForEach.java
index 7f4123a6d..c4a90143c 100644
--- a/src/org/apache/xalan/templates/ElemForEach.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemForEach.java
@@ -41,17 +41,17 @@
/**
* Implement xsl:for-each.
*
- *
+ * >
*
- *
+ * >
*
* @see for-each in XSLT Specification
* @xsl.usage advanced
@@ -475,11 +475,11 @@ public void transformSelectedNodes(TransformerImpl transformer)
/**
* Add a child to the child list.
- *
- *
+ * >
*
* @param newChild Child to add to child list
*
diff --git a/src/org/apache/xalan/templates/ElemIf.java b/xalan/src/main/java/org/apache/xalan/templates/ElemIf.java
similarity index 98%
rename from src/org/apache/xalan/templates/ElemIf.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemIf.java
index e4f1ae059..3b1e59603 100644
--- a/src/org/apache/xalan/templates/ElemIf.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemIf.java
@@ -30,11 +30,11 @@
/**
* Implement xsl:if.
*
- *
- *
+ * >
*
* @see XXX in XSLT Specification
* @xsl.usage advanced
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 97%
rename from src/org/apache/xalan/templates/ElemMessage.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemMessage.java
index 8d702d70d..cc0eb2544 100644
--- a/src/org/apache/xalan/templates/ElemMessage.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemMessage.java
@@ -29,11 +29,11 @@
/**
* Implement xsl:message.
*
- *
- *
+ * >
*
* @see message in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemNumber.java b/xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java
similarity index 99%
rename from src/org/apache/xalan/templates/ElemNumber.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java
index d65c5a54b..eaa2b7221 100644
--- a/src/org/apache/xalan/templates/ElemNumber.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemNumber.java
@@ -56,8 +56,8 @@
/**
* Implement xsl:number.
*
- *
- *
+ * >
*
* @see number in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemOtherwise.java b/xalan/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
similarity index 94%
rename from src/org/apache/xalan/templates/ElemOtherwise.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
index f8fffd846..66ff99893 100644
--- a/src/org/apache/xalan/templates/ElemOtherwise.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
@@ -24,8 +24,8 @@
/**
* Implement xsl:otherwise.
*
- *
- *
+ * <! xsl:otherwise %template;>
+ * <!ATTLIST xsl:otherwise %space-att;>
*
* @see XXX in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemPI.java b/xalan/src/main/java/org/apache/xalan/templates/ElemPI.java
similarity index 98%
rename from src/org/apache/xalan/templates/ElemPI.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemPI.java
index 56f95c63c..bd8bc4660 100644
--- a/src/org/apache/xalan/templates/ElemPI.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemPI.java
@@ -30,11 +30,11 @@
/**
* Implement xsl:processing-instruction.
*
- *
- *
+ * >
*
* @see section-Creating-Processing-Instructions in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemParam.java b/xalan/src/main/java/org/apache/xalan/templates/ElemParam.java
similarity index 98%
rename from src/org/apache/xalan/templates/ElemParam.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemParam.java
index c0a4038e8..9a2713756 100644
--- a/src/org/apache/xalan/templates/ElemParam.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemParam.java
@@ -29,11 +29,11 @@
/**
* Implement xsl:param.
*
- *
- *
+ * >
*
* @see variables in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemSort.java b/xalan/src/main/java/org/apache/xalan/templates/ElemSort.java
similarity index 98%
rename from src/org/apache/xalan/templates/ElemSort.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemSort.java
index 93da544ee..1cc91a9c9 100644
--- a/src/org/apache/xalan/templates/ElemSort.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemSort.java
@@ -29,16 +29,16 @@
/**
* Implement xsl:sort.
*
- *
- *
- *
+ * >
+ * <!-- xsl:sort cannot occur after any other elements or
+ * any non-whitespace character -->
*
* @see sorting in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemTemplate.java b/xalan/src/main/java/org/apache/xalan/templates/ElemTemplate.java
similarity index 99%
rename from src/org/apache/xalan/templates/ElemTemplate.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemTemplate.java
index 5add0aa3c..5858372c2 100644
--- a/src/org/apache/xalan/templates/ElemTemplate.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemTemplate.java
@@ -31,20 +31,20 @@
/**
* Implement xsl:template.
*
- *
+ * >
*
- *
+ * >
*
* @see section-Defining-Template-Rules in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemTemplateElement.java b/xalan/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
similarity index 97%
rename from src/org/apache/xalan/templates/ElemTemplateElement.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
index 807c0b72d..cd4b08d53 100644
--- a/src/org/apache/xalan/templates/ElemTemplateElement.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
@@ -113,14 +113,12 @@ public String getLocalName()
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 StylesheetRoot getStylesheetRoot()
/**
* 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 void recompose(StylesheetRoot root) throws TransformerException
* 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 void compose(StylesheetRoot sroot) throws TransformerException
/**
* 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 void error(String msg)
* @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 ElemTemplateElement removeChild(ElemTemplateElement childETE)
*
* @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 Node replaceChild(Node newChild, Node oldChild) throws DOMException
*
* @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 Node insertBefore(Node newChild, Node refChild) throws DOMException
*
* @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 List getDeclaredPrefixes()
* @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 void setPrefixes(NamespaceSupport nsSupport) throws TransformerException
* 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 @@ void setPrefixTable(List list) {
* @see extension-element in XSLT Specification
*
* @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 boolean containsExcludeResultPrefix(String prefix, String uri)
*
* @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 @@ private boolean excludeResultNSDecl(String prefix, String uri)
* 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 @@ boolean needToCheckExclude()
*
* @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 @@ void executeNSDecls(TransformerImpl transformer) throws TransformerException
* @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 @@ else if (myPrecedence > roPrecedence)
*
* @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 void callVisitors(XSLTVisitor visitor)
/**
* 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 @@ protected void callChildVisitors(XSLTVisitor visitor, boolean callAttributes)
node != null;
node = node.m_nextSibling)
{
- node.callVisitors(visitor);
- }
+ node.callVisitors(visitor);
+ }
}
/**
diff --git a/src/org/apache/xalan/templates/ElemText.java b/xalan/src/main/java/org/apache/xalan/templates/ElemText.java
similarity index 96%
rename from src/org/apache/xalan/templates/ElemText.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemText.java
index ac171be4b..b5c7729c2 100644
--- a/src/org/apache/xalan/templates/ElemText.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemText.java
@@ -27,10 +27,10 @@
* This primarily acts as a marker on the element
* stack to signal that whitespace should be preserved.
*
- *
- *
+ * >
*
* @see section-Creating-Text in XSLT Specification
* @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 & and < (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 void setDisableOutputEscaping(boolean v)
/**
* Get the "disable-output-escaping" attribute.
- * Normally, the xml output method escapes & and < (and
+ * Normally, the xml output method escapes & and < (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/src/org/apache/xalan/templates/ElemTextLiteral.java b/xalan/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
similarity index 98%
rename from src/org/apache/xalan/templates/ElemTextLiteral.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
index bcf017610..226482601 100644
--- a/src/org/apache/xalan/templates/ElemTextLiteral.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
@@ -120,7 +120,7 @@ public synchronized String getNodeValue()
/**
* Set the "disable-output-escaping" attribute.
- * Normally, the xml output method escapes & and < (and
+ * Normally, the xml output method escapes & and < (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 void setDisableOutputEscaping(boolean v)
/**
* Get the "disable-output-escaping" attribute.
- * Normally, the xml output method escapes & and < (and
+ * Normally, the xml output method escapes & and < (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/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 98%
rename from src/org/apache/xalan/templates/ElemValueOf.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemValueOf.java
index 5cf4d4d74..b9b9d37e4 100644
--- a/src/org/apache/xalan/templates/ElemValueOf.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemValueOf.java
@@ -35,11 +35,11 @@
/**
* Implement xsl:value-of.
*
- *
- *
+ * >
*
* @see value-of in XSLT Specification
* @xsl.usage advanced
@@ -102,7 +102,7 @@ public XPath getSelect()
/**
* Set the "disable-output-escaping" attribute.
- * Normally, the xml output method escapes & and < (and
+ * Normally, the xml output method escapes & and < (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 void setDisableOutputEscaping(boolean v)
/**
* Get the "disable-output-escaping" attribute.
- * Normally, the xml output method escapes & and < (and
+ * Normally, the xml output method escapes & and < (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/src/org/apache/xalan/templates/ElemVariable.java b/xalan/src/main/java/org/apache/xalan/templates/ElemVariable.java
similarity index 99%
rename from src/org/apache/xalan/templates/ElemVariable.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemVariable.java
index 12b9374ff..92905eac6 100644
--- a/src/org/apache/xalan/templates/ElemVariable.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemVariable.java
@@ -35,11 +35,11 @@
/**
* Implement xsl:variable.
*
- *
- *
+ * >
*
* @see variables in XSLT Specification
* @xsl.usage advanced
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 97%
rename from src/org/apache/xalan/templates/ElemWhen.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemWhen.java
index 3ca759da9..c404da2e9 100644
--- a/src/org/apache/xalan/templates/ElemWhen.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemWhen.java
@@ -25,11 +25,11 @@
/**
* Implement xsl:when.
*
- *
- *
+ * >
*
* @see XXX in XSLT Specification
* @xsl.usage advanced
diff --git a/src/org/apache/xalan/templates/ElemWithParam.java b/xalan/src/main/java/org/apache/xalan/templates/ElemWithParam.java
similarity index 98%
rename from src/org/apache/xalan/templates/ElemWithParam.java
rename to xalan/src/main/java/org/apache/xalan/templates/ElemWithParam.java
index b638bc810..f0f865b43 100644
--- a/src/org/apache/xalan/templates/ElemWithParam.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/ElemWithParam.java
@@ -35,11 +35,11 @@
* Implement xsl:with-param. xsl:with-param is allowed within
* both xsl:call-template and xsl:apply-templates.
*
- *
- *
+ * >
*
* @see element-with-param in XSLT Specification
* @xsl.usage advanced
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 99%
rename from src/org/apache/xalan/templates/Stylesheet.java
rename to xalan/src/main/java/org/apache/xalan/templates/Stylesheet.java
index a37e77597..6364d4afe 100644
--- a/src/org/apache/xalan/templates/Stylesheet.java
+++ b/xalan/src/main/java/org/apache/xalan/templates/Stylesheet.java
@@ -44,7 +44,7 @@
* defined in the getSetterMethodName
* function.
*
- *
+ * ">
*
- *
+ * '>
*
- *
- *
+ * <!ELEMENT xsl:stylesheet %top-level;>
+ * <!ATTLIST xsl:stylesheet %top-level-atts;>
*
- *
- *
+ * <!ELEMENT xsl:transform %top-level;>
+ * <!ATTLIST xsl:transform %top-level-atts;>
*
*
* @see section-Stylesheet-Structure in XSLT Specification
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 98%
rename from src/org/apache/xalan/transformer/TreeWalker2Result.java
rename to xalan/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java
index 453059bb9..fcb0d6cff 100644
--- a/src/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.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/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 78%
rename from src/org/apache/xalan/xsltc/compiler/xpath.lex
rename to xalan/src/main/java/org/apache/xalan/xsltc/compiler/xpath.lex
index e37194154..7008db280 100644
--- a/src/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/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 98%
rename from src/org/apache/xml/res/XMLMessages.java
rename to xalan/src/main/java/org/apache/xml/res/XMLMessages.java
index c1e31641d..6185ac6cb 100644
--- a/src/org/apache/xml/res/XMLMessages.java
+++ b/xalan/src/main/java/org/apache/xml/res/XMLMessages.java
@@ -160,7 +160,7 @@ public static final String createMsg(ListResourceBundle fResourceBundle,
*
* @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/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 99%
rename from src/org/apache/xml/utils/BoolStack.java
rename to xalan/src/main/java/org/apache/xml/utils/BoolStack.java
index b36ed7079..7bb621970 100644
--- a/src/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/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 99%
rename from src/org/apache/xml/utils/IntStack.java
rename to xalan/src/main/java/org/apache/xml/utils/IntStack.java
index 7969913c5..ce9a28ec4 100644
--- a/src/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/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 99%
rename from src/org/apache/xml/utils/ObjectStack.java
rename to xalan/src/main/java/org/apache/xml/utils/ObjectStack.java
index 7b406f6fa..b91c4eaa5 100644
--- a/src/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/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 90%
rename from src/org/apache/xml/utils/UnImplNode.java
rename to xalan/src/main/java/org/apache/xml/utils/UnImplNode.java
index 8f29913dc..f4d298501 100644
--- a/src/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.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 void error(String msg, Object[] args)
*
* @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 NodeList getElementsByTagName(String name)
*
* @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 Attr removeAttributeNode(Attr oldAttr) throws DOMException
*
* @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 boolean hasAttribute(String name)
}
/**
- * 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 boolean hasAttributeNS(String name, String x)
}
/**
- * 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 Attr getAttributeNode(String name)
}
/**
- * 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 void removeAttribute(String name) throws DOMException
}
/**
- * 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 void setAttribute(String name, String value) throws DOMException
}
/**
- * 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 String getAttribute(String name)
/**
* 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 boolean hasAttributes()
}
/**
- * 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 NodeList getElementsByTagNameNS(String namespaceURI,
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public Attr setAttributeNodeNS(Attr newAttr) throws DOMException
{
@@ -470,7 +475,7 @@ public Attr getAttributeNodeNS(String namespaceURI, String localName)
* @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 void removeAttributeNS(String namespaceURI, String localName)
* 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 Node cloneNode(boolean deep)
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public String getNodeValue() throws DOMException
{
@@ -558,7 +563,7 @@ public String getNodeValue() throws DOMException
*
* @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 void setNodeValue(String nodeValue) throws DOMException
* NEEDSDOC @param value
* @return value Node value
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
// public String getValue ()
@@ -586,19 +591,18 @@ public void setNodeValue(String nodeValue) throws DOMException
*
* @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 void setValue(String value) throws DOMException
* Unimplemented. See org.w3c.dom.Node
*
* @return null
+ * @throws DOMException always, "not supported!"
*/
public Element getOwnerElement()
{
@@ -651,7 +656,7 @@ public NamedNodeMap getAttributes()
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public Node insertBefore(Node newChild, Node refChild) throws DOMException
{
@@ -669,7 +674,7 @@ public Node insertBefore(Node newChild, Node refChild) throws DOMException
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public Node replaceChild(Node newChild, Node oldChild) throws DOMException
{
@@ -686,7 +691,7 @@ public Node replaceChild(Node newChild, Node oldChild) throws DOMException
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public Node removeChild(Node oldChild) throws DOMException
{
@@ -746,7 +751,7 @@ public String getPrefix()
*
* @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 Element getDocumentElement()
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public Element createElement(String tagName) throws DOMException
{
@@ -872,7 +877,7 @@ public Comment createComment(String data)
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public CDATASection createCDATASection(String data) throws DOMException
{
@@ -890,7 +895,7 @@ public CDATASection createCDATASection(String data) throws DOMException
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public ProcessingInstruction createProcessingInstruction(
String target, String data) throws DOMException
@@ -908,7 +913,7 @@ public ProcessingInstruction createProcessingInstruction(
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public Attr createAttribute(String name) throws DOMException
{
@@ -925,7 +930,7 @@ public Attr createAttribute(String name) throws DOMException
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public EntityReference createEntityReference(String name)
throws DOMException
@@ -947,7 +952,7 @@ public EntityReference createEntityReference(String name)
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public Node importNode(Node importedNode, boolean deep) throws DOMException
{
@@ -965,7 +970,7 @@ public Node importNode(Node importedNode, boolean deep) throws DOMException
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public Element createElementNS(String namespaceURI, String qualifiedName)
throws DOMException
@@ -984,7 +989,7 @@ public Element createElementNS(String namespaceURI, String qualifiedName)
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public Attr createAttributeNS(String namespaceURI, String qualifiedName)
throws DOMException
@@ -1016,7 +1021,7 @@ public Element getElementById(String elementId)
*
* @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 void setData(String data) throws DOMException
*
* @return null
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public String substringData(int offset, int count) throws DOMException
{
@@ -1046,7 +1051,7 @@ public String substringData(int offset, int count) throws DOMException
*
* @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 void appendData(String arg) throws DOMException
/**
* 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 void insertData(int offset, String arg) throws DOMException
* @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 void deleteData(int offset, int count) throws DOMException
* @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 void replaceData(int offset, int count, String arg)
*
* @return null, unimplemented
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public Text splitText(int offset) throws DOMException
{
@@ -1119,7 +1124,7 @@ public Text splitText(int offset) throws DOMException
*
* NEEDSDOC (adoptNode) @return
*
- * @throws DOMException
+ * @throws DOMException always, "not supported!"
*/
public Node adoptNode(Node source) throws DOMException
{
@@ -1157,7 +1162,7 @@ public String getInputEncoding()
* of this document. This is null 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 Object getFeature(String feature, String version) {
* Text 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 true, recursively compare the subtrees; if
- * false, compare only the nodes themselves (and its
- * attributes, if it is an Element).
* @return If the nodes, and possibly subtrees are equal,
* true otherwise false.
* @since DOM Level 3
@@ -1367,8 +1369,8 @@ else if (!getBaseURI().equals(((NodeImpl) arg).getBaseURI())) {
* Look up the namespace URI associated to the given prefix, starting from this node.
* Use lookupNamespaceURI(null) to lookup the default namespace
*
- * @param namespaceURI
- * @return th URI for the namespace
+ * @param specifiedPrefix String to be resolved, or null to look up the default namespace
+ * @return String, the URI for the namespace, or null if prefix not bound
* @since DOM Level 3
*/
public String lookupNamespaceURI(String specifiedPrefix) {
@@ -1531,10 +1533,10 @@ public boolean isDefaultNamespace(String namespaceURI){
/**
*
* DOM Level 3:
- * Look up the prefix associated to the given namespace URI, starting from this node.
+ * Look up the prefix associated to the given namespace URI, starting from this node. REVIEW: What happens if more than one prefix is bound to the same namespace? I suspect any valid prefix may be resolved, but there may be some "nearest" logic; check the DOM Level 3 spec.
*
- * @param namespaceURI
- * @return the prefix for the namespace
+ * @param namespaceURI String namespace URI to be resolved to a prefix
+ * @return String prefix for the namespace in this context.
*/
public String lookupPrefix(String namespaceURI){
@@ -1615,6 +1617,7 @@ public boolean isSameNode(Node other) {
*
+ * Text Content of DOM nodes, by node type
*
* Node type
* Content
@@ -1665,6 +1668,7 @@ public void setTextContent(String textContent)
*
+ * Text Content of DOM nodes, by node type
*
* Node type
* Content
@@ -1798,8 +1802,8 @@ public String getDocumentURI(){
/**
* DOM Level 3
- * An attribute specifying the actual encoding of this document. This is
- * null otherwise.
+ * @return a String specifying the actual encoding of this document, or
+ * null if no encoding could be retrieved
* null otherwise.
* null otherwise.
* @since DOM Level 3
*/
public void setActualEncoding(String value) {
@@ -1821,7 +1825,9 @@ public void setActualEncoding(String value) {
}
/**
- * DOM Level 3
+ * DOM Level 3, UNIMPLEMENTED
+ * @param content String, new text to replace all of the node's text content
+ * @return null until implemented.
*/
public Text replaceWholeText(String content)
throws DOMException{
@@ -1871,9 +1877,8 @@ public Text replaceWholeText(String content)
}
/**
- * DOM Level 3
- * Returns all text of Text nodes logically-adjacent text
- * nodes to this node, concatenated in document order.
+ * DOM Level 3, UNIMPLEMENTED.
+ * @return all text of Text nodes logically-adjacent to this node, concatenated in document order... or, in UnImplNode, null.
* @since DOM Level 3
*/
public String getWholeText(){
@@ -1898,24 +1903,28 @@ public String getWholeText(){
/**
* DOM Level 3
- * Returns whether this text node contains whitespace in element content,
- * often abusively called "ignorable whitespace".
+ * @return whether this text node contains whitespace in element
+ * content, often abusively called "ignorable whitespace". In
+ * UnImplNode, return false.
*/
public boolean isWhitespaceInElementContent(){
return false;
}
/**
- * NON-DOM: set the type of this attribute to be ID type.
+ * NON-DOM, UNIMPLEMENTED: set the type of this attribute node to
+ * be ID type.
*
- * @param id
+ * @param id boolean, true or false to set new state
*/
public void setIdAttribute(boolean id){
//PENDING
}
/**
- * DOM Level 3: register the given attribute node as an ID attribute
+ * DOM Level 3: register or deregister the given attribute node of this element as an ID attribute
+ * @param name Attribute node name
+ * @param makeID boolean, true or false to set new state
*/
public void setIdAttribute(String name, boolean makeId) {
//PENDING
@@ -1923,6 +1932,8 @@ public void setIdAttribute(String name, boolean makeId) {
/**
* DOM Level 3: register the given attribute node as an ID attribute
+ * @param at Attr node object to be registered or deregistered
+ * @param makeId boolean, true or false
*/
public void setIdAttributeNode(Attr at, boolean makeId) {
//PENDING
@@ -1930,6 +1941,9 @@ public void setIdAttributeNode(Attr at, boolean makeId) {
/**
* DOM Level 3: register the given attribute node as an ID attribute
+ * @param namespaceURI: String, namespace of attribute to be bound
+ * @param localName String, localName of attribute to be bound
+ * @param makeId boolean, true or false
*/
public void setIdAttributeNS(String namespaceURI, String localName,
boolean makeId) {
@@ -1938,7 +1952,8 @@ public void setIdAttributeNS(String namespaceURI, String localName,
/**
* Method getSchemaTypeInfo.
- * @return TypeInfo
+ * @return TypeInfo for this node, if it has a schema type, or null if not.
+ * (In this implementation, always null)
*/
public TypeInfo getSchemaTypeInfo(){
return null; //PENDING
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 77%
rename from src/org/apache/xpath/ExpressionNode.java
rename to xalan/src/main/java/org/apache/xpath/ExpressionNode.java
index 3a16d7090..a6edd57e5 100644
--- a/src/org/apache/xpath/ExpressionNode.java
+++ b/xalan/src/main/java/org/apache/xpath/ExpressionNode.java
@@ -33,20 +33,28 @@
*/
public interface ExpressionNode extends SourceLocator
{
- /** This pair of methods are used to inform the node of its
- parent. */
+ /** @param n ExpressionNode to be set as parent of this one
+ */
public void exprSetParent(ExpressionNode n);
+ /** @return ExpressionNode currently set as parent of this one
+ */
public ExpressionNode exprGetParent();
/** This method tells the node to add its argument to the node's
- list of children. */
+ list of children.
+ @param n ExpressionNode to be added to the list of children
+ @param i Insertion offset within that list
+ */
public void exprAddChild(ExpressionNode n, int i);
/** This method returns a child node. The children are numbered
- from zero, left to right. */
+ from zero, left to right.
+ @param i Index of child to be returned
+ @return ExpressionNode at that child offset, or null if none found
+ */
public ExpressionNode exprGetChild(int i);
- /** Return the number of children the node has. */
+ /** @return the number of children this ExpressionNode has. */
public int exprGetNumChildren();
}
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 95%
rename from src/org/apache/xpath/WhitespaceStrippingElementMatcher.java
rename to xalan/src/main/java/org/apache/xpath/WhitespaceStrippingElementMatcher.java
index 2af8fdc41..9720f6866 100644
--- a/src/org/apache/xpath/WhitespaceStrippingElementMatcher.java
+++ b/xalan/src/main/java/org/apache/xpath/WhitespaceStrippingElementMatcher.java
@@ -39,7 +39,7 @@ public interface WhitespaceStrippingElementMatcher
*
* @return true if the whitespace should be stripped.
*
- * @throws TransformerException
+ * @throws TransformerException if the question can't be answered (bad arguments, bad state).
*/
public boolean shouldStripWhiteSpace(
XPathContext support, Element targetElement) throws TransformerException;
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 99%
rename from src/org/apache/xpath/axes/LocPathIterator.java
rename to xalan/src/main/java/org/apache/xpath/axes/LocPathIterator.java
index 38ef745d0..23fecf175 100644
--- a/src/org/apache/xpath/axes/LocPathIterator.java
+++ b/xalan/src/main/java/org/apache/xpath/axes/LocPathIterator.java
@@ -598,7 +598,7 @@ public int previousNode()
* show. It is here only to fullfill the DOM NodeIterator
* interface.
*
- * @return For now, always NodeFilter.SHOW_ALL & ~NodeFilter.SHOW_ENTITY_REFERENCE.
+ * @return For now, always NodeFilter.SHOW_ALL & ~NodeFilter.SHOW_ENTITY_REFERENCE.
* @see org.w3c.dom.traversal.NodeIterator
*/
public int getWhatToShow()
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 98%
rename from src/org/apache/xpath/axes/OneStepIteratorForward.java
rename to xalan/src/main/java/org/apache/xpath/axes/OneStepIteratorForward.java
index 2fe1583a8..4af845294 100644
--- a/src/org/apache/xpath/axes/OneStepIteratorForward.java
+++ b/xalan/src/main/java/org/apache/xpath/axes/OneStepIteratorForward.java
@@ -133,7 +133,7 @@ public void setRoot(int context, Object environment)
// }
/**
- * Get the next node via getFirstAttribute && getNextAttribute.
+ * Get the next node via getFirstAttribute and getNextAttribute.
*/
protected int getNextNode()
{
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/xalan/src/site/resources/images/compilation.gif b/xalan/src/site/resources/images/compilation.gif
new file mode 100644
index 000000000..675d7d4ff
Binary files /dev/null and b/xalan/src/site/resources/images/compilation.gif differ
diff --git a/xalan/src/site/resources/images/conceptual.gif b/xalan/src/site/resources/images/conceptual.gif
new file mode 100644
index 000000000..283fee57d
Binary files /dev/null and b/xalan/src/site/resources/images/conceptual.gif differ
diff --git a/xalan/src/site/resources/images/data.gif b/xalan/src/site/resources/images/data.gif
new file mode 100644
index 000000000..0f28a177a
Binary files /dev/null and b/xalan/src/site/resources/images/data.gif differ
diff --git a/xalan/src/site/resources/images/org_apache.gif b/xalan/src/site/resources/images/org_apache.gif
new file mode 100644
index 000000000..105f2643b
Binary files /dev/null and b/xalan/src/site/resources/images/org_apache.gif differ
diff --git a/xalan/src/site/resources/images/trax.gif b/xalan/src/site/resources/images/trax.gif
new file mode 100644
index 000000000..8eb96144d
Binary files /dev/null and b/xalan/src/site/resources/images/trax.gif differ
diff --git a/xalan/src/site/resources/images/xalan1_1x1.gif b/xalan/src/site/resources/images/xalan1_1x1.gif
new file mode 100644
index 000000000..c9e153631
Binary files /dev/null and b/xalan/src/site/resources/images/xalan1_1x1.gif differ
diff --git a/xalan/src/site/resources/images/xmllogo.gif b/xalan/src/site/resources/images/xmllogo.gif
new file mode 100644
index 000000000..b63188dd2
Binary files /dev/null and b/xalan/src/site/resources/images/xmllogo.gif differ
diff --git a/xalan/src/site/resources/images/xpath.gif b/xalan/src/site/resources/images/xpath.gif
new file mode 100644
index 000000000..cf28f9cb7
Binary files /dev/null and b/xalan/src/site/resources/images/xpath.gif differ
diff --git a/xalan/src/site/resources/images/xslt_abstract.gif b/xalan/src/site/resources/images/xslt_abstract.gif
new file mode 100644
index 000000000..fa041a640
Binary files /dev/null and b/xalan/src/site/resources/images/xslt_abstract.gif differ
diff --git a/xalan/src/site/xhtml/design2_0_0.xhtml b/xalan/src/site/xhtml/design2_0_0.xhtml
new file mode 100644
index 000000000..6869f0f86
--- /dev/null
+++ b/xalan/src/site/xhtml/design2_0_0.xhtml
@@ -0,0 +1,277 @@
+Xalan-J 2.0 Design
+ Author: Scott Boag
+ Introduction
+ This document presents the basic design for Xalan-J 2.0, which is a
+ refactoring
+ and redesign of the Xalan-J 1.x processor. This document will expand and grow over time, and is also incomplete in some sections, though hopefully overall accurate. The reader should be able to get a good overall idea of the internal design of Xalan, and begin to understand the process flow, and also the technical challenges.
+ The main goals of this redesign are
+ to:
+ Make the design and code more understandable by Open Source
+ people.
+ Reduce code size and complexity.
+ By simplifying the code, make optimization easier.
+ Make modules generally more localized, and less tangled with other
+ modules.
+ Conform to the javax.xml.transform (TrAX [Transformations for XML]) interfaces.
+ Increase the ability to incrementally produce the result tree.
+ The techniques used toward these goals are to:
+
+ In general, flatten the hierarchy of packages, in order to make the
+ structure more apparent from the top-level view.
+ Break the construction and the validation of the XSLT stylesheet from
+ the stylesheet objects themselves.
+ Drive the construction of the stylesheet through a table, so that it
+ is less prone to error.
+ Break the transformation process into a separate package, away from
+ the stylesheet objects.
+ Create this design document, as a starting point for people interested in
+ approaching the code.
+
+ The goals are not:
+
+ To add more features in the progress of this refactoring. This is
+ design and code clean-up in order to meet the above-named goals. We expect that it will be much easier to add
+ features once this work is completed.
+ To optimize code for the sake of optimization. However, we
+ expect that the code will be faster once this work is complete.
+
+ How well we've achieved the goals will be measured by feedback from the
+ Xalan-dev list, and by software metrics tools.
+ Please note that the diagrams in this design document are meant to be
+ useful abstractions, and may not always be exact.
+ Xalan Requirements
+ These are the concrete general requirements of Xalan, as I understand them, and covering both the Java and C++ versions. These requirements have been built up over time by experience with product groups and general users.
Java, C++ Versions. XSLT 1.0 conformance, and beyond. (i.e. conform to the current W3C recommendation). Have design and Code understandable by Open Source Community. Ability to interoperate with standard APIs. (SAX2, DOM2, JAXP) [this is currently Less of an issue with C++]. High Performance (Raw performance, Incremental ability, Scaleability to large documents, Reduction of Garbage Collection for the Java version.) Tooling API (Access stylesheet data structures, Access source node from result event, Ask runtime questions, Debugging API). Support addressing of XML in standalone fashion (i.e. XPath API). Extensibility (Ability to call Java, Ability to call JavaScript, other languages). Multiple data sources (JDBC, LDAP, other data sources, Direct XML repository coupling). Overview of Architecture
+ The following diagram shows the XSLT abstract processing model. A transformation expressed in XSLT describes rules for transforming a Source Tree into a result tree. The transformation is achieved by associating patterns with templates. A pattern is matched against elements in the source tree. A template is instantiated to create part of the result tree. The result tree is separate from the source tree. The structure of the result tree can be completely different from the structure of the source tree. In constructing the result tree, elements from the source tree can be filtered and reordered, and arbitrary structure can be added.
+
+
The term "tree", as used within this document, describes an
+ abstract structure that consists of nodes or events that may be produced by
+ XML. A Tree physically may be a DOM tree, a series of well balanced parse
+ events (such as those coming from a SAX2 ContentHander), a series of requests
+ (the result of which can describe a tree), or a stream of marked-up
+ characters.
The primary interface for Xalan 2.0 external usage is defined in the javax.xml.transform interfaces. These interfaces define a standard and powerful interface to perform tree-based transformations.
+ The internal architecture of Xalan 2.0 is divided into four major modules, and various smaller
+ modules. The main modules are:
+
+ org.apache.xalan.processor The module that processes the stylesheet, and provides the main
+ entry point into Xalan.
+
+
+ org.apache.xalan.templates The module that defines the stylesheet structures, including the
+ Stylesheet object, template element instructions, and Attribute Value
+ Templates.
+
+
+ org.apache.xalan.transformer The module that applies the source tree to the Templates, and
+ produces a result tree.
+
+
+ org.apache.xpath The module that processes both XPath expressions, and XSLT Match
+ patterns.
+
+ In addition to the above modules, Xalan implements the
+ javax.xml.transform interfaces, and depends on the
+ SAX2 and DOM packages.
+
There is also a general utilities package that contains both XML utility
+ classes such as QName, but generally useful classes such as
+ StringToIntTable.
+ In the diagram below, the dashed lines denote visibility. All packages
+ access the SAX2 and DOM packages.
+
In addition to the above packages, there are the following additional
+ packages:
+
+ org.apache.xalan.client This package has a client applet. I suspect this should be moved
+ into the samples directory.
+
+
+ org.apache.xalan.extensions This holds classes belonging to the Xalan extensions mechanism,
+ which allows Java code and script to be called from within a stylesheet.
+
+
+
+ org.apache.xalan.lib This is the built-in Xalan extensions library, which holds
+ extensions such as Redirect (which allows a stylesheet to produce multiple
+ output files).
+
+
+ org.apache.xalan.res This holds resource files needed by Xalan, such as error message
+ resources.
+
+
+
+ org.apache.xalan.trace This package contains classes and interfaces that allow a caller to
+ add trace listeners to the transformation, allowing an interface to XSLT
+ debuggers and similar tools.
+
+
+ org.apache.xalan.xslt This package holds the Xalan2 command line processor.
+
+ A more conceptual view of this architecture is as follows:
Process Module
+ The org.apache.xalan.processor module implements the
+ javax.xml.transform.TransformerFactory interface, which provides a
+ factory method for creating a concrete Processor instance, and provides methods
+ for creating a javax.xml.transform.Templates instance, which, in
+ Xalan and XSLT terms, is the Stylesheet. Thus the task of the process module is
+ to read the XSLT input in the form of a file, stream, SAX events, or a DOM
+ tree, and produce a Templates/Stylesheet object.
+ The overall strategy is to define a schema in that dictates the legal
+ structure for XSLT elements and attributes, and to associate with those
+ elements construction-time processors that can fill in the appropriate fields
+ in the top-level Stylesheet object, and also associate classes in the templates
+ module that can be created in a generalized fashion. This makes the validation
+ object-to-class associations centralized and declarative.
+ The schema's root class is
+ org.apache.xalan.processor.XSLTSchema , and it is here that the
+ XSLT schema structure is defined. XSLTSchema uses
+ org.apache.xalan.processor.XSLTElementDef to define elements, and
+ org.apache.xalan.processor.XSLTAttributeDef to define attributes.
+ Both classes hold the allowed namespace, local name, and type of element or
+ attribute. The XSLTElementDef also holds a reference to a
+ org.apache.xalan.processor.XSLTElementProcessor , and a sometimes a
+ Class org.apache.xalan.templates.ElemTemplateElement . In addition, the
+ XSLTElementDef instance holds a list of XSLTElementDef instances that define
+ legal elements or character events that are allowed as children of the given
+ element.
+ The implementation of the javax.xml.transform.TransformerFactory
+ interface is in org.apache.xalan.processor.TransformerFactoryImpl ,
+ which creates a org.apache.xalan.processor.StylesheetHandler
+ instance. This instance acts as the ContentHandler for the parse events, and is
+ handed to the org.xml.sax.XMLReader , which the StylesheetProcessor
+ uses to parse the XSLT document. The StylesheetHandler XSLTElementProcessor XSLTElementDef
+ Templates Module
+ The org.apache.xalan.templates module implements the
+ javax.xml.transform.Templates interface, and defines a set of
+ classes that represent a Stylesheet. The primary purpose of this module is to
+ hold stylesheet data, not to perform procedural tasks associated with the
+ construction of the data, nor tasks associated with the transformation itself.
+
+ The base class of all templates objects that are associated with an XSLT element is the ElemTemplateElement object, which in turn implements UnImplNode . A ElemTemplateElement ElemTemplateElement ElemTemplateElement execute method where it performs it's transformation duties. A ElemTemplateElement
A StylesheetRoot , which implements the
+ Templates StylesheetComposed ,
+ which is a Stylesheet composed of itself and all included
+ Stylesheet StylesheetRoot StylesheetComposed StylesheetComposed Stylesheet StylesheetComposed StylesheetRoot StylesheetComposed Stylesheet
+ Each stylesheet has a set of properties, which can be set by various
+ means, usually either via an attribute on xsl:stylesheet, or via a top-level
+ xsl instruction (for instance, xsl:attribute-set). The get methods for these
+ properties only access the declaration within the given Stylesheet StylesheetComposed Stylesheet Stylesheet
+
+ Transformer Module
+ The Transformer module is in charge of run-time transformations. The TransformerImpl object, which implements the TrAX Transformer interface, and has an association with a StylesheetRoot object, begins the processing of the source tree (or provides a ContentHandler reference via the SourceTreeHandler ), and performs the transformation. The Transformer package does as much of the transformation as it can, but element level operations are generally performed in the ElemTemplateElement.execute(...) methods.
Result Tree events are fed into a ResultTreeHandler object, which acts as a layer between the direct calls to the result
+tree content handler (often a Serializer ), and the Transformer
Other important classes in this package are:
CountersTable and Counter The Counter class does incremental counting for support of xsl:number.
+ This class stores a cache of counted nodes (m_countNodes).
+ It tries to cache the counted nodes in document order...
+ the node count is based on its position in the cache list. The CountersTable class is a table of counters, keyed by ElemNumber objects, each
+ of which has a list of Counter KeyIterator, KeyManager, and KeyTable These classes handle mapping of keys declared with the xsl:key element. They attempt to work incrementally, locating nodes on request but indexing all as they traverse the tree, and stopping when the requested node is found. If a requested node is not found, then the entire tree will be traversed. Such is the nature of xsl:key. TransformState This interface is meant to be used by a consumer of SAX2 events produced by Xalan, and enables the consumer
+ to get information about the state of the transform. It
+ is primarily intended as a tooling interface. Even though the following modules are defined in the org.apache.xalan
Stree Module [and discussions about streaming]
+ The Stree module implements the default Source Tree for Xalan, that is to be transformed. It implements read-only DOM2 interfaces, and provides some information needed for fast transforms, such as document order indexes. It also attempts to allow an incremental transform by launching the transform on a secondary thread as soon as the SAX2 StartDocument event has occurred. When the transform requests a node, and the node is not present, the getFirstChild and GetNextSibling methods will wait until the child node has arrived, or an endElement event has occurred.
Note that the secondary thread is an issue. It would be better to do the same thing as described above on a single thread, but using the parser in 'pull' mode, or simply with a parseNext method so the parse would occur in blocks. However, this model would only be possible
This kind of incrementality is not perfect because it still requires an entire source tree to be concretely built. There have been a lot of good discussions on the xalan-dev list about how to do static analysis of a stylesheet, and be able to allocate only the nodes needed by the transform, while they are needed (or not allocate source objects at all).
+Serializer Module
+XML serialization is a term used for turning a tree or set of events into a stream, and should not be confused with Java object serialization. The Xalan serializers implement the ContentHandler to turn parser events coming from the transform, into a stream of XML, HTML, or plain text. The serializers also implement the Serializer which allows the transform process to set XSLT output properties and the output stream or Writer.
Extensions Module
+This package contains an implementation of Xalan Extension Mechanism, which uses the Bean Scripting Framework .
+
+The Bean Scripting Framework (BSF) is an architecture for incorporating scripting into Java applications and applets. Scripting languages such as Netscape Rhino (Javascript), VBScript, Perl, Tcl, Python, NetRexx and Rexx can be used to augment XSLT's functionality. In addition, the Xalan extension mechanism allows use of Java classes. See the Xalan-J 2 extension documentation for a description of using extensions in a stylesheet. Please note that the W3C XSL Working Group is working on a specification for standard extension bindings, and this module will change to follow that specification.
[More needed... -sb]
XPath Module
+ This module is pulled out of the Xalan package, and put in the org.apache package, to emphasize that the intention is that this package can be used independently of the XSLT engine, even though it has dependencies on the Xalan utils module.
The XPath module first compiles the XPath strings into expression trees, and then executes these expressions via a call to the XPath execute(...) function.
Major classes are:
XPath Represents a compiled XPath. Major function is XObject execute(XPathContext xctxt, Node contextNode,
+ PrefixResolver namespaceContext) XPathAPI The methods in this class are convenience methods into the
+ low-level XPath API. XPathContext Used as the runtime execution context for XPath. DOMHelper Used as a helper for handling DOM issues. May be subclassed to take advantage
+ of specific DOM implementations. SourceTreeManager bottlenecks all management of source trees. The methods
+ in this class should allow easy garbage collection of source
+ trees, and should centralize parsing for those source trees. Expression The base-class of all expression objects, allowing polymorphic behaviors. The general architecture of the XPath module is divided into the compiler, and categories of expression objects.
The most important module is the axes module. This module implements the DOM2 NodeIterator interface, and is meant to allow XPath clients to either override the default behavior or to replace this behavior.
The LocPathIterator and UnionPathIterator classes implement the NodeIterator interface, and polymorphically use AxesWalker derived objects to execute each step in the path. The whole trick is to execute the LocationPath AxesWalkers AxesWalkers WalkerFactory class.
[Frankly, the implementation of the default AxesWalker, with it's waiters, is the one totally incomprehensible part of Xalan. It gets especially difficult because you can not look to the node ahead. I would be very interested if any rocket scientists out there can come up with a better algorithm.]
XPath Database Connection
+An important part of the XPath design in both Xalan 1 and Xalan 2, is to enable database connections to be used as drivers directly to the XPath LocationPath handling. This allows databases to be directly connected to the transform, and be able to take advantage of internal indexing and the like. While in Xalan 1 this was done via the XLocator interface, in Xalan 2 this interface is no longer used, and has been replaced by the DOM2 NodeIterator interface. An application or extension should be able to install their own NodeIterator for a given document.
[More to do]
Utils Package
+ This package contains general utilities for use by both the xalan and xpath packages.
Other Packages
+ client Implementation of Xalan Applet [should we keep this?].
+
+ lib Implementation of Xalan-specific extensions. res Contains strings that require internationalization. Xalan Stylesheet Complilation to Java
+We are doing some work on compiling stylesheet objects to Java. This is a work in progress, and is not meant for general use yet. For the moment, we are writing out Java text files, and then compiling them to bytecodes via javac, rather than directly producing bytecodes. The CompilingStylesheetProcessor derives from TransformerFactoryImpl to produce these classes, which are then bundled into a jar file. For the moment the full Xalan jar is required, but we're looking at ways to only use a subset of Xalan, so that only a minimal jar would be required.
Future Optimizations
+This section enumerates some optimizations that we're planning to do in future versions of Xalan.
Likely near term optimizations (next six months?):
By pre-analysis of the stylesheet, prune nodes from the tree that have been processed and can be predicted that they won't be visited again. Eliminate redundent expressions (xsl:when, variable sets, rooted patterns, etc.). Optimize variable patterns such as <xsl:variable name="foo"><xsl:variable select="yada"/></xsl:variable> into <xsl:variable name="foo" select="string(yada)"/>, in order to reduce result tree fragment creation. Reduce size of Stree nodes. Implement our own NamespaceSupport class (the SAX2 one is too expensive). More specialization of itterators and walkers. Full Java compilation support. Schema Awareness (if "//foo", the Schema can tell us where to look, but we need standard interface to Schemas). Likely longer term optimizations (12-18 months?):
On-the-fly indexing. Predict if nodes won't be processed at all, and so don't build them, achieve full streaming support for a certain class of stylesheets. Coding Conventions
+ This section documents the coding conventions used in the Xalan
+ source.
+
+ Class files are arranged with constructors and possibly an init()
+ function first, public API methods second, package specific, protected, and
+ private methods following (arranged based on related functionality), member
+ variables with their getter/setter access methods last.
+ Non-static member variables are prefixed with "m_".
+ static final member variables should always be upper case, without
+ the "m_" prefix. They need not have accessors.
+ Private member variables that are not accessed outside the class need
+ not have getter/setter methods declared.
+ Private member variables that are accessed outside the class should
+ have either package specific or public getter/setter methods declared. All
+ accessors should follow the bean design patterns.
+ Package-scoped member variables, public member variables, and
+ protected member variables should not be declared.
+
+
+ Copyright © 1999-2023 The Apache Software Foundation Xalan-Java 2
-Xalan-Java implements the W3C Recommendation 16 November 1999 XSL
-Transformations (XSLT) Version 1.0 .
+Xalan-Java implements the W3C Recommendation 16 November 1999 XSL
+Transformations (XSLT) Version 1.0 .
XLST is a stylesheet language for transforming XML documents into other XML documents, HTML documents,
other document types, or text. The language includes the XSL Transformation vocabulary and XPath, a language for
addressing parts of an XML document. An XSL stylesheet describes how to transform the tree of nodes in the XML
diff --git a/xalan/src/site/xhtml/org/apache/xalan/client/package.xhtml b/xalan/src/site/xhtml/org/apache/xalan/client/package.xhtml
new file mode 100644
index 000000000..154cd5465
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xalan/client/package.xhtml
@@ -0,0 +1,26 @@
+
+
+
+
Xalan Client Package.
+
+ Implementation of Xalan applet.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xalan/extensions/package.xhtml b/xalan/src/site/xhtml/org/apache/xalan/extensions/package.xhtml
new file mode 100644
index 000000000..ed2d808db
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xalan/extensions/package.xhtml
@@ -0,0 +1,26 @@
+
+
+
+ Xalan Extension Mechanism Package.
+
+ Implementation of Xalan Extension Mechanism.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xalan/lib/package.xhtml b/xalan/src/site/xhtml/org/apache/xalan/lib/package.xhtml
new file mode 100644
index 000000000..451db3585
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xalan/lib/package.xhtml
@@ -0,0 +1,27 @@
+
+
+
+ Xalan and EXSLT Extensions.
+
+ Extension elements and functions shipped with Xalan-Java, including EXSLT functions.
+ We are adding extensions to this package.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xalan/lib/sql/package.xhtml b/xalan/src/site/xhtml/org/apache/xalan/lib/sql/package.xhtml
new file mode 100644
index 000000000..26e6da0d0
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xalan/lib/sql/package.xhtml
@@ -0,0 +1,91 @@
+
+
+
+ Xalan SQL Extension
+
+Provides extension functions for connecting to a JDBC data source, executing a query,
+and working incrementally through a "streamable" result set. Streaming (reuse of a single row node to traverse the result set) is the default mode of operation. If you want unlimited access to the entire result set, you can cache the query result set (1 row node for each row in the result set).
+If you use streaming mode (the default), you can only access row elements one at a time moving forward through the result set. The use of XPath expressions in your stylesheet, for example, that attempt to return nodes from the result set in any other manner may produce unpredictable results.
+ XConnection provides three extension functions that you can use in your stylesheet.
+
+ new() -- Use one of the XConnection constructors to connect to a data source, and return an XConnection
+ object.
query() -- Use the XConnection object query() method to return a "streamable" result set in the form of a row-set
+ node. Work your way through the row-set one row at a time. The same row element is used over and over again, so you can
+ begin "transforming" the row-set before the entire result set has been returned.
close() -- Use the XConnection object close() method to terminate the connection.
+
+ The query() extension function returns a Document node that contains (as needed) an array of column-header elements,
+ a single row element that is used repeatedly, and an array of col elements. Each column-header element (one per column in the
+ row-set) contains an attribute (ColumnAttribute) for each of the column descriptors in the ResultSetMetaData object.
+ Each col element contains a text node with a textual representation of the value for that column in the current row.
+ Example
+ This example displays the result set from a table in a sample InstantDB database.
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0"
+ xmlns:sql="org.apache.xalan.lib.sql.XConnection"
+ extension-element-prefixes="sql">
+ <xsl:output method="html" indent="yes"/>
+ <xsl:param name="query" select="'SELECT * FROM import1'"/>
+
+ <xsl:template match="/">
+ <!-- 1. Make the connection -->
+ <xsl:variable name="products"
+ select="sql:new('org.enhydra.instantdb.jdbc.idbDriver',
+ 'jdbc:idb:D:\instantdb\Examples\sample.prp')"/>
+ <HTML>
+ <HEAD>
+ </HEAD>
+ <BODY>
+ <TABLE border="1">
+ <!--2. Execute the query -->
+ <xsl:variable name="table" select='sql:query($products, $query)'/>
+ <TR>
+ <!-- Get column-label attribute from each column-header-->
+ <xsl:for-each select="$table/sql/metadata/column-header">
+ <TH><xsl:value-of select="@column-label"/></TH>
+ </xsl:for-each>
+ </TR>
+ <xsl:apply-templates select="$table/sql/row-set/row"/>
+ <xsl:text> </xsl:text>
+ </TABLE>
+ </BODY>
+ </HTML>
+ <!-- 3. Close the connection -->
+ <xsl:value-of select="sql:close($products)"/>
+ </xsl:template>
+
+ <xsl:template match="row">
+ <TR>
+ <xsl:apply-templates select="col"/>
+ </TR>
+ </xsl:template>
+
+ <xsl:template match="col">
+ <TD>
+ <!-- Here is the column data -->
+ <xsl:value-of select="text()"/>
+ </TD>
+ </xsl:template>
+
+</xsl:stylesheet>
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xalan/processor/package.xhtml b/xalan/src/site/xhtml/org/apache/xalan/processor/package.xhtml
new file mode 100644
index 000000000..9b70da668
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xalan/processor/package.xhtml
@@ -0,0 +1,41 @@
+
+
+
+ Xalan Processor Package.
+
+ Parses an XSLT stylesheet document (which may include and import other stylesheet documents) and produces a StylesheetRoot
+ (a TRaX Templates object).
+
+ StylesheetProcessor implements the TRaX {@link javax.xml.transform.TransformerFactory} interface,
+ as well as the {@link javax.xml.transform.sax.SAXTransformerFactory} interface.
+ It registers the {@link org.apache.xalan.processor.StylesheetHandler} object
+ (a TrAX {@link javax.xml.transform.sax.TemplatesHandler} implementation)
+ as the SAX ContentHandler for an XMLReader, and uses the XMLReader to parse
+ the stylesheet document.
+ Before parsing the XSLT input, StylesheetHandler assembles an {@link org.apache.xalan.processor.XSLTSchema},
+ which uses {@link org.apache.xalan.processor.XSLTElementDef}
+ and {@link org.apache.xalan.processor.XSLTAttributeDef} objects to
+ recursively define the elements and attributes that an XSLT stylesheet may
+ contain. The StylesheetHandler then passes on each parse event to the
+ {@link org.apache.xalan.processor.XSLTElementProcessor} which the
+ XSLTElementDef assigned to the element associated with that event.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xalan/res/package.xhtml b/xalan/src/site/xhtml/org/apache/xalan/res/package.xhtml
new file mode 100644
index 000000000..cc60c9061
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xalan/res/package.xhtml
@@ -0,0 +1,26 @@
+
+
+
+ Xalan resource Package.
+
+ Contains strings that require internationalization.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xalan/templates/package.xhtml b/xalan/src/site/xhtml/org/apache/xalan/templates/package.xhtml
new file mode 100644
index 000000000..21a149f70
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xalan/templates/package.xhtml
@@ -0,0 +1,43 @@
+
+
+
+ Xalan Templates Package.
+
+ Implements the {@link javax.xml.transform.Templates} interface,
+ and defines a set of classes that represent an XSLT stylesheet.
+
+ {@link org.apache.xalan.templates.StylesheetRoot} implements the {@link javax.xml.transform.Templates} interface, and
+ extends {@link org.apache.xalan.templates.StylesheetComposed},
+ which is a {@link org.apache.xalan.templates.Stylesheet} composed of itself
+ and its included Stylesheet objects. A StylesheetRoot also contains a
+ global list of all imported StylesheetComposed objects. The
+ role of these objects is to hold immutable stylesheet data, not to perform
+ procedural tasks associated with the
+ construction of the data (the org.apache.xalan.processor package) or with the transformation (the org.apache.xalan.transformer
+ package).
+ {@link org.apache.xalan.templates.ElemTemplateElement} is the superclass of
+ all XSLT instruction elements, including Stylesheet. The x Func classes
+ extend members of the org.apache.xpath package and implement XSLT functions. Unlike
+ the Stylesheet "container" objects, the
+ instruction element and function classes do contain procedural execute()
+ methods that are called during the transformation.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xalan/trace/package.xhtml b/xalan/src/site/xhtml/org/apache/xalan/trace/package.xhtml
new file mode 100644
index 000000000..5fd7f73fe
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xalan/trace/package.xhtml
@@ -0,0 +1,26 @@
+
+
+
+ Xalan Trace (debugger) Package.
+
+ Implementation of Xalan Trace events, for use by a debugger.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xalan/transformer/package.xhtml b/xalan/src/site/xhtml/org/apache/xalan/transformer/package.xhtml
new file mode 100644
index 000000000..fb13b95c5
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xalan/transformer/package.xhtml
@@ -0,0 +1,39 @@
+
+
+
+ Xalan Transformer Package.
+
+ In charge of run-time transformations and the production of result trees.
+
+ {@link org.apache.xalan.transformer.TransformerImpl} implements the
+ {@link javax.xml.transform.Transformer} interface, and is the core representation
+ of the transformation execution.
+ For each node in the XML source, TransformerImpl uses the StylesheetRoot and underlying XSLT schema to determine which
+ template to apply: one of the templates in the StylesheetRoot, a default template rule as specified in the XSLT spec, or
+ none.
+ The Transformer works with {@link org.apache.xml.serializer.SerializationHandler} to
+ forward the SAX-like events produced by the
+ transformation to the appropriate output ContentHandler.
+ To the degree possible, the parsing of the XML source and application of the Templates object to that source are performed
+ concurrently in separate threads. When necessary, the Transformer waits for the parse events that must be in place before a
+ given template may be applied.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xalan/xslt/package.xhtml b/xalan/src/site/xhtml/org/apache/xalan/xslt/package.xhtml
new file mode 100644
index 000000000..12684aa8b
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xalan/xslt/package.xhtml
@@ -0,0 +1,26 @@
+
+
+
+ Xalan command-line interface.
+
+ Implementation of Xalan command-line interface.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xml/utils/package.xhtml b/xalan/src/site/xhtml/org/apache/xml/utils/package.xhtml
new file mode 100644
index 000000000..b55175c37
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xml/utils/package.xhtml
@@ -0,0 +1,27 @@
+
+
+
+ Xalan utilities.
+
+ Implementation of Xalan utility classes. This package is also shared by XPath.
+ There *should* be no outward dependencies to XPath or Xalan by classes in this package.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xpath/axes/package.xhtml b/xalan/src/site/xhtml/org/apache/xpath/axes/package.xhtml
new file mode 100644
index 000000000..1a2fba220
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xpath/axes/package.xhtml
@@ -0,0 +1,27 @@
+
+
+
+ XPath LocationPath support.
+
+ Implementation of XPath LocationPath support -- primary classes are
+ LocPathIterator and UnionPathIterator.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xpath/compiler/package.xhtml b/xalan/src/site/xhtml/org/apache/xpath/compiler/package.xhtml
new file mode 100644
index 000000000..ef2f39932
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xpath/compiler/package.xhtml
@@ -0,0 +1,26 @@
+
+
+ XPath parsing and compilation support Package.
+
+ Implements an XPath parser which produces an OpMap, and a so-called Compiler
+ which produces an expression tree for fast evaluation.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xpath/domapi/package.xhtml b/xalan/src/site/xhtml/org/apache/xpath/domapi/package.xhtml
new file mode 100644
index 000000000..8db081d71
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xpath/domapi/package.xhtml
@@ -0,0 +1,26 @@
+
+
+
+ XPath domapi Package.
+
+ Implements DOM Level 3 XPath API
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xpath/functions/package.xhtml b/xalan/src/site/xhtml/org/apache/xpath/functions/package.xhtml
new file mode 100644
index 000000000..c1d30ba89
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xpath/functions/package.xhtml
@@ -0,0 +1,29 @@
+
+
+
+ XPath functions Package.
+
+ Implements XPath functions -- each function is derived from Function,
+ FunctionOneArg, Function2Args, etc, with number-of-arguments checking being
+ applied mainly at compile time -- this package only implements XPath functions,
+ XSLT functions are found in the "templates" package.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xpath/objects/package.xhtml b/xalan/src/site/xhtml/org/apache/xpath/objects/package.xhtml
new file mode 100644
index 000000000..bf5e5dfbd
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xpath/objects/package.xhtml
@@ -0,0 +1,27 @@
+
+
+
+ XPath objects Package.
+
+ Implementation of XPath polymorphic type objects -- this package will grow
+ as XPath objects are expanded to support XML Schema data types.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xpath/operations/package.xhtml b/xalan/src/site/xhtml/org/apache/xpath/operations/package.xhtml
new file mode 100644
index 000000000..e86126443
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xpath/operations/package.xhtml
@@ -0,0 +1,26 @@
+
+
+
+ Xalan XPath operations.
+
+ Support for XPath operations, such as +, -, string(), etc.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xpath/package.xhtml b/xalan/src/site/xhtml/org/apache/xpath/package.xhtml
new file mode 100644
index 000000000..7eb95a629
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xpath/package.xhtml
@@ -0,0 +1,27 @@
+
+
+
+ XPath support Package.
+
+ Implementation of XPath; for the most part, only classes meant for public use are
+ found at this root level of the XPath packages.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xpath/patterns/package.xhtml b/xalan/src/site/xhtml/org/apache/xpath/patterns/package.xhtml
new file mode 100644
index 000000000..d23b37b09
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xpath/patterns/package.xhtml
@@ -0,0 +1,26 @@
+
+
+
+ XPath nodetest and XSLT pattern matching support.
+
+ Implementation of XPath nodeTest support, and XSLT pattern matching support.
+
+
+
+
diff --git a/xalan/src/site/xhtml/org/apache/xpath/res/package.xhtml b/xalan/src/site/xhtml/org/apache/xpath/res/package.xhtml
new file mode 100644
index 000000000..d27c0a2e8
--- /dev/null
+++ b/xalan/src/site/xhtml/org/apache/xpath/res/package.xhtml
@@ -0,0 +1,26 @@
+
+
+
+ XPath resources.
+
+ Contains strings for XPath support that require internationalization.
+
+
+
+
diff --git a/xalan/tools/xalan2jdoc.jar b/xalan/tools/xalan2jdoc.jar
new file mode 100644
index 000000000..dcc37db88
Binary files /dev/null and b/xalan/tools/xalan2jdoc.jar differ
diff --git a/xalan/tools/xalan2jtaglet.jar b/xalan/tools/xalan2jtaglet.jar
new file mode 100644
index 000000000..37049cbfe
Binary files /dev/null and b/xalan/tools/xalan2jtaglet.jar differ
diff --git a/xalan2jtaglet/pom.xml b/xalan2jtaglet/pom.xml
new file mode 100644
index 000000000..9228b20a9
--- /dev/null
+++ b/xalan2jtaglet/pom.xml
@@ -0,0 +1,80 @@
+
+ 4.0.0
+
+ xalan
+ xalan-project
+ 2.7.3
+
+
+ xalan2jtaglet
+ @xsl.usage taglet
+ Implementation of the @xsl.usage taglet, used in the Xalan package's javadoc to indicate classes which, while public for cross-module access, are not intended to be called by end-users.
+
+
+
+ ${java.home}/../lib/tools.jar
+
+
+
+ com.sun
+ tools
+ 1.6.0
+ system
+ ${toolsjar}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xalan2jtaglet/src/main/java/xalan2jtaglet/XSLUsage.java b/xalan2jtaglet/src/main/java/xalan2jtaglet/XSLUsage.java
new file mode 100644
index 000000000..1aa18cc29
--- /dev/null
+++ b/xalan2jtaglet/src/main/java/xalan2jtaglet/XSLUsage.java
@@ -0,0 +1,49 @@
+/** Taglet for Xalan-Java documentation, giving us a standard way to
+ indicate when classes are public only because they are shared
+ across packages within Xalan code, not because they are intended for use
+ by others. Typical: "@xsl.usage internal"
+
+ Technically it might be better to OSGIfy the Xalan code, which
+ would also permit demand-loading of only the classes actually being
+ used by this execution... but that's an idea for the future.
+
+ This code renders the tag keywords (internal, advanced, experimental)
+ into their expanded renderings in the Javadoc.
+ */
+//
+// Source code recreated from xalan2jtaglet.jar by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package xalan2jtaglet;
+
+import com.sun.javadoc.Tag;
+
+public class XSLUsage {
+ public static final String TAG = "xsl.usage";
+ private static final int INTERNAL = 0;
+ private static final int ADVANCED = 1;
+ private static final int EXPERIMENTAL = 2;
+ private static final int UNSPECIFIED = -1;
+ private static final String[] names = new String[]{"internal", "advanced", "experimental"};
+ private static final String[] colours = new String[]{"FF0000", "00FF00", "0000FF"};
+ private static final String[] messages = new String[]{"**For internal use only**", "**For advanced use only**", "**Experimental**"};
+
+ public XSLUsage() {
+ }
+
+ public static String getHTML(Tag usageTag) {
+ int key = getKey(usageTag);
+ return key == -1 ? "" : " " + messages[key] + " Usage: " + XSLUsage.getHTML(arg0) + " \n";
+ }
+
+ public String toString(Tag[] arg0) {
+ String string = "";
+ if (arg0 != null && arg0.length != 0) {
+ string = "\nUsage: ";
+
+ for (int i = 0; i < arg0.length - 1; ++i) {
+ string = string + XSLUsage.getHTML(arg0[i]) + ", ";
+ }
+
+ string = string + XSLUsage.getHTML(arg0[arg0.length - 1]);
+ string = string + " \n";
+ return string;
+ } else {
+ return string;
+ }
+ }
+
+ public static void register(Map tagletMap) {
+ XSLUsageTag tag = new XSLUsageTag();
+ Taglet t = (Taglet) tagletMap.get(tag.getName());
+ if (t != null) {
+ tagletMap.remove(tag.getName());
+ }
+
+ tagletMap.put(tag.getName(), tag);
+ }
+}
