Break dependency from libcore to Apache XML libraries. Change-Id: I482ba29551423c682696db44f78bc6b74fa04341 http://b/1414929

commit: f029395dff382fc4dcba0689fd948ec06644e1f0 [log] [tgz]
author: Jesse Wilson <jessewilson@google.com> Sun Jan 09 16:01:24 2011 -0800
committer: Jesse Wilson <jessewilson@google.com> Sun Jan 09 16:01:24 2011 -0800
tree: 69a3dca5780ed2f6c5f09c1efb22a1f7a23e73cb
parent: 1c1007df57b41662e60d650db918f1581b20fc45 [diff]
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index af55897..acb323a 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk

@@ -50,7 +50,7 @@
 endef
 
 # The Java files and their associated resources.
-core_src_files := $(call all-main-java-files-under,dalvik dom json luni support xml)
+core_src_files := $(call all-main-java-files-under,apache-xml dalvik dom json luni support xml)
 core_resource_dirs := $(call all-core-resource-dirs,main)
 test_resource_dirs := $(call all-core-resource-dirs,test)
 

diff --git a/luni/src/main/java/org/apache/xalan/Version.java b/apache-xml/src/main/java/org/apache/xalan/Version.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/Version.java
rename to apache-xml/src/main/java/org/apache/xalan/Version.java


diff --git a/luni/src/main/java/org/apache/xalan/Version.src b/apache-xml/src/main/java/org/apache/xalan/Version.src
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/Version.src
rename to apache-xml/src/main/java/org/apache/xalan/Version.src


diff --git a/luni/src/main/java/org/apache/xalan/extensions/ExpressionContext.java b/apache-xml/src/main/java/org/apache/xalan/extensions/ExpressionContext.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/extensions/ExpressionContext.java
rename to apache-xml/src/main/java/org/apache/xalan/extensions/ExpressionContext.java


diff --git a/luni/src/main/java/org/apache/xalan/extensions/ExpressionVisitor.java b/apache-xml/src/main/java/org/apache/xalan/extensions/ExpressionVisitor.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/extensions/ExpressionVisitor.java
rename to apache-xml/src/main/java/org/apache/xalan/extensions/ExpressionVisitor.java


diff --git a/luni/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java b/apache-xml/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java
rename to apache-xml/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java


diff --git a/luni/src/main/java/org/apache/xalan/extensions/ExtensionNamespaceSupport.java b/apache-xml/src/main/java/org/apache/xalan/extensions/ExtensionNamespaceSupport.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/extensions/ExtensionNamespaceSupport.java
rename to apache-xml/src/main/java/org/apache/xalan/extensions/ExtensionNamespaceSupport.java


diff --git a/luni/src/main/java/org/apache/xalan/extensions/ExtensionNamespacesManager.java b/apache-xml/src/main/java/org/apache/xalan/extensions/ExtensionNamespacesManager.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/extensions/ExtensionNamespacesManager.java
rename to apache-xml/src/main/java/org/apache/xalan/extensions/ExtensionNamespacesManager.java


diff --git a/luni/src/main/java/org/apache/xalan/extensions/ExtensionsTable.java b/apache-xml/src/main/java/org/apache/xalan/extensions/ExtensionsTable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/extensions/ExtensionsTable.java
rename to apache-xml/src/main/java/org/apache/xalan/extensions/ExtensionsTable.java


diff --git a/luni/src/main/java/org/apache/xalan/extensions/ObjectFactory.java b/apache-xml/src/main/java/org/apache/xalan/extensions/ObjectFactory.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/extensions/ObjectFactory.java
rename to apache-xml/src/main/java/org/apache/xalan/extensions/ObjectFactory.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorAttributeSet.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorAttributeSet.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorAttributeSet.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorAttributeSet.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorCharacters.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorCharacters.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorCharacters.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorCharacters.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorDecimalFormat.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorDecimalFormat.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorDecimalFormat.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorDecimalFormat.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorExsltFuncResult.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorExsltFuncResult.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorExsltFuncResult.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorExsltFuncResult.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorGlobalParamDecl.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorGlobalParamDecl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorGlobalParamDecl.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorGlobalParamDecl.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorImport.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorImport.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorImport.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorImport.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorInclude.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorInclude.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorInclude.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorInclude.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorKey.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorKey.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorKey.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorKey.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorLRE.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorLRE.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorOutputElem.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorOutputElem.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorOutputElem.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorOutputElem.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorStylesheetDoc.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorStylesheetDoc.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorStylesheetDoc.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorStylesheetDoc.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorTemplate.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorTemplate.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorTemplate.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorTemplate.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorTemplateElem.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorTemplateElem.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorTemplateElem.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorTemplateElem.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorText.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorText.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorText.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorText.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/ProcessorUnknown.java b/apache-xml/src/main/java/org/apache/xalan/processor/ProcessorUnknown.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/ProcessorUnknown.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/ProcessorUnknown.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/StylesheetHandler.java b/apache-xml/src/main/java/org/apache/xalan/processor/StylesheetHandler.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/StylesheetHandler.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/StylesheetHandler.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java b/apache-xml/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/WhitespaceInfoPaths.java b/apache-xml/src/main/java/org/apache/xalan/processor/WhitespaceInfoPaths.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/WhitespaceInfoPaths.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/WhitespaceInfoPaths.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/XSLProcessorVersion.src b/apache-xml/src/main/java/org/apache/xalan/processor/XSLProcessorVersion.src
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/XSLProcessorVersion.src
rename to apache-xml/src/main/java/org/apache/xalan/processor/XSLProcessorVersion.src


diff --git a/luni/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java b/apache-xml/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/XSLTElementDef.java b/apache-xml/src/main/java/org/apache/xalan/processor/XSLTElementDef.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/XSLTElementDef.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/XSLTElementDef.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java b/apache-xml/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/XSLTSchema.java b/apache-xml/src/main/java/org/apache/xalan/processor/XSLTSchema.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/XSLTSchema.java
rename to apache-xml/src/main/java/org/apache/xalan/processor/XSLTSchema.java


diff --git a/luni/src/main/java/org/apache/xalan/processor/package.html b/apache-xml/src/main/java/org/apache/xalan/processor/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/processor/package.html
rename to apache-xml/src/main/java/org/apache/xalan/processor/package.html


diff --git a/luni/src/main/java/org/apache/xalan/res/XSLMessages.java b/apache-xml/src/main/java/org/apache/xalan/res/XSLMessages.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/res/XSLMessages.java
rename to apache-xml/src/main/java/org/apache/xalan/res/XSLMessages.java


diff --git a/luni/src/main/java/org/apache/xalan/res/XSLTErrorResources.java b/apache-xml/src/main/java/org/apache/xalan/res/XSLTErrorResources.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/res/XSLTErrorResources.java
rename to apache-xml/src/main/java/org/apache/xalan/res/XSLTErrorResources.java


diff --git a/luni/src/main/java/org/apache/xalan/res/XSLTInfo.properties b/apache-xml/src/main/java/org/apache/xalan/res/XSLTInfo.properties
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/res/XSLTInfo.properties
rename to apache-xml/src/main/java/org/apache/xalan/res/XSLTInfo.properties


diff --git a/luni/src/main/java/org/apache/xalan/res/package.html b/apache-xml/src/main/java/org/apache/xalan/res/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/res/package.html
rename to apache-xml/src/main/java/org/apache/xalan/res/package.html


diff --git a/luni/src/main/java/org/apache/xalan/serialize/SerializerUtils.java b/apache-xml/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
rename to apache-xml/src/main/java/org/apache/xalan/serialize/SerializerUtils.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/AVT.java b/apache-xml/src/main/java/org/apache/xalan/templates/AVT.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/AVT.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/AVT.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/AVTPart.java b/apache-xml/src/main/java/org/apache/xalan/templates/AVTPart.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/AVTPart.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/AVTPart.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/AVTPartSimple.java b/apache-xml/src/main/java/org/apache/xalan/templates/AVTPartSimple.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/AVTPartSimple.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/AVTPartSimple.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/AVTPartXPath.java b/apache-xml/src/main/java/org/apache/xalan/templates/AVTPartXPath.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/AVTPartXPath.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/AVTPartXPath.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/AbsPathChecker.java b/apache-xml/src/main/java/org/apache/xalan/templates/AbsPathChecker.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/AbsPathChecker.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/AbsPathChecker.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/Constants.java b/apache-xml/src/main/java/org/apache/xalan/templates/Constants.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/Constants.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/Constants.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java b/apache-xml/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemApplyImport.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemApplyImport.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemAttribute.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemAttribute.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemAttribute.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemAttribute.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemChoose.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemChoose.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemChoose.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemChoose.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemComment.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemComment.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemComment.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemComment.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemCopy.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemCopy.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemCopy.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemCopy.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemCopyOf.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemCopyOf.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemElement.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemElement.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemElement.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemElement.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemEmpty.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemEmpty.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemEmpty.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemEmpty.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemExsltFuncResult.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemExsltFuncResult.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemExsltFuncResult.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemExsltFuncResult.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemExsltFunction.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemExsltFunction.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemExsltFunction.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemExsltFunction.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemExtensionCall.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemExtensionCall.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemExtensionCall.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemExtensionCall.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemExtensionDecl.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemExtensionDecl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemExtensionDecl.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemExtensionDecl.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemExtensionScript.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemExtensionScript.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemExtensionScript.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemExtensionScript.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemFallback.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemFallback.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemFallback.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemFallback.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemForEach.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemForEach.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemForEach.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemForEach.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemIf.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemIf.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemIf.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemIf.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemLiteralResult.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemLiteralResult.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemLiteralResult.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemLiteralResult.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemMessage.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemMessage.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemMessage.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemMessage.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemNumber.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemNumber.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemNumber.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemNumber.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemOtherwise.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemOtherwise.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemPI.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemPI.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemPI.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemPI.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemParam.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemParam.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemParam.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemParam.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemSort.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemSort.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemSort.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemSort.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemTemplate.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemTemplate.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemTemplate.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemTemplate.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemText.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemText.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemText.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemText.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemUnknown.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemUnknown.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemUnknown.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemUnknown.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemUse.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemUse.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemUse.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemUse.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemValueOf.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemValueOf.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemValueOf.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemValueOf.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemVariable.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemVariable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemVariable.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemVariable.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemVariablePsuedo.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemVariablePsuedo.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemVariablePsuedo.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemVariablePsuedo.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemWhen.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemWhen.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemWhen.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemWhen.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/ElemWithParam.java b/apache-xml/src/main/java/org/apache/xalan/templates/ElemWithParam.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/ElemWithParam.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/ElemWithParam.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/FuncDocument.java b/apache-xml/src/main/java/org/apache/xalan/templates/FuncDocument.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/FuncDocument.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/FuncDocument.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/FuncFormatNumb.java b/apache-xml/src/main/java/org/apache/xalan/templates/FuncFormatNumb.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/FuncFormatNumb.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/FuncFormatNumb.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/FuncKey.java b/apache-xml/src/main/java/org/apache/xalan/templates/FuncKey.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/FuncKey.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/FuncKey.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/KeyDeclaration.java b/apache-xml/src/main/java/org/apache/xalan/templates/KeyDeclaration.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/KeyDeclaration.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/KeyDeclaration.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/NamespaceAlias.java b/apache-xml/src/main/java/org/apache/xalan/templates/NamespaceAlias.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/NamespaceAlias.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/NamespaceAlias.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/OutputProperties.java b/apache-xml/src/main/java/org/apache/xalan/templates/OutputProperties.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/OutputProperties.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/OutputProperties.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/RedundentExprEliminator.java b/apache-xml/src/main/java/org/apache/xalan/templates/RedundentExprEliminator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/RedundentExprEliminator.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/RedundentExprEliminator.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/Stylesheet.java b/apache-xml/src/main/java/org/apache/xalan/templates/Stylesheet.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/Stylesheet.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/Stylesheet.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/StylesheetComposed.java b/apache-xml/src/main/java/org/apache/xalan/templates/StylesheetComposed.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/StylesheetComposed.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/StylesheetComposed.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/StylesheetRoot.java b/apache-xml/src/main/java/org/apache/xalan/templates/StylesheetRoot.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/StylesheetRoot.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/StylesheetRoot.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/TemplateList.java b/apache-xml/src/main/java/org/apache/xalan/templates/TemplateList.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/TemplateList.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/TemplateList.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/TemplateSubPatternAssociation.java b/apache-xml/src/main/java/org/apache/xalan/templates/TemplateSubPatternAssociation.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/TemplateSubPatternAssociation.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/TemplateSubPatternAssociation.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/VarNameCollector.java b/apache-xml/src/main/java/org/apache/xalan/templates/VarNameCollector.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/VarNameCollector.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/VarNameCollector.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/WhiteSpaceInfo.java b/apache-xml/src/main/java/org/apache/xalan/templates/WhiteSpaceInfo.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/WhiteSpaceInfo.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/WhiteSpaceInfo.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/XMLNSDecl.java b/apache-xml/src/main/java/org/apache/xalan/templates/XMLNSDecl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/XMLNSDecl.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/XMLNSDecl.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/XSLTVisitable.java b/apache-xml/src/main/java/org/apache/xalan/templates/XSLTVisitable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/XSLTVisitable.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/XSLTVisitable.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/XSLTVisitor.java b/apache-xml/src/main/java/org/apache/xalan/templates/XSLTVisitor.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/XSLTVisitor.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/XSLTVisitor.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/XUnresolvedVariable.java b/apache-xml/src/main/java/org/apache/xalan/templates/XUnresolvedVariable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/XUnresolvedVariable.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/XUnresolvedVariable.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/XUnresolvedVariableSimple.java b/apache-xml/src/main/java/org/apache/xalan/templates/XUnresolvedVariableSimple.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/XUnresolvedVariableSimple.java
rename to apache-xml/src/main/java/org/apache/xalan/templates/XUnresolvedVariableSimple.java


diff --git a/luni/src/main/java/org/apache/xalan/templates/package.html b/apache-xml/src/main/java/org/apache/xalan/templates/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/templates/package.html
rename to apache-xml/src/main/java/org/apache/xalan/templates/package.html


diff --git a/luni/src/main/java/org/apache/xalan/transformer/ClonerToResultTree.java b/apache-xml/src/main/java/org/apache/xalan/transformer/ClonerToResultTree.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/ClonerToResultTree.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/ClonerToResultTree.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/Counter.java b/apache-xml/src/main/java/org/apache/xalan/transformer/Counter.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/Counter.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/Counter.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/CountersTable.java b/apache-xml/src/main/java/org/apache/xalan/transformer/CountersTable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/CountersTable.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/CountersTable.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/DecimalToRoman.java b/apache-xml/src/main/java/org/apache/xalan/transformer/DecimalToRoman.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/DecimalToRoman.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/DecimalToRoman.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/KeyIterator.java b/apache-xml/src/main/java/org/apache/xalan/transformer/KeyIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/KeyIterator.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/KeyIterator.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/KeyManager.java b/apache-xml/src/main/java/org/apache/xalan/transformer/KeyManager.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/KeyManager.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/KeyManager.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/KeyTable.java b/apache-xml/src/main/java/org/apache/xalan/transformer/KeyTable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/KeyTable.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/KeyTable.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/MsgMgr.java b/apache-xml/src/main/java/org/apache/xalan/transformer/MsgMgr.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/MsgMgr.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/MsgMgr.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/NodeSortKey.java b/apache-xml/src/main/java/org/apache/xalan/transformer/NodeSortKey.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/NodeSortKey.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/NodeSortKey.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/NodeSorter.java b/apache-xml/src/main/java/org/apache/xalan/transformer/NodeSorter.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/NodeSorter.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/NodeSorter.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/SerializerSwitcher.java b/apache-xml/src/main/java/org/apache/xalan/transformer/SerializerSwitcher.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/SerializerSwitcher.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/SerializerSwitcher.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/TrAXFilter.java b/apache-xml/src/main/java/org/apache/xalan/transformer/TrAXFilter.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/TrAXFilter.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/TrAXFilter.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/TransformState.java b/apache-xml/src/main/java/org/apache/xalan/transformer/TransformState.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/TransformState.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/TransformState.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/TransformerClient.java b/apache-xml/src/main/java/org/apache/xalan/transformer/TransformerClient.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/TransformerClient.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/TransformerClient.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/TransformerHandlerImpl.java b/apache-xml/src/main/java/org/apache/xalan/transformer/TransformerHandlerImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/TransformerHandlerImpl.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/TransformerHandlerImpl.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java b/apache-xml/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/TransformerImpl.java b/apache-xml/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/TransformerImpl.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java b/apache-xml/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/XalanProperties.java b/apache-xml/src/main/java/org/apache/xalan/transformer/XalanProperties.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/XalanProperties.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/XalanProperties.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/XalanTransformState.java b/apache-xml/src/main/java/org/apache/xalan/transformer/XalanTransformState.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/XalanTransformState.java
rename to apache-xml/src/main/java/org/apache/xalan/transformer/XalanTransformState.java


diff --git a/luni/src/main/java/org/apache/xalan/transformer/package.html b/apache-xml/src/main/java/org/apache/xalan/transformer/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/transformer/package.html
rename to apache-xml/src/main/java/org/apache/xalan/transformer/package.html


diff --git a/luni/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java b/apache-xml/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java
rename to apache-xml/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java


diff --git a/luni/src/main/java/org/apache/xalan/xslt/ObjectFactory.java b/apache-xml/src/main/java/org/apache/xalan/xslt/ObjectFactory.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/xslt/ObjectFactory.java
rename to apache-xml/src/main/java/org/apache/xalan/xslt/ObjectFactory.java


diff --git a/luni/src/main/java/org/apache/xalan/xslt/SecuritySupport.java b/apache-xml/src/main/java/org/apache/xalan/xslt/SecuritySupport.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/xslt/SecuritySupport.java
rename to apache-xml/src/main/java/org/apache/xalan/xslt/SecuritySupport.java


diff --git a/luni/src/main/java/org/apache/xalan/xslt/SecuritySupport12.java b/apache-xml/src/main/java/org/apache/xalan/xslt/SecuritySupport12.java
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/xslt/SecuritySupport12.java
rename to apache-xml/src/main/java/org/apache/xalan/xslt/SecuritySupport12.java


diff --git a/luni/src/main/java/org/apache/xalan/xslt/package.html b/apache-xml/src/main/java/org/apache/xalan/xslt/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xalan/xslt/package.html
rename to apache-xml/src/main/java/org/apache/xalan/xslt/package.html


diff --git a/luni/src/main/java/org/apache/xml/dtm/Axis.java b/apache-xml/src/main/java/org/apache/xml/dtm/Axis.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/Axis.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/Axis.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/DTM.java b/apache-xml/src/main/java/org/apache/xml/dtm/DTM.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/DTM.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/DTM.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/DTMAxisIterator.java b/apache-xml/src/main/java/org/apache/xml/dtm/DTMAxisIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/DTMAxisIterator.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/DTMAxisIterator.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/DTMAxisTraverser.java b/apache-xml/src/main/java/org/apache/xml/dtm/DTMAxisTraverser.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/DTMAxisTraverser.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/DTMAxisTraverser.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/DTMConfigurationException.java b/apache-xml/src/main/java/org/apache/xml/dtm/DTMConfigurationException.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/DTMConfigurationException.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/DTMConfigurationException.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/DTMDOMException.java b/apache-xml/src/main/java/org/apache/xml/dtm/DTMDOMException.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/DTMDOMException.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/DTMDOMException.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/DTMException.java b/apache-xml/src/main/java/org/apache/xml/dtm/DTMException.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/DTMException.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/DTMException.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/DTMFilter.java b/apache-xml/src/main/java/org/apache/xml/dtm/DTMFilter.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/DTMFilter.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/DTMFilter.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/DTMIterator.java b/apache-xml/src/main/java/org/apache/xml/dtm/DTMIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/DTMIterator.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/DTMIterator.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/DTMManager.java b/apache-xml/src/main/java/org/apache/xml/dtm/DTMManager.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/DTMManager.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/DTMManager.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/DTMWSFilter.java b/apache-xml/src/main/java/org/apache/xml/dtm/DTMWSFilter.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/DTMWSFilter.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/DTMWSFilter.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ObjectFactory.java b/apache-xml/src/main/java/org/apache/xml/dtm/ObjectFactory.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ObjectFactory.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ObjectFactory.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/SecuritySupport.java b/apache-xml/src/main/java/org/apache/xml/dtm/SecuritySupport.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/SecuritySupport.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/SecuritySupport.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/SecuritySupport12.java b/apache-xml/src/main/java/org/apache/xml/dtm/SecuritySupport12.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/SecuritySupport12.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/SecuritySupport12.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/ChunkedIntArray.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/ChunkedIntArray.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/ChunkedIntArray.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/ChunkedIntArray.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/CoroutineManager.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/CoroutineManager.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/CoroutineManager.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/CoroutineManager.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMChildIterNodeList.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMChildIterNodeList.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMChildIterNodeList.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMChildIterNodeList.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMDocumentImpl.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMDocumentImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMDocumentImpl.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMDocumentImpl.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMNamedNodeMap.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMNamedNodeMap.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMNamedNodeMap.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMNamedNodeMap.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeIterator.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeIterator.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeIterator.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeList.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeList.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeList.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeList.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeListBase.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeListBase.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeListBase.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeListBase.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeProxy.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeProxy.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeProxy.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeProxy.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMStringPool.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMStringPool.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMStringPool.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMStringPool.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/DTMTreeWalker.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMTreeWalker.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/DTMTreeWalker.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/DTMTreeWalker.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/ExpandedNameTable.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/ExpandedNameTable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/ExpandedNameTable.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/ExpandedNameTable.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/ExtendedType.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/ExtendedType.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/ExtendedType.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/ExtendedType.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/NodeLocator.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/NodeLocator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/NodeLocator.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/NodeLocator.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/SecuritySupport.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/SecuritySupport.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/SecuritySupport.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/SecuritySupport.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/SecuritySupport12.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/SecuritySupport12.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/SecuritySupport12.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/SecuritySupport12.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java


diff --git a/luni/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java b/apache-xml/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java
rename to apache-xml/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java


diff --git a/luni/src/main/java/org/apache/xml/res/XMLErrorResources.java b/apache-xml/src/main/java/org/apache/xml/res/XMLErrorResources.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/res/XMLErrorResources.java
rename to apache-xml/src/main/java/org/apache/xml/res/XMLErrorResources.java


diff --git a/luni/src/main/java/org/apache/xml/res/XMLMessages.java b/apache-xml/src/main/java/org/apache/xml/res/XMLMessages.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/res/XMLMessages.java
rename to apache-xml/src/main/java/org/apache/xml/res/XMLMessages.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/AttributesImplSerializer.java b/apache-xml/src/main/java/org/apache/xml/serializer/AttributesImplSerializer.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/AttributesImplSerializer.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/AttributesImplSerializer.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/CharInfo.java b/apache-xml/src/main/java/org/apache/xml/serializer/CharInfo.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/CharInfo.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/CharInfo.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/DOM3Serializer.java b/apache-xml/src/main/java/org/apache/xml/serializer/DOM3Serializer.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/DOM3Serializer.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/DOM3Serializer.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/DOMSerializer.java b/apache-xml/src/main/java/org/apache/xml/serializer/DOMSerializer.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/DOMSerializer.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/DOMSerializer.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/ElemContext.java b/apache-xml/src/main/java/org/apache/xml/serializer/ElemContext.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ElemContext.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ElemContext.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/ElemDesc.java b/apache-xml/src/main/java/org/apache/xml/serializer/ElemDesc.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ElemDesc.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ElemDesc.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/EncodingInfo.java b/apache-xml/src/main/java/org/apache/xml/serializer/EncodingInfo.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/EncodingInfo.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/EncodingInfo.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/Encodings.java b/apache-xml/src/main/java/org/apache/xml/serializer/Encodings.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/Encodings.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/Encodings.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/Encodings.properties b/apache-xml/src/main/java/org/apache/xml/serializer/Encodings.properties
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/Encodings.properties
rename to apache-xml/src/main/java/org/apache/xml/serializer/Encodings.properties


diff --git a/luni/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java b/apache-xml/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java b/apache-xml/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/HTMLEntities.properties b/apache-xml/src/main/java/org/apache/xml/serializer/HTMLEntities.properties
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/HTMLEntities.properties
rename to apache-xml/src/main/java/org/apache/xml/serializer/HTMLEntities.properties


diff --git a/luni/src/main/java/org/apache/xml/serializer/Method.java b/apache-xml/src/main/java/org/apache/xml/serializer/Method.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/Method.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/Method.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/NamespaceMappings.java b/apache-xml/src/main/java/org/apache/xml/serializer/NamespaceMappings.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/NamespaceMappings.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/NamespaceMappings.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/ObjectFactory.java b/apache-xml/src/main/java/org/apache/xml/serializer/ObjectFactory.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ObjectFactory.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ObjectFactory.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java b/apache-xml/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/OutputPropertyUtils.java b/apache-xml/src/main/java/org/apache/xml/serializer/OutputPropertyUtils.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/OutputPropertyUtils.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/OutputPropertyUtils.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/SecuritySupport.java b/apache-xml/src/main/java/org/apache/xml/serializer/SecuritySupport.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/SecuritySupport.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/SecuritySupport.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/SecuritySupport12.java b/apache-xml/src/main/java/org/apache/xml/serializer/SecuritySupport12.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/SecuritySupport12.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/SecuritySupport12.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/SerializationHandler.java b/apache-xml/src/main/java/org/apache/xml/serializer/SerializationHandler.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/SerializationHandler.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/SerializationHandler.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/Serializer.java b/apache-xml/src/main/java/org/apache/xml/serializer/Serializer.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/Serializer.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/Serializer.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/SerializerBase.java b/apache-xml/src/main/java/org/apache/xml/serializer/SerializerBase.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/SerializerBase.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/SerializerBase.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/SerializerConstants.java b/apache-xml/src/main/java/org/apache/xml/serializer/SerializerConstants.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/SerializerConstants.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/SerializerConstants.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/SerializerFactory.java b/apache-xml/src/main/java/org/apache/xml/serializer/SerializerFactory.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/SerializerFactory.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/SerializerFactory.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/SerializerTrace.java b/apache-xml/src/main/java/org/apache/xml/serializer/SerializerTrace.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/SerializerTrace.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/SerializerTrace.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/SerializerTraceWriter.java b/apache-xml/src/main/java/org/apache/xml/serializer/SerializerTraceWriter.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/SerializerTraceWriter.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/SerializerTraceWriter.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/ToHTMLStream.java b/apache-xml/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ToHTMLStream.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/ToSAXHandler.java b/apache-xml/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ToSAXHandler.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/ToStream.java b/apache-xml/src/main/java/org/apache/xml/serializer/ToStream.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ToStream.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ToStream.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java b/apache-xml/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/ToTextStream.java b/apache-xml/src/main/java/org/apache/xml/serializer/ToTextStream.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ToTextStream.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ToTextStream.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/ToUnknownStream.java b/apache-xml/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ToUnknownStream.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java b/apache-xml/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/ToXMLStream.java b/apache-xml/src/main/java/org/apache/xml/serializer/ToXMLStream.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/ToXMLStream.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/ToXMLStream.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/TransformStateSetter.java b/apache-xml/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/TransformStateSetter.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/TreeWalker.java b/apache-xml/src/main/java/org/apache/xml/serializer/TreeWalker.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/TreeWalker.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/TreeWalker.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/Version.java b/apache-xml/src/main/java/org/apache/xml/serializer/Version.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/Version.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/Version.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/Version.src b/apache-xml/src/main/java/org/apache/xml/serializer/Version.src
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/Version.src
rename to apache-xml/src/main/java/org/apache/xml/serializer/Version.src


diff --git a/luni/src/main/java/org/apache/xml/serializer/WriterChain.java b/apache-xml/src/main/java/org/apache/xml/serializer/WriterChain.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/WriterChain.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/WriterChain.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/WriterToASCI.java b/apache-xml/src/main/java/org/apache/xml/serializer/WriterToASCI.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/WriterToASCI.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/WriterToASCI.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/WriterToUTF8Buffered.java b/apache-xml/src/main/java/org/apache/xml/serializer/WriterToUTF8Buffered.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/WriterToUTF8Buffered.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/WriterToUTF8Buffered.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/XMLEntities.properties b/apache-xml/src/main/java/org/apache/xml/serializer/XMLEntities.properties
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/XMLEntities.properties
rename to apache-xml/src/main/java/org/apache/xml/serializer/XMLEntities.properties


diff --git a/luni/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java b/apache-xml/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java b/apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java b/apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/dom3/DOMConstants.java b/apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOMConstants.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/dom3/DOMConstants.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOMConstants.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java b/apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/dom3/DOMErrorImpl.java b/apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOMErrorImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/dom3/DOMErrorImpl.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOMErrorImpl.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/dom3/DOMLocatorImpl.java b/apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOMLocatorImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/dom3/DOMLocatorImpl.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOMLocatorImpl.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/dom3/DOMOutputImpl.java b/apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOMOutputImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/dom3/DOMOutputImpl.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOMOutputImpl.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/dom3/DOMStringListImpl.java b/apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOMStringListImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/dom3/DOMStringListImpl.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/dom3/DOMStringListImpl.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java b/apache-xml/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java b/apache-xml/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/output_html.properties b/apache-xml/src/main/java/org/apache/xml/serializer/output_html.properties
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/output_html.properties
rename to apache-xml/src/main/java/org/apache/xml/serializer/output_html.properties


diff --git a/luni/src/main/java/org/apache/xml/serializer/output_text.properties b/apache-xml/src/main/java/org/apache/xml/serializer/output_text.properties
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/output_text.properties
rename to apache-xml/src/main/java/org/apache/xml/serializer/output_text.properties


diff --git a/luni/src/main/java/org/apache/xml/serializer/output_unknown.properties b/apache-xml/src/main/java/org/apache/xml/serializer/output_unknown.properties
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/output_unknown.properties
rename to apache-xml/src/main/java/org/apache/xml/serializer/output_unknown.properties


diff --git a/luni/src/main/java/org/apache/xml/serializer/output_xml.properties b/apache-xml/src/main/java/org/apache/xml/serializer/output_xml.properties
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/output_xml.properties
rename to apache-xml/src/main/java/org/apache/xml/serializer/output_xml.properties


diff --git a/luni/src/main/java/org/apache/xml/serializer/package.html b/apache-xml/src/main/java/org/apache/xml/serializer/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/package.html
rename to apache-xml/src/main/java/org/apache/xml/serializer/package.html


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/AttList.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/AttList.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/AttList.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/AttList.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/DOM2Helper.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/DOM2Helper.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/DOM2Helper.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/DOM2Helper.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/Messages.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/Messages.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/Messages.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/Messages.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/MsgKey.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/MsgKey.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/MsgKey.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/MsgKey.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ca.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ca.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ca.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ca.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_cs.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_cs.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_cs.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_cs.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_de.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_de.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_de.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_de.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_en.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_en.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_en.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_en.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_es.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_es.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_es.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_es.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_fr.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_fr.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_fr.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_fr.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_hu.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_hu.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_hu.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_hu.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_it.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_it.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_it.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_it.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ja.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ja.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ja.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ja.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ko.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ko.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ko.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ko.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pl.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pl.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pl.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ru.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ru.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ru.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ru.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sk.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sk.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sk.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sk.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sl.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sl.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sl.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sv.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sv.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sv.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sv.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_tr.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_tr.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_tr.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_tr.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/StringToIntTable.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/StringToIntTable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/StringToIntTable.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/StringToIntTable.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/SystemIDResolver.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/SystemIDResolver.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/SystemIDResolver.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/SystemIDResolver.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/URI.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/URI.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/URI.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/URI.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/Utils.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/Utils.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/Utils.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/Utils.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/WrappedRuntimeException.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/WrappedRuntimeException.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/WrappedRuntimeException.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/WrappedRuntimeException.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/XML11Char.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/XML11Char.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/XML11Char.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/XML11Char.java


diff --git a/luni/src/main/java/org/apache/xml/serializer/utils/XMLChar.java b/apache-xml/src/main/java/org/apache/xml/serializer/utils/XMLChar.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/serializer/utils/XMLChar.java
rename to apache-xml/src/main/java/org/apache/xml/serializer/utils/XMLChar.java


diff --git a/luni/src/main/java/org/apache/xml/utils/AttList.java b/apache-xml/src/main/java/org/apache/xml/utils/AttList.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/AttList.java
rename to apache-xml/src/main/java/org/apache/xml/utils/AttList.java


diff --git a/luni/src/main/java/org/apache/xml/utils/BoolStack.java b/apache-xml/src/main/java/org/apache/xml/utils/BoolStack.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/BoolStack.java
rename to apache-xml/src/main/java/org/apache/xml/utils/BoolStack.java


diff --git a/luni/src/main/java/org/apache/xml/utils/Constants.java b/apache-xml/src/main/java/org/apache/xml/utils/Constants.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/Constants.java
rename to apache-xml/src/main/java/org/apache/xml/utils/Constants.java


diff --git a/luni/src/main/java/org/apache/xml/utils/DOM2Helper.java b/apache-xml/src/main/java/org/apache/xml/utils/DOM2Helper.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/DOM2Helper.java
rename to apache-xml/src/main/java/org/apache/xml/utils/DOM2Helper.java


diff --git a/luni/src/main/java/org/apache/xml/utils/DOMBuilder.java b/apache-xml/src/main/java/org/apache/xml/utils/DOMBuilder.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/DOMBuilder.java
rename to apache-xml/src/main/java/org/apache/xml/utils/DOMBuilder.java


diff --git a/luni/src/main/java/org/apache/xml/utils/DOMHelper.java b/apache-xml/src/main/java/org/apache/xml/utils/DOMHelper.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/DOMHelper.java
rename to apache-xml/src/main/java/org/apache/xml/utils/DOMHelper.java


diff --git a/luni/src/main/java/org/apache/xml/utils/DOMOrder.java b/apache-xml/src/main/java/org/apache/xml/utils/DOMOrder.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/DOMOrder.java
rename to apache-xml/src/main/java/org/apache/xml/utils/DOMOrder.java


diff --git a/luni/src/main/java/org/apache/xml/utils/DefaultErrorHandler.java b/apache-xml/src/main/java/org/apache/xml/utils/DefaultErrorHandler.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/DefaultErrorHandler.java
rename to apache-xml/src/main/java/org/apache/xml/utils/DefaultErrorHandler.java


diff --git a/luni/src/main/java/org/apache/xml/utils/FastStringBuffer.java b/apache-xml/src/main/java/org/apache/xml/utils/FastStringBuffer.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/FastStringBuffer.java
rename to apache-xml/src/main/java/org/apache/xml/utils/FastStringBuffer.java


diff --git a/luni/src/main/java/org/apache/xml/utils/IntStack.java b/apache-xml/src/main/java/org/apache/xml/utils/IntStack.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/IntStack.java
rename to apache-xml/src/main/java/org/apache/xml/utils/IntStack.java


diff --git a/luni/src/main/java/org/apache/xml/utils/IntVector.java b/apache-xml/src/main/java/org/apache/xml/utils/IntVector.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/IntVector.java
rename to apache-xml/src/main/java/org/apache/xml/utils/IntVector.java


diff --git a/luni/src/main/java/org/apache/xml/utils/NSInfo.java b/apache-xml/src/main/java/org/apache/xml/utils/NSInfo.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/NSInfo.java
rename to apache-xml/src/main/java/org/apache/xml/utils/NSInfo.java


diff --git a/luni/src/main/java/org/apache/xml/utils/NameSpace.java b/apache-xml/src/main/java/org/apache/xml/utils/NameSpace.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/NameSpace.java
rename to apache-xml/src/main/java/org/apache/xml/utils/NameSpace.java


diff --git a/luni/src/main/java/org/apache/xml/utils/NamespaceSupport2.java b/apache-xml/src/main/java/org/apache/xml/utils/NamespaceSupport2.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/NamespaceSupport2.java
rename to apache-xml/src/main/java/org/apache/xml/utils/NamespaceSupport2.java


diff --git a/luni/src/main/java/org/apache/xml/utils/NodeConsumer.java b/apache-xml/src/main/java/org/apache/xml/utils/NodeConsumer.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/NodeConsumer.java
rename to apache-xml/src/main/java/org/apache/xml/utils/NodeConsumer.java


diff --git a/luni/src/main/java/org/apache/xml/utils/NodeVector.java b/apache-xml/src/main/java/org/apache/xml/utils/NodeVector.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/NodeVector.java
rename to apache-xml/src/main/java/org/apache/xml/utils/NodeVector.java


diff --git a/luni/src/main/java/org/apache/xml/utils/ObjectFactory.java b/apache-xml/src/main/java/org/apache/xml/utils/ObjectFactory.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/ObjectFactory.java
rename to apache-xml/src/main/java/org/apache/xml/utils/ObjectFactory.java


diff --git a/luni/src/main/java/org/apache/xml/utils/ObjectPool.java b/apache-xml/src/main/java/org/apache/xml/utils/ObjectPool.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/ObjectPool.java
rename to apache-xml/src/main/java/org/apache/xml/utils/ObjectPool.java


diff --git a/luni/src/main/java/org/apache/xml/utils/ObjectStack.java b/apache-xml/src/main/java/org/apache/xml/utils/ObjectStack.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/ObjectStack.java
rename to apache-xml/src/main/java/org/apache/xml/utils/ObjectStack.java


diff --git a/luni/src/main/java/org/apache/xml/utils/ObjectVector.java b/apache-xml/src/main/java/org/apache/xml/utils/ObjectVector.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/ObjectVector.java
rename to apache-xml/src/main/java/org/apache/xml/utils/ObjectVector.java


diff --git a/luni/src/main/java/org/apache/xml/utils/PrefixResolver.java b/apache-xml/src/main/java/org/apache/xml/utils/PrefixResolver.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/PrefixResolver.java
rename to apache-xml/src/main/java/org/apache/xml/utils/PrefixResolver.java


diff --git a/luni/src/main/java/org/apache/xml/utils/PrefixResolverDefault.java b/apache-xml/src/main/java/org/apache/xml/utils/PrefixResolverDefault.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/PrefixResolverDefault.java
rename to apache-xml/src/main/java/org/apache/xml/utils/PrefixResolverDefault.java


diff --git a/luni/src/main/java/org/apache/xml/utils/QName.java b/apache-xml/src/main/java/org/apache/xml/utils/QName.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/QName.java
rename to apache-xml/src/main/java/org/apache/xml/utils/QName.java


diff --git a/luni/src/main/java/org/apache/xml/utils/SAXSourceLocator.java b/apache-xml/src/main/java/org/apache/xml/utils/SAXSourceLocator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/SAXSourceLocator.java
rename to apache-xml/src/main/java/org/apache/xml/utils/SAXSourceLocator.java


diff --git a/luni/src/main/java/org/apache/xml/utils/SecuritySupport.java b/apache-xml/src/main/java/org/apache/xml/utils/SecuritySupport.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/SecuritySupport.java
rename to apache-xml/src/main/java/org/apache/xml/utils/SecuritySupport.java


diff --git a/luni/src/main/java/org/apache/xml/utils/SecuritySupport12.java b/apache-xml/src/main/java/org/apache/xml/utils/SecuritySupport12.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/SecuritySupport12.java
rename to apache-xml/src/main/java/org/apache/xml/utils/SecuritySupport12.java


diff --git a/luni/src/main/java/org/apache/xml/utils/StopParseException.java b/apache-xml/src/main/java/org/apache/xml/utils/StopParseException.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/StopParseException.java
rename to apache-xml/src/main/java/org/apache/xml/utils/StopParseException.java


diff --git a/luni/src/main/java/org/apache/xml/utils/StringBufferPool.java b/apache-xml/src/main/java/org/apache/xml/utils/StringBufferPool.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/StringBufferPool.java
rename to apache-xml/src/main/java/org/apache/xml/utils/StringBufferPool.java


diff --git a/luni/src/main/java/org/apache/xml/utils/StringToIntTable.java b/apache-xml/src/main/java/org/apache/xml/utils/StringToIntTable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/StringToIntTable.java
rename to apache-xml/src/main/java/org/apache/xml/utils/StringToIntTable.java


diff --git a/luni/src/main/java/org/apache/xml/utils/StringVector.java b/apache-xml/src/main/java/org/apache/xml/utils/StringVector.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/StringVector.java
rename to apache-xml/src/main/java/org/apache/xml/utils/StringVector.java


diff --git a/luni/src/main/java/org/apache/xml/utils/StylesheetPIHandler.java b/apache-xml/src/main/java/org/apache/xml/utils/StylesheetPIHandler.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/StylesheetPIHandler.java
rename to apache-xml/src/main/java/org/apache/xml/utils/StylesheetPIHandler.java


diff --git a/luni/src/main/java/org/apache/xml/utils/SuballocatedIntVector.java b/apache-xml/src/main/java/org/apache/xml/utils/SuballocatedIntVector.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/SuballocatedIntVector.java
rename to apache-xml/src/main/java/org/apache/xml/utils/SuballocatedIntVector.java


diff --git a/luni/src/main/java/org/apache/xml/utils/SystemIDResolver.java b/apache-xml/src/main/java/org/apache/xml/utils/SystemIDResolver.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/SystemIDResolver.java
rename to apache-xml/src/main/java/org/apache/xml/utils/SystemIDResolver.java


diff --git a/luni/src/main/java/org/apache/xml/utils/ThreadControllerWrapper.java b/apache-xml/src/main/java/org/apache/xml/utils/ThreadControllerWrapper.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/ThreadControllerWrapper.java
rename to apache-xml/src/main/java/org/apache/xml/utils/ThreadControllerWrapper.java


diff --git a/luni/src/main/java/org/apache/xml/utils/TreeWalker.java b/apache-xml/src/main/java/org/apache/xml/utils/TreeWalker.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/TreeWalker.java
rename to apache-xml/src/main/java/org/apache/xml/utils/TreeWalker.java


diff --git a/luni/src/main/java/org/apache/xml/utils/URI.java b/apache-xml/src/main/java/org/apache/xml/utils/URI.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/URI.java
rename to apache-xml/src/main/java/org/apache/xml/utils/URI.java


diff --git a/luni/src/main/java/org/apache/xml/utils/UnImplNode.java b/apache-xml/src/main/java/org/apache/xml/utils/UnImplNode.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/UnImplNode.java
rename to apache-xml/src/main/java/org/apache/xml/utils/UnImplNode.java


diff --git a/luni/src/main/java/org/apache/xml/utils/WrappedRuntimeException.java b/apache-xml/src/main/java/org/apache/xml/utils/WrappedRuntimeException.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/WrappedRuntimeException.java
rename to apache-xml/src/main/java/org/apache/xml/utils/WrappedRuntimeException.java


diff --git a/luni/src/main/java/org/apache/xml/utils/XML11Char.java b/apache-xml/src/main/java/org/apache/xml/utils/XML11Char.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/XML11Char.java
rename to apache-xml/src/main/java/org/apache/xml/utils/XML11Char.java


diff --git a/luni/src/main/java/org/apache/xml/utils/XMLChar.java b/apache-xml/src/main/java/org/apache/xml/utils/XMLChar.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/XMLChar.java
rename to apache-xml/src/main/java/org/apache/xml/utils/XMLChar.java


diff --git a/luni/src/main/java/org/apache/xml/utils/XMLCharacterRecognizer.java b/apache-xml/src/main/java/org/apache/xml/utils/XMLCharacterRecognizer.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/XMLCharacterRecognizer.java
rename to apache-xml/src/main/java/org/apache/xml/utils/XMLCharacterRecognizer.java


diff --git a/luni/src/main/java/org/apache/xml/utils/XMLReaderManager.java b/apache-xml/src/main/java/org/apache/xml/utils/XMLReaderManager.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/XMLReaderManager.java
rename to apache-xml/src/main/java/org/apache/xml/utils/XMLReaderManager.java


diff --git a/luni/src/main/java/org/apache/xml/utils/XMLString.java b/apache-xml/src/main/java/org/apache/xml/utils/XMLString.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/XMLString.java
rename to apache-xml/src/main/java/org/apache/xml/utils/XMLString.java


diff --git a/luni/src/main/java/org/apache/xml/utils/XMLStringDefault.java b/apache-xml/src/main/java/org/apache/xml/utils/XMLStringDefault.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/XMLStringDefault.java
rename to apache-xml/src/main/java/org/apache/xml/utils/XMLStringDefault.java


diff --git a/luni/src/main/java/org/apache/xml/utils/XMLStringFactory.java b/apache-xml/src/main/java/org/apache/xml/utils/XMLStringFactory.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/XMLStringFactory.java
rename to apache-xml/src/main/java/org/apache/xml/utils/XMLStringFactory.java


diff --git a/luni/src/main/java/org/apache/xml/utils/package.html b/apache-xml/src/main/java/org/apache/xml/utils/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/package.html
rename to apache-xml/src/main/java/org/apache/xml/utils/package.html


diff --git a/luni/src/main/java/org/apache/xml/utils/res/CharArrayWrapper.java b/apache-xml/src/main/java/org/apache/xml/utils/res/CharArrayWrapper.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/CharArrayWrapper.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/CharArrayWrapper.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/IntArrayWrapper.java b/apache-xml/src/main/java/org/apache/xml/utils/res/IntArrayWrapper.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/IntArrayWrapper.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/IntArrayWrapper.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/LongArrayWrapper.java b/apache-xml/src/main/java/org/apache/xml/utils/res/LongArrayWrapper.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/LongArrayWrapper.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/LongArrayWrapper.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/StringArrayWrapper.java b/apache-xml/src/main/java/org/apache/xml/utils/res/StringArrayWrapper.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/StringArrayWrapper.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/StringArrayWrapper.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResourceBundle.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResourceBundle.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResourceBundle.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResourceBundle.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResourceBundleBase.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResourceBundleBase.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResourceBundleBase.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResourceBundleBase.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_cy.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_cy.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_cy.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_cy.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_de.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_de.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_de.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_de.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_el.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_el.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_el.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_el.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_en.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_en.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_en.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_en.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_es.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_es.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_es.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_es.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_fr.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_fr.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_fr.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_fr.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_he.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_he.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_he.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_he.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_hy.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_hy.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_hy.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_hy.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_it.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_it.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_it.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_it.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_A.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_A.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_A.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_A.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HA.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HA.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HA.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HA.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HI.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HI.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HI.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HI.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_I.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_I.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_I.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_I.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_ka.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_ka.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_ka.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_ka.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_ko.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_ko.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_ko.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_ko.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_sv.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_sv.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_sv.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_sv.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_zh_CN.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_zh_CN.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_zh_CN.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_zh_CN.java


diff --git a/luni/src/main/java/org/apache/xml/utils/res/XResources_zh_TW.java b/apache-xml/src/main/java/org/apache/xml/utils/res/XResources_zh_TW.java
similarity index 100%
rename from luni/src/main/java/org/apache/xml/utils/res/XResources_zh_TW.java
rename to apache-xml/src/main/java/org/apache/xml/utils/res/XResources_zh_TW.java


diff --git a/luni/src/main/java/org/apache/xpath/Arg.java b/apache-xml/src/main/java/org/apache/xpath/Arg.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/Arg.java
rename to apache-xml/src/main/java/org/apache/xpath/Arg.java


diff --git a/luni/src/main/java/org/apache/xpath/CachedXPathAPI.java b/apache-xml/src/main/java/org/apache/xpath/CachedXPathAPI.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/CachedXPathAPI.java
rename to apache-xml/src/main/java/org/apache/xpath/CachedXPathAPI.java


diff --git a/luni/src/main/java/org/apache/xpath/Expression.java b/apache-xml/src/main/java/org/apache/xpath/Expression.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/Expression.java
rename to apache-xml/src/main/java/org/apache/xpath/Expression.java


diff --git a/luni/src/main/java/org/apache/xpath/ExpressionNode.java b/apache-xml/src/main/java/org/apache/xpath/ExpressionNode.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/ExpressionNode.java
rename to apache-xml/src/main/java/org/apache/xpath/ExpressionNode.java


diff --git a/luni/src/main/java/org/apache/xpath/ExpressionOwner.java b/apache-xml/src/main/java/org/apache/xpath/ExpressionOwner.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/ExpressionOwner.java
rename to apache-xml/src/main/java/org/apache/xpath/ExpressionOwner.java


diff --git a/luni/src/main/java/org/apache/xpath/ExtensionsProvider.java b/apache-xml/src/main/java/org/apache/xpath/ExtensionsProvider.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/ExtensionsProvider.java
rename to apache-xml/src/main/java/org/apache/xpath/ExtensionsProvider.java


diff --git a/luni/src/main/java/org/apache/xpath/FoundIndex.java b/apache-xml/src/main/java/org/apache/xpath/FoundIndex.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/FoundIndex.java
rename to apache-xml/src/main/java/org/apache/xpath/FoundIndex.java


diff --git a/luni/src/main/java/org/apache/xpath/NodeSet.java b/apache-xml/src/main/java/org/apache/xpath/NodeSet.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/NodeSet.java
rename to apache-xml/src/main/java/org/apache/xpath/NodeSet.java


diff --git a/luni/src/main/java/org/apache/xpath/NodeSetDTM.java b/apache-xml/src/main/java/org/apache/xpath/NodeSetDTM.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/NodeSetDTM.java
rename to apache-xml/src/main/java/org/apache/xpath/NodeSetDTM.java


diff --git a/luni/src/main/java/org/apache/xpath/SourceTree.java b/apache-xml/src/main/java/org/apache/xpath/SourceTree.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/SourceTree.java
rename to apache-xml/src/main/java/org/apache/xpath/SourceTree.java


diff --git a/luni/src/main/java/org/apache/xpath/SourceTreeManager.java b/apache-xml/src/main/java/org/apache/xpath/SourceTreeManager.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/SourceTreeManager.java
rename to apache-xml/src/main/java/org/apache/xpath/SourceTreeManager.java


diff --git a/luni/src/main/java/org/apache/xpath/VariableStack.java b/apache-xml/src/main/java/org/apache/xpath/VariableStack.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/VariableStack.java
rename to apache-xml/src/main/java/org/apache/xpath/VariableStack.java


diff --git a/luni/src/main/java/org/apache/xpath/WhitespaceStrippingElementMatcher.java b/apache-xml/src/main/java/org/apache/xpath/WhitespaceStrippingElementMatcher.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/WhitespaceStrippingElementMatcher.java
rename to apache-xml/src/main/java/org/apache/xpath/WhitespaceStrippingElementMatcher.java


diff --git a/luni/src/main/java/org/apache/xpath/XPath.java b/apache-xml/src/main/java/org/apache/xpath/XPath.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/XPath.java
rename to apache-xml/src/main/java/org/apache/xpath/XPath.java


diff --git a/luni/src/main/java/org/apache/xpath/XPathAPI.java b/apache-xml/src/main/java/org/apache/xpath/XPathAPI.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/XPathAPI.java
rename to apache-xml/src/main/java/org/apache/xpath/XPathAPI.java


diff --git a/luni/src/main/java/org/apache/xpath/XPathContext.java b/apache-xml/src/main/java/org/apache/xpath/XPathContext.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/XPathContext.java
rename to apache-xml/src/main/java/org/apache/xpath/XPathContext.java


diff --git a/luni/src/main/java/org/apache/xpath/XPathException.java b/apache-xml/src/main/java/org/apache/xpath/XPathException.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/XPathException.java
rename to apache-xml/src/main/java/org/apache/xpath/XPathException.java


diff --git a/luni/src/main/java/org/apache/xpath/XPathFactory.java b/apache-xml/src/main/java/org/apache/xpath/XPathFactory.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/XPathFactory.java
rename to apache-xml/src/main/java/org/apache/xpath/XPathFactory.java


diff --git a/luni/src/main/java/org/apache/xpath/XPathProcessorException.java b/apache-xml/src/main/java/org/apache/xpath/XPathProcessorException.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/XPathProcessorException.java
rename to apache-xml/src/main/java/org/apache/xpath/XPathProcessorException.java


diff --git a/luni/src/main/java/org/apache/xpath/XPathVisitable.java b/apache-xml/src/main/java/org/apache/xpath/XPathVisitable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/XPathVisitable.java
rename to apache-xml/src/main/java/org/apache/xpath/XPathVisitable.java


diff --git a/luni/src/main/java/org/apache/xpath/XPathVisitor.java b/apache-xml/src/main/java/org/apache/xpath/XPathVisitor.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/XPathVisitor.java
rename to apache-xml/src/main/java/org/apache/xpath/XPathVisitor.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/AttributeIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/AttributeIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/AttributeIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/AttributeIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/AxesWalker.java b/apache-xml/src/main/java/org/apache/xpath/axes/AxesWalker.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/AxesWalker.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/AxesWalker.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/BasicTestIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/BasicTestIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/BasicTestIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/BasicTestIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/ChildIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/ChildIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/ChildIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/ChildIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/ChildTestIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/ChildTestIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/ChildTestIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/ChildTestIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/ContextNodeList.java b/apache-xml/src/main/java/org/apache/xpath/axes/ContextNodeList.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/ContextNodeList.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/ContextNodeList.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/DescendantIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/DescendantIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/DescendantIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/DescendantIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/FilterExprIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/FilterExprIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/FilterExprIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/FilterExprIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java b/apache-xml/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/FilterExprWalker.java b/apache-xml/src/main/java/org/apache/xpath/axes/FilterExprWalker.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/FilterExprWalker.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/FilterExprWalker.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/HasPositionalPredChecker.java b/apache-xml/src/main/java/org/apache/xpath/axes/HasPositionalPredChecker.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/HasPositionalPredChecker.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/HasPositionalPredChecker.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/IteratorPool.java b/apache-xml/src/main/java/org/apache/xpath/axes/IteratorPool.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/IteratorPool.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/IteratorPool.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/LocPathIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/LocPathIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/LocPathIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/LocPathIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/MatchPatternIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/MatchPatternIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/MatchPatternIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/MatchPatternIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/NodeSequence.java b/apache-xml/src/main/java/org/apache/xpath/axes/NodeSequence.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/NodeSequence.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/NodeSequence.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/OneStepIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/OneStepIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/OneStepIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/OneStepIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/OneStepIteratorForward.java b/apache-xml/src/main/java/org/apache/xpath/axes/OneStepIteratorForward.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/OneStepIteratorForward.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/OneStepIteratorForward.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/PathComponent.java b/apache-xml/src/main/java/org/apache/xpath/axes/PathComponent.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/PathComponent.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/PathComponent.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/PredicatedNodeTest.java b/apache-xml/src/main/java/org/apache/xpath/axes/PredicatedNodeTest.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/PredicatedNodeTest.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/PredicatedNodeTest.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/RTFIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/RTFIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/RTFIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/RTFIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/ReverseAxesWalker.java b/apache-xml/src/main/java/org/apache/xpath/axes/ReverseAxesWalker.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/ReverseAxesWalker.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/ReverseAxesWalker.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/SelfIteratorNoPredicate.java b/apache-xml/src/main/java/org/apache/xpath/axes/SelfIteratorNoPredicate.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/SelfIteratorNoPredicate.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/SelfIteratorNoPredicate.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/SubContextList.java b/apache-xml/src/main/java/org/apache/xpath/axes/SubContextList.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/SubContextList.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/SubContextList.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/UnionChildIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/UnionChildIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/UnionChildIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/UnionChildIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/UnionPathIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/UnionPathIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/UnionPathIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/UnionPathIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/WalkerFactory.java b/apache-xml/src/main/java/org/apache/xpath/axes/WalkerFactory.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/WalkerFactory.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/WalkerFactory.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/WalkingIterator.java b/apache-xml/src/main/java/org/apache/xpath/axes/WalkingIterator.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/WalkingIterator.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/WalkingIterator.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/WalkingIteratorSorted.java b/apache-xml/src/main/java/org/apache/xpath/axes/WalkingIteratorSorted.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/WalkingIteratorSorted.java
rename to apache-xml/src/main/java/org/apache/xpath/axes/WalkingIteratorSorted.java


diff --git a/luni/src/main/java/org/apache/xpath/axes/package.html b/apache-xml/src/main/java/org/apache/xpath/axes/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/axes/package.html
rename to apache-xml/src/main/java/org/apache/xpath/axes/package.html


diff --git a/luni/src/main/java/org/apache/xpath/compiler/Compiler.java b/apache-xml/src/main/java/org/apache/xpath/compiler/Compiler.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/compiler/Compiler.java
rename to apache-xml/src/main/java/org/apache/xpath/compiler/Compiler.java


diff --git a/luni/src/main/java/org/apache/xpath/compiler/FunctionTable.java b/apache-xml/src/main/java/org/apache/xpath/compiler/FunctionTable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/compiler/FunctionTable.java
rename to apache-xml/src/main/java/org/apache/xpath/compiler/FunctionTable.java


diff --git a/luni/src/main/java/org/apache/xpath/compiler/Keywords.java b/apache-xml/src/main/java/org/apache/xpath/compiler/Keywords.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/compiler/Keywords.java
rename to apache-xml/src/main/java/org/apache/xpath/compiler/Keywords.java


diff --git a/luni/src/main/java/org/apache/xpath/compiler/Lexer.java b/apache-xml/src/main/java/org/apache/xpath/compiler/Lexer.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/compiler/Lexer.java
rename to apache-xml/src/main/java/org/apache/xpath/compiler/Lexer.java


diff --git a/luni/src/main/java/org/apache/xpath/compiler/OpCodes.java b/apache-xml/src/main/java/org/apache/xpath/compiler/OpCodes.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/compiler/OpCodes.java
rename to apache-xml/src/main/java/org/apache/xpath/compiler/OpCodes.java


diff --git a/luni/src/main/java/org/apache/xpath/compiler/OpMap.java b/apache-xml/src/main/java/org/apache/xpath/compiler/OpMap.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/compiler/OpMap.java
rename to apache-xml/src/main/java/org/apache/xpath/compiler/OpMap.java


diff --git a/luni/src/main/java/org/apache/xpath/compiler/OpMapVector.java b/apache-xml/src/main/java/org/apache/xpath/compiler/OpMapVector.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/compiler/OpMapVector.java
rename to apache-xml/src/main/java/org/apache/xpath/compiler/OpMapVector.java


diff --git a/luni/src/main/java/org/apache/xpath/compiler/PsuedoNames.java b/apache-xml/src/main/java/org/apache/xpath/compiler/PsuedoNames.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/compiler/PsuedoNames.java
rename to apache-xml/src/main/java/org/apache/xpath/compiler/PsuedoNames.java


diff --git a/luni/src/main/java/org/apache/xpath/compiler/XPathDumper.java b/apache-xml/src/main/java/org/apache/xpath/compiler/XPathDumper.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/compiler/XPathDumper.java
rename to apache-xml/src/main/java/org/apache/xpath/compiler/XPathDumper.java


diff --git a/luni/src/main/java/org/apache/xpath/compiler/XPathParser.java b/apache-xml/src/main/java/org/apache/xpath/compiler/XPathParser.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/compiler/XPathParser.java
rename to apache-xml/src/main/java/org/apache/xpath/compiler/XPathParser.java


diff --git a/luni/src/main/java/org/apache/xpath/compiler/package.html b/apache-xml/src/main/java/org/apache/xpath/compiler/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/compiler/package.html
rename to apache-xml/src/main/java/org/apache/xpath/compiler/package.html


diff --git a/luni/src/main/java/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java b/apache-xml/src/main/java/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java
rename to apache-xml/src/main/java/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncBoolean.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncBoolean.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncBoolean.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncBoolean.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncCeiling.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncCeiling.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncCeiling.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncCeiling.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncConcat.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncConcat.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncConcat.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncConcat.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncContains.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncContains.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncContains.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncContains.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncCount.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncCount.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncCount.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncCount.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncCurrent.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncCurrent.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncCurrent.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncCurrent.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncDoclocation.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncDoclocation.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncDoclocation.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncDoclocation.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncExtElementAvailable.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncExtElementAvailable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncExtElementAvailable.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncExtElementAvailable.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncExtFunction.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncExtFunction.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncExtFunction.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncExtFunction.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncExtFunctionAvailable.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncExtFunctionAvailable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncExtFunctionAvailable.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncExtFunctionAvailable.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncFalse.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncFalse.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncFalse.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncFalse.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncFloor.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncFloor.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncFloor.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncFloor.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncGenerateId.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncGenerateId.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncGenerateId.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncGenerateId.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncId.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncId.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncId.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncId.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncLang.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncLang.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncLang.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncLang.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncLast.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncLast.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncLast.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncLast.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncLocalPart.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncLocalPart.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncLocalPart.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncLocalPart.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncNamespace.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncNamespace.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncNamespace.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncNamespace.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncNormalizeSpace.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncNormalizeSpace.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncNormalizeSpace.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncNormalizeSpace.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncNot.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncNot.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncNot.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncNot.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncNumber.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncNumber.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncNumber.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncNumber.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncPosition.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncPosition.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncPosition.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncPosition.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncQname.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncQname.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncQname.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncQname.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncRound.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncRound.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncRound.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncRound.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncStartsWith.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncStartsWith.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncStartsWith.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncStartsWith.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncString.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncString.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncString.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncString.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncStringLength.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncStringLength.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncStringLength.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncStringLength.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncSubstring.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncSubstring.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncSubstring.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncSubstring.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncSubstringAfter.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncSubstringAfter.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncSubstringAfter.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncSubstringAfter.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncSubstringBefore.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncSubstringBefore.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncSubstringBefore.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncSubstringBefore.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncSum.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncSum.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncSum.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncSum.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncSystemProperty.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncSystemProperty.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncSystemProperty.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncSystemProperty.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncTranslate.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncTranslate.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncTranslate.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncTranslate.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncTrue.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncTrue.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncTrue.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncTrue.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FuncUnparsedEntityURI.java b/apache-xml/src/main/java/org/apache/xpath/functions/FuncUnparsedEntityURI.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FuncUnparsedEntityURI.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FuncUnparsedEntityURI.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/Function.java b/apache-xml/src/main/java/org/apache/xpath/functions/Function.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/Function.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/Function.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/Function2Args.java b/apache-xml/src/main/java/org/apache/xpath/functions/Function2Args.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/Function2Args.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/Function2Args.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/Function3Args.java b/apache-xml/src/main/java/org/apache/xpath/functions/Function3Args.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/Function3Args.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/Function3Args.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FunctionDef1Arg.java b/apache-xml/src/main/java/org/apache/xpath/functions/FunctionDef1Arg.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FunctionDef1Arg.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FunctionDef1Arg.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FunctionMultiArgs.java b/apache-xml/src/main/java/org/apache/xpath/functions/FunctionMultiArgs.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FunctionMultiArgs.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FunctionMultiArgs.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/FunctionOneArg.java b/apache-xml/src/main/java/org/apache/xpath/functions/FunctionOneArg.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/FunctionOneArg.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/FunctionOneArg.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/ObjectFactory.java b/apache-xml/src/main/java/org/apache/xpath/functions/ObjectFactory.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/ObjectFactory.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/ObjectFactory.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/SecuritySupport.java b/apache-xml/src/main/java/org/apache/xpath/functions/SecuritySupport.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/SecuritySupport.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/SecuritySupport.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/SecuritySupport12.java b/apache-xml/src/main/java/org/apache/xpath/functions/SecuritySupport12.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/SecuritySupport12.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/SecuritySupport12.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/WrongNumberArgsException.java b/apache-xml/src/main/java/org/apache/xpath/functions/WrongNumberArgsException.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/WrongNumberArgsException.java
rename to apache-xml/src/main/java/org/apache/xpath/functions/WrongNumberArgsException.java


diff --git a/luni/src/main/java/org/apache/xpath/functions/package.html b/apache-xml/src/main/java/org/apache/xpath/functions/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/functions/package.html
rename to apache-xml/src/main/java/org/apache/xpath/functions/package.html


diff --git a/luni/src/main/java/org/apache/xpath/jaxp/JAXPExtensionsProvider.java b/apache-xml/src/main/java/org/apache/xpath/jaxp/JAXPExtensionsProvider.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/jaxp/JAXPExtensionsProvider.java
rename to apache-xml/src/main/java/org/apache/xpath/jaxp/JAXPExtensionsProvider.java


diff --git a/luni/src/main/java/org/apache/xpath/jaxp/JAXPPrefixResolver.java b/apache-xml/src/main/java/org/apache/xpath/jaxp/JAXPPrefixResolver.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/jaxp/JAXPPrefixResolver.java
rename to apache-xml/src/main/java/org/apache/xpath/jaxp/JAXPPrefixResolver.java


diff --git a/luni/src/main/java/org/apache/xpath/jaxp/JAXPVariableStack.java b/apache-xml/src/main/java/org/apache/xpath/jaxp/JAXPVariableStack.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/jaxp/JAXPVariableStack.java
rename to apache-xml/src/main/java/org/apache/xpath/jaxp/JAXPVariableStack.java


diff --git a/luni/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java b/apache-xml/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java
rename to apache-xml/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java


diff --git a/luni/src/main/java/org/apache/xpath/jaxp/XPathFactoryImpl.java b/apache-xml/src/main/java/org/apache/xpath/jaxp/XPathFactoryImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/jaxp/XPathFactoryImpl.java
rename to apache-xml/src/main/java/org/apache/xpath/jaxp/XPathFactoryImpl.java


diff --git a/luni/src/main/java/org/apache/xpath/jaxp/XPathImpl.java b/apache-xml/src/main/java/org/apache/xpath/jaxp/XPathImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/jaxp/XPathImpl.java
rename to apache-xml/src/main/java/org/apache/xpath/jaxp/XPathImpl.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/DTMXRTreeFrag.java b/apache-xml/src/main/java/org/apache/xpath/objects/DTMXRTreeFrag.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/DTMXRTreeFrag.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/DTMXRTreeFrag.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XBoolean.java b/apache-xml/src/main/java/org/apache/xpath/objects/XBoolean.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XBoolean.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XBoolean.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XBooleanStatic.java b/apache-xml/src/main/java/org/apache/xpath/objects/XBooleanStatic.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XBooleanStatic.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XBooleanStatic.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XMLStringFactoryImpl.java b/apache-xml/src/main/java/org/apache/xpath/objects/XMLStringFactoryImpl.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XMLStringFactoryImpl.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XMLStringFactoryImpl.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XNodeSet.java b/apache-xml/src/main/java/org/apache/xpath/objects/XNodeSet.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XNodeSet.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XNodeSet.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XNodeSetForDOM.java b/apache-xml/src/main/java/org/apache/xpath/objects/XNodeSetForDOM.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XNodeSetForDOM.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XNodeSetForDOM.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XNull.java b/apache-xml/src/main/java/org/apache/xpath/objects/XNull.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XNull.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XNull.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XNumber.java b/apache-xml/src/main/java/org/apache/xpath/objects/XNumber.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XNumber.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XNumber.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XObject.java b/apache-xml/src/main/java/org/apache/xpath/objects/XObject.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XObject.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XObject.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XObjectFactory.java b/apache-xml/src/main/java/org/apache/xpath/objects/XObjectFactory.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XObjectFactory.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XObjectFactory.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XRTreeFrag.java b/apache-xml/src/main/java/org/apache/xpath/objects/XRTreeFrag.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XRTreeFrag.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XRTreeFrag.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XRTreeFragSelectWrapper.java b/apache-xml/src/main/java/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XRTreeFragSelectWrapper.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XString.java b/apache-xml/src/main/java/org/apache/xpath/objects/XString.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XString.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XString.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XStringForChars.java b/apache-xml/src/main/java/org/apache/xpath/objects/XStringForChars.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XStringForChars.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XStringForChars.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/XStringForFSB.java b/apache-xml/src/main/java/org/apache/xpath/objects/XStringForFSB.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/XStringForFSB.java
rename to apache-xml/src/main/java/org/apache/xpath/objects/XStringForFSB.java


diff --git a/luni/src/main/java/org/apache/xpath/objects/package.html b/apache-xml/src/main/java/org/apache/xpath/objects/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/objects/package.html
rename to apache-xml/src/main/java/org/apache/xpath/objects/package.html


diff --git a/luni/src/main/java/org/apache/xpath/operations/And.java b/apache-xml/src/main/java/org/apache/xpath/operations/And.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/And.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/And.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Bool.java b/apache-xml/src/main/java/org/apache/xpath/operations/Bool.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Bool.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Bool.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Div.java b/apache-xml/src/main/java/org/apache/xpath/operations/Div.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Div.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Div.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Equals.java b/apache-xml/src/main/java/org/apache/xpath/operations/Equals.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Equals.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Equals.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Gt.java b/apache-xml/src/main/java/org/apache/xpath/operations/Gt.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Gt.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Gt.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Gte.java b/apache-xml/src/main/java/org/apache/xpath/operations/Gte.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Gte.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Gte.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Lt.java b/apache-xml/src/main/java/org/apache/xpath/operations/Lt.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Lt.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Lt.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Lte.java b/apache-xml/src/main/java/org/apache/xpath/operations/Lte.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Lte.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Lte.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Minus.java b/apache-xml/src/main/java/org/apache/xpath/operations/Minus.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Minus.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Minus.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Mod.java b/apache-xml/src/main/java/org/apache/xpath/operations/Mod.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Mod.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Mod.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Mult.java b/apache-xml/src/main/java/org/apache/xpath/operations/Mult.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Mult.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Mult.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Neg.java b/apache-xml/src/main/java/org/apache/xpath/operations/Neg.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Neg.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Neg.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/NotEquals.java b/apache-xml/src/main/java/org/apache/xpath/operations/NotEquals.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/NotEquals.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/NotEquals.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Number.java b/apache-xml/src/main/java/org/apache/xpath/operations/Number.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Number.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Number.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Operation.java b/apache-xml/src/main/java/org/apache/xpath/operations/Operation.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Operation.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Operation.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Or.java b/apache-xml/src/main/java/org/apache/xpath/operations/Or.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Or.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Or.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Plus.java b/apache-xml/src/main/java/org/apache/xpath/operations/Plus.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Plus.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Plus.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Quo.java b/apache-xml/src/main/java/org/apache/xpath/operations/Quo.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Quo.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Quo.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/String.java b/apache-xml/src/main/java/org/apache/xpath/operations/String.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/String.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/String.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/UnaryOperation.java b/apache-xml/src/main/java/org/apache/xpath/operations/UnaryOperation.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/UnaryOperation.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/UnaryOperation.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/Variable.java b/apache-xml/src/main/java/org/apache/xpath/operations/Variable.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/Variable.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/Variable.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/VariableSafeAbsRef.java b/apache-xml/src/main/java/org/apache/xpath/operations/VariableSafeAbsRef.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/VariableSafeAbsRef.java
rename to apache-xml/src/main/java/org/apache/xpath/operations/VariableSafeAbsRef.java


diff --git a/luni/src/main/java/org/apache/xpath/operations/package.html b/apache-xml/src/main/java/org/apache/xpath/operations/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/operations/package.html
rename to apache-xml/src/main/java/org/apache/xpath/operations/package.html


diff --git a/luni/src/main/java/org/apache/xpath/package.html b/apache-xml/src/main/java/org/apache/xpath/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/package.html
rename to apache-xml/src/main/java/org/apache/xpath/package.html


diff --git a/luni/src/main/java/org/apache/xpath/patterns/ContextMatchStepPattern.java b/apache-xml/src/main/java/org/apache/xpath/patterns/ContextMatchStepPattern.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/patterns/ContextMatchStepPattern.java
rename to apache-xml/src/main/java/org/apache/xpath/patterns/ContextMatchStepPattern.java


diff --git a/luni/src/main/java/org/apache/xpath/patterns/FunctionPattern.java b/apache-xml/src/main/java/org/apache/xpath/patterns/FunctionPattern.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/patterns/FunctionPattern.java
rename to apache-xml/src/main/java/org/apache/xpath/patterns/FunctionPattern.java


diff --git a/luni/src/main/java/org/apache/xpath/patterns/NodeTest.java b/apache-xml/src/main/java/org/apache/xpath/patterns/NodeTest.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/patterns/NodeTest.java
rename to apache-xml/src/main/java/org/apache/xpath/patterns/NodeTest.java


diff --git a/luni/src/main/java/org/apache/xpath/patterns/NodeTestFilter.java b/apache-xml/src/main/java/org/apache/xpath/patterns/NodeTestFilter.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/patterns/NodeTestFilter.java
rename to apache-xml/src/main/java/org/apache/xpath/patterns/NodeTestFilter.java


diff --git a/luni/src/main/java/org/apache/xpath/patterns/StepPattern.java b/apache-xml/src/main/java/org/apache/xpath/patterns/StepPattern.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/patterns/StepPattern.java
rename to apache-xml/src/main/java/org/apache/xpath/patterns/StepPattern.java


diff --git a/luni/src/main/java/org/apache/xpath/patterns/UnionPattern.java b/apache-xml/src/main/java/org/apache/xpath/patterns/UnionPattern.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/patterns/UnionPattern.java
rename to apache-xml/src/main/java/org/apache/xpath/patterns/UnionPattern.java


diff --git a/luni/src/main/java/org/apache/xpath/patterns/package.html b/apache-xml/src/main/java/org/apache/xpath/patterns/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/patterns/package.html
rename to apache-xml/src/main/java/org/apache/xpath/patterns/package.html


diff --git a/luni/src/main/java/org/apache/xpath/res/XPATHErrorResources.java b/apache-xml/src/main/java/org/apache/xpath/res/XPATHErrorResources.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/res/XPATHErrorResources.java
rename to apache-xml/src/main/java/org/apache/xpath/res/XPATHErrorResources.java


diff --git a/luni/src/main/java/org/apache/xpath/res/XPATHMessages.java b/apache-xml/src/main/java/org/apache/xpath/res/XPATHMessages.java
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/res/XPATHMessages.java
rename to apache-xml/src/main/java/org/apache/xpath/res/XPATHMessages.java


diff --git a/luni/src/main/java/org/apache/xpath/res/package.html b/apache-xml/src/main/java/org/apache/xpath/res/package.html
similarity index 100%
rename from luni/src/main/java/org/apache/xpath/res/package.html
rename to apache-xml/src/main/java/org/apache/xpath/res/package.html


diff --git a/luni/src/main/java/javax/xml/transform/TransformerFactory.java b/luni/src/main/java/javax/xml/transform/TransformerFactory.java
index a9ebf62..c6c92ce 100644
--- a/luni/src/main/java/javax/xml/transform/TransformerFactory.java
+++ b/luni/src/main/java/javax/xml/transform/TransformerFactory.java

@@ -19,8 +19,6 @@
 
 package javax.xml.transform;
 
-import org.apache.xalan.processor.TransformerFactoryImpl;
-
 /**
  * <p>A TransformerFactory instance can be used to create
  * {@link javax.xml.transform.Transformer} and
@@ -75,8 +73,12 @@
      */
     public static TransformerFactory newInstance()
             throws TransformerFactoryConfigurationError {
-        // instantiate the class directly rather than using reflection
-        return new TransformerFactoryImpl();
+        String className = "org.apache.xalan.processor.TransformerFactoryImpl";
+        try {
+            return (TransformerFactory) Class.forName(className).newInstance();
+        } catch (Exception e) {
+            throw new NoClassDefFoundError(className);
+        }
     }
 
     /**

diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java
index 46845b6..6724776 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java

@@ -18,7 +18,6 @@
 
 import java.util.Map;
 import java.util.TreeMap;
-import org.apache.xml.serializer.dom3.DOMErrorImpl;
 import org.w3c.dom.DOMConfiguration;
 import org.w3c.dom.DOMError;
 import org.w3c.dom.DOMErrorHandler;
@@ -484,7 +483,7 @@
     private void report(short severity, String type) {
         if (errorHandler != null) {
             // TODO: abort if handleError returns false
-            errorHandler.handleError(new DOMErrorImpl(severity, type, type));
+            errorHandler.handleError(new DOMErrorImpl(severity, type));
         }
     }
 }

diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/DOMErrorImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DOMErrorImpl.java
new file mode 100644
index 0000000..06e669b
--- /dev/null
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/DOMErrorImpl.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.harmony.xml.dom;
+
+import org.w3c.dom.DOMError;
+import org.w3c.dom.DOMLocator;
+import org.w3c.dom.Node;
+
+public final class DOMErrorImpl implements DOMError {
+    private static final DOMLocator NULL_DOM_LOCATOR = new DOMLocator() {
+        public int getLineNumber() {
+            return -1;
+        }
+        public int getColumnNumber() {
+            return -1;
+        }
+        public int getByteOffset() {
+            return -1;
+        }
+        public int getUtf16Offset() {
+            return -1;
+        }
+        public Node getRelatedNode() {
+            return null;
+        }
+        public String getUri() {
+            return null;
+        }
+    };
+
+    private final short severity;
+    private final String type;
+
+    public DOMErrorImpl(short severity, String type) {
+        this.severity = severity;
+        this.type = type;
+    }
+
+    public short getSeverity() {
+        return severity;
+    }
+
+    public String getMessage() {
+        return type;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public Object getRelatedException() {
+        return null;
+    }
+
+    public Object getRelatedData() {
+        return null;
+    }
+
+    public DOMLocator getLocation() {
+        return NULL_DOM_LOCATOR;
+    }
+}

diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
index 31ead86..086f6ad 100644
--- a/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java

@@ -16,12 +16,11 @@
 
 package org.apache.harmony.xml.dom;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import javax.xml.transform.TransformerException;
-import org.apache.xml.serializer.utils.SystemIDResolver;
-import org.apache.xml.utils.URI;
 import org.w3c.dom.Attr;
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.DOMException;
@@ -322,26 +321,27 @@
                 String uri = element.getAttributeNS(
                         "http://www.w3.org/XML/1998/namespace", "base"); // or "xml:base"
 
-                // if this node has no base URI, return the parent's.
-                if (uri == null || uri.length() == 0) {
-                    return getParentBaseUri();
-                }
-
-                // if this node's URI is absolute, return that
-                if (SystemIDResolver.isAbsoluteURI(uri)) {
-                    return uri;
-                }
-
-                // this node has a relative URI. Try to resolve it against the
-                // parent, but if that doesn't work just give up and return null.
-                String parentUri = getParentBaseUri();
-                if (parentUri == null) {
-                    return null;
-                }
                 try {
-                    return SystemIDResolver.getAbsoluteURI(uri, parentUri);
-                } catch (TransformerException e) {
-                    return null; // the spec requires that we swallow exceptions
+                    // if this node has no base URI, return the parent's.
+                    if (uri == null || uri.isEmpty()) {
+                        return getParentBaseUri();
+                    }
+
+                    // if this node's URI is absolute, return it
+                    if (new URI(uri).isAbsolute()) {
+                        return uri;
+                    }
+
+                    // this node has a relative URI. Try to resolve it against the
+                    // parent, but if that doesn't work just give up and return null.
+                    String parentUri = getParentBaseUri();
+                    if (parentUri == null) {
+                        return null;
+                    }
+
+                    return new URI(parentUri).resolve(uri).toString();
+                } catch (URISyntaxException e) {
+                    return null;
                 }
 
             case PROCESSING_INSTRUCTION_NODE:
@@ -386,7 +386,7 @@
         }
         try {
             return new URI(uri).toString();
-        } catch (URI.MalformedURIException e) {
+        } catch (URISyntaxException e) {
             return null;
         }
     }
commit	f029395dff382fc4dcba0689fd948ec06644e1f0	[log] [tgz]
author	Jesse Wilson <jessewilson@google.com>	Sun Jan 09 16:01:24 2011 -0800
committer	Jesse Wilson <jessewilson@google.com>	Sun Jan 09 16:01:24 2011 -0800
tree	69a3dca5780ed2f6c5f09c1efb22a1f7a23e73cb
parent	1c1007df57b41662e60d650db918f1581b20fc45 [diff]