Merge awt-kernel, icu, luni-kernel, prefs, security-kernel, x-net into luni

Merge xml except xmlpull and kxml into luni
author: Peter Hallam <peterhal@google.com> 2010-05-03 12:57:15 -0700
committer: Peter Hallam <peterhal@google.com> 2010-05-04 16:30:12 -0700
commit: 6b811c5daec1b28e6f63b57f98a032236f2c3cf7 (patch)
tree: a733f20e87a9739253d495c14d54e7d253e35771
parent: 0a98ab45e3566542f2d669eb0ffd28a560d97d28 (diff)
download: libcore-6b811c5daec1b28e6f63b57f98a032236f2c3cf7.zip
libcore-6b811c5daec1b28e6f63b57f98a032236f2c3cf7.tar.gz
libcore-6b811c5daec1b28e6f63b57f98a032236f2c3cf7.tar.bz2
1131 files changed, 29 insertions, 126 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 6f4a050..d3d4355 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -50,7 +50,7 @@ $(shell cd $(LOCAL_PATH) && ls -d */src/$(1)/{java,resources} 2> /dev/null)
 endef
 
 # The Java files and their associated resources.
-core_src_files := $(call all-main-java-files-under,awt-kernel dalvik dom icu json junit luni luni-kernel openssl prefs security-kernel support x-net xml)
+core_src_files := $(call all-main-java-files-under,dalvik dom json junit luni openssl support xml)
 core_resource_dirs := $(call all-core-resource-dirs,main)
 test_resource_dirs := $(call all-core-resource-dirs,test)
 
@@ -124,16 +124,6 @@ LOCAL_MODULE := core-tests-json
 include $(BUILD_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,luni-kernel)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-luni-kernel
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-test-java-files-under,luni)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
@@ -146,9 +136,6 @@ LOCAL_JAVA_LIBRARIES := \
         core-tests-support \
         core-tests-dom \
         core-tests-json \
-        core-tests-luni-kernel \
-        core-tests-prefs \
-        core-tests-x-net \
         core-tests-xml \
         sqlite-jdbc
 LOCAL_DX_FLAGS := --core-library
@@ -157,16 +144,6 @@ LOCAL_MODULE := core-tests-luni
 include $(BUILD_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,prefs)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-prefs
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-test-java-files-under,support)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
@@ -177,16 +154,6 @@ LOCAL_MODULE := core-tests-support
 include $(BUILD_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,x-net)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-x-net
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-test-java-files-under,xml)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
diff --git a/awt-kernel/MODULE_LICENSE_APACHE2 b/awt-kernel/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/awt-kernel/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/icu/MODULE_LICENSE_BSD_LIKE b/icu/MODULE_LICENSE_BSD_LIKE
deleted file mode 100644
index e69de29..0000000
--- a/icu/MODULE_LICENSE_BSD_LIKE
+++ /dev/null
diff --git a/icu/src/main/native/sub.mk b/icu/src/main/native/sub.mk
deleted file mode 100644
index 599c102..0000000
--- a/icu/src/main/native/sub.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file is included by the top-level libcore Android.mk.
-# It's not a normal makefile, so we don't include CLEAR_VARS
-# or BUILD_*_LIBRARY.
-
-LOCAL_SRC_FILES := \
-	BidiWrapper.cpp \
-	ErrorCode.cpp \
-	ICU.cpp \
-	NativeBreakIterator.cpp \
-	NativeCollation.cpp \
-	NativeConverter.cpp \
-	NativeDecimalFormat.cpp \
-	NativeIDN.cpp \
-	NativeNormalizer.cpp \
-	NativeRegEx.cpp \
-	UCharacter.cpp
-
-LOCAL_C_INCLUDES += \
-	external/icu4c/common \
-	external/icu4c/i18n
-
-# Any shared/static libs that are listed here must also
-# be listed in libs/nativehelper/Android.mk.
-# TODO: fix this requirement
-
-LOCAL_SHARED_LIBRARIES += \
-	libicudata \
-	libicuuc \
-	libicui18n
-
-LOCAL_STATIC_LIBRARIES +=
diff --git a/luni-kernel/MODULE_LICENSE_APACHE2 b/luni-kernel/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/luni-kernel/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/luni-kernel/src/main/native/sub.mk b/luni-kernel/src/main/native/sub.mk
deleted file mode 100644
index 7f6417b..0000000
--- a/luni-kernel/src/main/native/sub.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is included by the top-level libcore Android.mk.
-# It's not a normal makefile, so we don't include CLEAR_VARS
-# or BUILD_*_LIBRARY.
-
-LOCAL_SRC_FILES := \
-	java_lang_ProcessManager.cpp \
-	java_lang_System.cpp \
-	Register.cpp
-
-LOCAL_C_INCLUDES +=
-
-# Any shared/static libs that are listed here must also
-# be listed in libs/nativehelper/Android.mk.
-# TODO: fix this requirement
-
-LOCAL_SHARED_LIBRARIES +=
-
-LOCAL_STATIC_LIBRARIES +=
diff --git a/xml/MODULE_LICENSE_W3C b/luni/MODULE_LICENSE_W3C
index 3f41106..3f41106 100644
--- a/xml/MODULE_LICENSE_W3C
+++ b/luni/MODULE_LICENSE_W3C
diff --git a/icu/license.html b/luni/license.html
index b905ddf..b905ddf 100644
--- a/icu/license.html
+++ b/luni/license.html
diff --git a/icu/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java
index 9c74d68..9c74d68 100644
--- a/icu/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java
+++ b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetDecoderICU.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
index eada080..eada080 100644
--- a/icu/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
+++ b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetEncoderICU.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/charset/CharsetICU.java b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetICU.java
index fe0f920..fe0f920 100644
--- a/icu/src/main/java/com/ibm/icu4jni/charset/CharsetICU.java
+++ b/luni/src/main/java/com/ibm/icu4jni/charset/CharsetICU.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/charset/NativeConverter.java b/luni/src/main/java/com/ibm/icu4jni/charset/NativeConverter.java
index 6a97c27..6a97c27 100644
--- a/icu/src/main/java/com/ibm/icu4jni/charset/NativeConverter.java
+++ b/luni/src/main/java/com/ibm/icu4jni/charset/NativeConverter.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/common/ErrorCode.java b/luni/src/main/java/com/ibm/icu4jni/common/ErrorCode.java
index 023f165..023f165 100644
--- a/icu/src/main/java/com/ibm/icu4jni/common/ErrorCode.java
+++ b/luni/src/main/java/com/ibm/icu4jni/common/ErrorCode.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/lang/UCharacter.java b/luni/src/main/java/com/ibm/icu4jni/lang/UCharacter.java
index 08fe26a..08fe26a 100644
--- a/icu/src/main/java/com/ibm/icu4jni/lang/UCharacter.java
+++ b/luni/src/main/java/com/ibm/icu4jni/lang/UCharacter.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/regex/NativeRegEx.java b/luni/src/main/java/com/ibm/icu4jni/regex/NativeRegEx.java
index a8ce8a6..a8ce8a6 100644
--- a/icu/src/main/java/com/ibm/icu4jni/regex/NativeRegEx.java
+++ b/luni/src/main/java/com/ibm/icu4jni/regex/NativeRegEx.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/text/CollationAttribute.java b/luni/src/main/java/com/ibm/icu4jni/text/CollationAttribute.java
index eaf626f..eaf626f 100644
--- a/icu/src/main/java/com/ibm/icu4jni/text/CollationAttribute.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/CollationAttribute.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/text/CollationElementIterator.java b/luni/src/main/java/com/ibm/icu4jni/text/CollationElementIterator.java
index 0f5bae4..0f5bae4 100644
--- a/icu/src/main/java/com/ibm/icu4jni/text/CollationElementIterator.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/CollationElementIterator.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/text/CollationKey.java b/luni/src/main/java/com/ibm/icu4jni/text/CollationKey.java
index dbd714c..dbd714c 100644
--- a/icu/src/main/java/com/ibm/icu4jni/text/CollationKey.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/CollationKey.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/text/Collator.java b/luni/src/main/java/com/ibm/icu4jni/text/Collator.java
index 9eb85ea..9eb85ea 100644
--- a/icu/src/main/java/com/ibm/icu4jni/text/Collator.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/Collator.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/text/NativeBreakIterator.java b/luni/src/main/java/com/ibm/icu4jni/text/NativeBreakIterator.java
index 272d525..272d525 100644
--- a/icu/src/main/java/com/ibm/icu4jni/text/NativeBreakIterator.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/NativeBreakIterator.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/text/NativeCollation.java b/luni/src/main/java/com/ibm/icu4jni/text/NativeCollation.java
index d481790..d481790 100644
--- a/icu/src/main/java/com/ibm/icu4jni/text/NativeCollation.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/NativeCollation.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/text/NativeDecimalFormat.java b/luni/src/main/java/com/ibm/icu4jni/text/NativeDecimalFormat.java
index 6f751d5..6f751d5 100644
--- a/icu/src/main/java/com/ibm/icu4jni/text/NativeDecimalFormat.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/NativeDecimalFormat.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/text/NativeIDN.java b/luni/src/main/java/com/ibm/icu4jni/text/NativeIDN.java
index b973131..b973131 100644
--- a/icu/src/main/java/com/ibm/icu4jni/text/NativeIDN.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/NativeIDN.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/text/NativeNormalizer.java b/luni/src/main/java/com/ibm/icu4jni/text/NativeNormalizer.java
index f14b6c1..f14b6c1 100644
--- a/icu/src/main/java/com/ibm/icu4jni/text/NativeNormalizer.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/NativeNormalizer.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/text/RuleBasedCollator.java b/luni/src/main/java/com/ibm/icu4jni/text/RuleBasedCollator.java
index 8e048dd..8e048dd 100644
--- a/icu/src/main/java/com/ibm/icu4jni/text/RuleBasedCollator.java
+++ b/luni/src/main/java/com/ibm/icu4jni/text/RuleBasedCollator.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/util/ICU.java b/luni/src/main/java/com/ibm/icu4jni/util/ICU.java
index b684068..b684068 100644
--- a/icu/src/main/java/com/ibm/icu4jni/util/ICU.java
+++ b/luni/src/main/java/com/ibm/icu4jni/util/ICU.java
diff --git a/icu/src/main/java/com/ibm/icu4jni/util/LocaleData.java b/luni/src/main/java/com/ibm/icu4jni/util/LocaleData.java
index e27bd54..e27bd54 100644
--- a/icu/src/main/java/com/ibm/icu4jni/util/LocaleData.java
+++ b/luni/src/main/java/com/ibm/icu4jni/util/LocaleData.java
diff --git a/awt-kernel/src/main/java/java/awt/font/NumericShaper.java b/luni/src/main/java/java/awt/font/NumericShaper.java
index b170f25..b170f25 100644
--- a/awt-kernel/src/main/java/java/awt/font/NumericShaper.java
+++ b/luni/src/main/java/java/awt/font/NumericShaper.java
diff --git a/awt-kernel/src/main/java/java/awt/font/TextAttribute.java b/luni/src/main/java/java/awt/font/TextAttribute.java
index 0f00ae8..0f00ae8 100644
--- a/awt-kernel/src/main/java/java/awt/font/TextAttribute.java
+++ b/luni/src/main/java/java/awt/font/TextAttribute.java
diff --git a/awt-kernel/src/main/java/java/beans/IndexedPropertyChangeEvent.java b/luni/src/main/java/java/beans/IndexedPropertyChangeEvent.java
index f52d6e6..f52d6e6 100644
--- a/awt-kernel/src/main/java/java/beans/IndexedPropertyChangeEvent.java
+++ b/luni/src/main/java/java/beans/IndexedPropertyChangeEvent.java
diff --git a/awt-kernel/src/main/java/java/beans/PropertyChangeEvent.java b/luni/src/main/java/java/beans/PropertyChangeEvent.java
index d614be3..d614be3 100644
--- a/awt-kernel/src/main/java/java/beans/PropertyChangeEvent.java
+++ b/luni/src/main/java/java/beans/PropertyChangeEvent.java
diff --git a/awt-kernel/src/main/java/java/beans/PropertyChangeListener.java b/luni/src/main/java/java/beans/PropertyChangeListener.java
index a0a4201..a0a4201 100644
--- a/awt-kernel/src/main/java/java/beans/PropertyChangeListener.java
+++ b/luni/src/main/java/java/beans/PropertyChangeListener.java
diff --git a/awt-kernel/src/main/java/java/beans/PropertyChangeListenerProxy.java b/luni/src/main/java/java/beans/PropertyChangeListenerProxy.java
index 4841b72..4841b72 100644
--- a/awt-kernel/src/main/java/java/beans/PropertyChangeListenerProxy.java
+++ b/luni/src/main/java/java/beans/PropertyChangeListenerProxy.java
diff --git a/awt-kernel/src/main/java/java/beans/PropertyChangeSupport.java b/luni/src/main/java/java/beans/PropertyChangeSupport.java
index 32e2da6..32e2da6 100644
--- a/awt-kernel/src/main/java/java/beans/PropertyChangeSupport.java
+++ b/luni/src/main/java/java/beans/PropertyChangeSupport.java
diff --git a/luni-kernel/src/main/java/java/lang/Class.java b/luni/src/main/java/java/lang/Class.java
index 35e47bc..35e47bc 100644
--- a/luni-kernel/src/main/java/java/lang/Class.java
+++ b/luni/src/main/java/java/lang/Class.java
diff --git a/luni-kernel/src/main/java/java/lang/ClassCache.java b/luni/src/main/java/java/lang/ClassCache.java
index 5ea6992..5ea6992 100644
--- a/luni-kernel/src/main/java/java/lang/ClassCache.java
+++ b/luni/src/main/java/java/lang/ClassCache.java
diff --git a/luni-kernel/src/main/java/java/lang/ClassLoader.java b/luni/src/main/java/java/lang/ClassLoader.java
index aae807e..aae807e 100644
--- a/luni-kernel/src/main/java/java/lang/ClassLoader.java
+++ b/luni/src/main/java/java/lang/ClassLoader.java
diff --git a/luni-kernel/src/main/java/java/lang/Compiler.java b/luni/src/main/java/java/lang/Compiler.java
index 88251e7..88251e7 100644
--- a/luni-kernel/src/main/java/java/lang/Compiler.java
+++ b/luni/src/main/java/java/lang/Compiler.java
diff --git a/luni-kernel/src/main/java/java/lang/LangAccessImpl.java b/luni/src/main/java/java/lang/LangAccessImpl.java
index 44d4aac..44d4aac 100644
--- a/luni-kernel/src/main/java/java/lang/LangAccessImpl.java
+++ b/luni/src/main/java/java/lang/LangAccessImpl.java
diff --git a/luni-kernel/src/main/java/java/lang/Object.java b/luni/src/main/java/java/lang/Object.java
index bdb66b9..bdb66b9 100644
--- a/luni-kernel/src/main/java/java/lang/Object.java
+++ b/luni/src/main/java/java/lang/Object.java
diff --git a/luni-kernel/src/main/java/java/lang/Package.java b/luni/src/main/java/java/lang/Package.java
index 9ad40b8..9ad40b8 100644
--- a/luni-kernel/src/main/java/java/lang/Package.java
+++ b/luni/src/main/java/java/lang/Package.java
diff --git a/luni-kernel/src/main/java/java/lang/ProcessManager.java b/luni/src/main/java/java/lang/ProcessManager.java
index 318fe9a..318fe9a 100644
--- a/luni-kernel/src/main/java/java/lang/ProcessManager.java
+++ b/luni/src/main/java/java/lang/ProcessManager.java
diff --git a/luni-kernel/src/main/java/java/lang/Runtime.java b/luni/src/main/java/java/lang/Runtime.java
index 6d928f7..6d928f7 100644
--- a/luni-kernel/src/main/java/java/lang/Runtime.java
+++ b/luni/src/main/java/java/lang/Runtime.java
diff --git a/luni-kernel/src/main/java/java/lang/StackTraceElement.java b/luni/src/main/java/java/lang/StackTraceElement.java
index 88fe1ab..88fe1ab 100644
--- a/luni-kernel/src/main/java/java/lang/StackTraceElement.java
+++ b/luni/src/main/java/java/lang/StackTraceElement.java
diff --git a/luni-kernel/src/main/java/java/lang/System.java b/luni/src/main/java/java/lang/System.java
index 095307a..095307a 100644
--- a/luni-kernel/src/main/java/java/lang/System.java
+++ b/luni/src/main/java/java/lang/System.java
diff --git a/luni-kernel/src/main/java/java/lang/Thread.java b/luni/src/main/java/java/lang/Thread.java
index 625d718..625d718 100644
--- a/luni-kernel/src/main/java/java/lang/Thread.java
+++ b/luni/src/main/java/java/lang/Thread.java
diff --git a/luni-kernel/src/main/java/java/lang/ThreadGroup.java b/luni/src/main/java/java/lang/ThreadGroup.java
index 690fb45..690fb45 100644
--- a/luni-kernel/src/main/java/java/lang/ThreadGroup.java
+++ b/luni/src/main/java/java/lang/ThreadGroup.java
diff --git a/luni-kernel/src/main/java/java/lang/Throwable.java b/luni/src/main/java/java/lang/Throwable.java
index c94631b..c94631b 100644
--- a/luni-kernel/src/main/java/java/lang/Throwable.java
+++ b/luni/src/main/java/java/lang/Throwable.java
diff --git a/luni-kernel/src/main/java/java/lang/ref/PhantomReference.java b/luni/src/main/java/java/lang/ref/PhantomReference.java
index 46ffcad..46ffcad 100644
--- a/luni-kernel/src/main/java/java/lang/ref/PhantomReference.java
+++ b/luni/src/main/java/java/lang/ref/PhantomReference.java
diff --git a/luni-kernel/src/main/java/java/lang/ref/Reference.java b/luni/src/main/java/java/lang/ref/Reference.java
index 9b59b35..9b59b35 100644
--- a/luni-kernel/src/main/java/java/lang/ref/Reference.java
+++ b/luni/src/main/java/java/lang/ref/Reference.java
diff --git a/luni-kernel/src/main/java/java/lang/ref/SoftReference.java b/luni/src/main/java/java/lang/ref/SoftReference.java
index 2bf8746..2bf8746 100644
--- a/luni-kernel/src/main/java/java/lang/ref/SoftReference.java
+++ b/luni/src/main/java/java/lang/ref/SoftReference.java
diff --git a/luni-kernel/src/main/java/java/lang/ref/WeakReference.java b/luni/src/main/java/java/lang/ref/WeakReference.java
index e326a24..e326a24 100644
--- a/luni-kernel/src/main/java/java/lang/ref/WeakReference.java
+++ b/luni/src/main/java/java/lang/ref/WeakReference.java
diff --git a/luni-kernel/src/main/java/java/lang/reflect/AccessibleObject.java b/luni/src/main/java/java/lang/reflect/AccessibleObject.java
index 8990156..8990156 100644
--- a/luni-kernel/src/main/java/java/lang/reflect/AccessibleObject.java
+++ b/luni/src/main/java/java/lang/reflect/AccessibleObject.java
diff --git a/luni-kernel/src/main/java/java/lang/reflect/Array.java b/luni/src/main/java/java/lang/reflect/Array.java
index 8a12f71..8a12f71 100644
--- a/luni-kernel/src/main/java/java/lang/reflect/Array.java
+++ b/luni/src/main/java/java/lang/reflect/Array.java
diff --git a/luni-kernel/src/main/java/java/lang/reflect/Constructor.java b/luni/src/main/java/java/lang/reflect/Constructor.java
index 784f273..784f273 100644
--- a/luni-kernel/src/main/java/java/lang/reflect/Constructor.java
+++ b/luni/src/main/java/java/lang/reflect/Constructor.java
diff --git a/luni-kernel/src/main/java/java/lang/reflect/Field.java b/luni/src/main/java/java/lang/reflect/Field.java
index baaafdd..baaafdd 100644
--- a/luni-kernel/src/main/java/java/lang/reflect/Field.java
+++ b/luni/src/main/java/java/lang/reflect/Field.java
diff --git a/luni-kernel/src/main/java/java/lang/reflect/Method.java b/luni/src/main/java/java/lang/reflect/Method.java
index 6678f8c..6678f8c 100644
--- a/luni-kernel/src/main/java/java/lang/reflect/Method.java
+++ b/luni/src/main/java/java/lang/reflect/Method.java
diff --git a/luni-kernel/src/main/java/java/lang/reflect/ReflectionAccessImpl.java b/luni/src/main/java/java/lang/reflect/ReflectionAccessImpl.java
index 15cd798..15cd798 100644
--- a/luni-kernel/src/main/java/java/lang/reflect/ReflectionAccessImpl.java
+++ b/luni/src/main/java/java/lang/reflect/ReflectionAccessImpl.java
diff --git a/security-kernel/src/main/java/java/security/AccessControlContext.java b/luni/src/main/java/java/security/AccessControlContext.java
index 8efdb27..8efdb27 100644
--- a/security-kernel/src/main/java/java/security/AccessControlContext.java
+++ b/luni/src/main/java/java/security/AccessControlContext.java
diff --git a/security-kernel/src/main/java/java/security/AccessController.java b/luni/src/main/java/java/security/AccessController.java
index b27ab53..b27ab53 100644
--- a/security-kernel/src/main/java/java/security/AccessController.java
+++ b/luni/src/main/java/java/security/AccessController.java
diff --git a/prefs/src/main/java/java/util/prefs/AbstractPreferences.java b/luni/src/main/java/java/util/prefs/AbstractPreferences.java
index 17ffbbb..17ffbbb 100644
--- a/prefs/src/main/java/java/util/prefs/AbstractPreferences.java
+++ b/luni/src/main/java/java/util/prefs/AbstractPreferences.java
diff --git a/prefs/src/main/java/java/util/prefs/BackingStoreException.java b/luni/src/main/java/java/util/prefs/BackingStoreException.java
index 553d7ab..553d7ab 100644
--- a/prefs/src/main/java/java/util/prefs/BackingStoreException.java
+++ b/luni/src/main/java/java/util/prefs/BackingStoreException.java
diff --git a/prefs/src/main/java/java/util/prefs/FilePreferencesFactoryImpl.java b/luni/src/main/java/java/util/prefs/FilePreferencesFactoryImpl.java
index 69eaa01..69eaa01 100644
--- a/prefs/src/main/java/java/util/prefs/FilePreferencesFactoryImpl.java
+++ b/luni/src/main/java/java/util/prefs/FilePreferencesFactoryImpl.java
diff --git a/prefs/src/main/java/java/util/prefs/FilePreferencesImpl.java b/luni/src/main/java/java/util/prefs/FilePreferencesImpl.java
index 1eb11e3..1eb11e3 100644
--- a/prefs/src/main/java/java/util/prefs/FilePreferencesImpl.java
+++ b/luni/src/main/java/java/util/prefs/FilePreferencesImpl.java
diff --git a/prefs/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java b/luni/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java
index ba8940b..ba8940b 100644
--- a/prefs/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java
+++ b/luni/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java
diff --git a/prefs/src/main/java/java/util/prefs/NodeChangeEvent.java b/luni/src/main/java/java/util/prefs/NodeChangeEvent.java
index 3e23f5a..3e23f5a 100644
--- a/prefs/src/main/java/java/util/prefs/NodeChangeEvent.java
+++ b/luni/src/main/java/java/util/prefs/NodeChangeEvent.java
diff --git a/prefs/src/main/java/java/util/prefs/NodeChangeListener.java b/luni/src/main/java/java/util/prefs/NodeChangeListener.java
index 41da23e..41da23e 100644
--- a/prefs/src/main/java/java/util/prefs/NodeChangeListener.java
+++ b/luni/src/main/java/java/util/prefs/NodeChangeListener.java
diff --git a/prefs/src/main/java/java/util/prefs/NodeSet.java b/luni/src/main/java/java/util/prefs/NodeSet.java
index 202b90b..202b90b 100644
--- a/prefs/src/main/java/java/util/prefs/NodeSet.java
+++ b/luni/src/main/java/java/util/prefs/NodeSet.java
diff --git a/prefs/src/main/java/java/util/prefs/PreferenceChangeEvent.java b/luni/src/main/java/java/util/prefs/PreferenceChangeEvent.java
index d355f4e..d355f4e 100644
--- a/prefs/src/main/java/java/util/prefs/PreferenceChangeEvent.java
+++ b/luni/src/main/java/java/util/prefs/PreferenceChangeEvent.java
diff --git a/prefs/src/main/java/java/util/prefs/PreferenceChangeListener.java b/luni/src/main/java/java/util/prefs/PreferenceChangeListener.java
index 97aeced..97aeced 100644
--- a/prefs/src/main/java/java/util/prefs/PreferenceChangeListener.java
+++ b/luni/src/main/java/java/util/prefs/PreferenceChangeListener.java
diff --git a/prefs/src/main/java/java/util/prefs/Preferences.java b/luni/src/main/java/java/util/prefs/Preferences.java
index 9a1d9e6..9a1d9e6 100644
--- a/prefs/src/main/java/java/util/prefs/Preferences.java
+++ b/luni/src/main/java/java/util/prefs/Preferences.java
diff --git a/prefs/src/main/java/java/util/prefs/PreferencesFactory.java b/luni/src/main/java/java/util/prefs/PreferencesFactory.java
index 3ac13e4..3ac13e4 100644
--- a/prefs/src/main/java/java/util/prefs/PreferencesFactory.java
+++ b/luni/src/main/java/java/util/prefs/PreferencesFactory.java
diff --git a/prefs/src/main/java/java/util/prefs/XMLParser.java b/luni/src/main/java/java/util/prefs/XMLParser.java
index 986429d..986429d 100644
--- a/prefs/src/main/java/java/util/prefs/XMLParser.java
+++ b/luni/src/main/java/java/util/prefs/XMLParser.java
diff --git a/prefs/src/main/java/java/util/prefs/package.html b/luni/src/main/java/java/util/prefs/package.html
index 41cd12c..41cd12c 100644
--- a/prefs/src/main/java/java/util/prefs/package.html
+++ b/luni/src/main/java/java/util/prefs/package.html
diff --git a/x-net/src/main/java/javax/net/DefaultServerSocketFactory.java b/luni/src/main/java/javax/net/DefaultServerSocketFactory.java
index 9e31be4..9e31be4 100644
--- a/x-net/src/main/java/javax/net/DefaultServerSocketFactory.java
+++ b/luni/src/main/java/javax/net/DefaultServerSocketFactory.java
diff --git a/x-net/src/main/java/javax/net/DefaultSocketFactory.java b/luni/src/main/java/javax/net/DefaultSocketFactory.java
index 010c720..010c720 100644
--- a/x-net/src/main/java/javax/net/DefaultSocketFactory.java
+++ b/luni/src/main/java/javax/net/DefaultSocketFactory.java
diff --git a/x-net/src/main/java/javax/net/ServerSocketFactory.java b/luni/src/main/java/javax/net/ServerSocketFactory.java
index f2d2c0d..f2d2c0d 100644
--- a/x-net/src/main/java/javax/net/ServerSocketFactory.java
+++ b/luni/src/main/java/javax/net/ServerSocketFactory.java
diff --git a/x-net/src/main/java/javax/net/SocketFactory.java b/luni/src/main/java/javax/net/SocketFactory.java
index eb0cfcb..eb0cfcb 100644
--- a/x-net/src/main/java/javax/net/SocketFactory.java
+++ b/luni/src/main/java/javax/net/SocketFactory.java
diff --git a/x-net/src/main/java/javax/net/package.html b/luni/src/main/java/javax/net/package.html
index 5674d06..5674d06 100644
--- a/x-net/src/main/java/javax/net/package.html
+++ b/luni/src/main/java/javax/net/package.html
diff --git a/x-net/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java b/luni/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java
index dcf7a4d..dcf7a4d 100644
--- a/x-net/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java
+++ b/luni/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java
diff --git a/x-net/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java b/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
index 779c46a..779c46a 100644
--- a/x-net/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
+++ b/luni/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
diff --git a/x-net/src/main/java/javax/net/ssl/DefaultSSLContext.java b/luni/src/main/java/javax/net/ssl/DefaultSSLContext.java
index a12d385..a12d385 100644
--- a/x-net/src/main/java/javax/net/ssl/DefaultSSLContext.java
+++ b/luni/src/main/java/javax/net/ssl/DefaultSSLContext.java
diff --git a/x-net/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java b/luni/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java
index 3e58897..3e58897 100644
--- a/x-net/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java
+++ b/luni/src/main/java/javax/net/ssl/DefaultSSLServerSocketFactory.java
diff --git a/x-net/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java b/luni/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java
index 4035a0e..4035a0e 100644
--- a/x-net/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java
+++ b/luni/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java
diff --git a/x-net/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java b/luni/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java
index 4618280..4618280 100644
--- a/x-net/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java
+++ b/luni/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java
diff --git a/x-net/src/main/java/javax/net/ssl/HandshakeCompletedListener.java b/luni/src/main/java/javax/net/ssl/HandshakeCompletedListener.java
index 5032c63..5032c63 100644
--- a/x-net/src/main/java/javax/net/ssl/HandshakeCompletedListener.java
+++ b/luni/src/main/java/javax/net/ssl/HandshakeCompletedListener.java
diff --git a/x-net/src/main/java/javax/net/ssl/HostnameVerifier.java b/luni/src/main/java/javax/net/ssl/HostnameVerifier.java
index 805762e..805762e 100644
--- a/x-net/src/main/java/javax/net/ssl/HostnameVerifier.java
+++ b/luni/src/main/java/javax/net/ssl/HostnameVerifier.java
diff --git a/x-net/src/main/java/javax/net/ssl/HttpsURLConnection.java b/luni/src/main/java/javax/net/ssl/HttpsURLConnection.java
index 8c49690..8c49690 100644
--- a/x-net/src/main/java/javax/net/ssl/HttpsURLConnection.java
+++ b/luni/src/main/java/javax/net/ssl/HttpsURLConnection.java
diff --git a/x-net/src/main/java/javax/net/ssl/KeyManager.java b/luni/src/main/java/javax/net/ssl/KeyManager.java
index 30c8032..30c8032 100644
--- a/x-net/src/main/java/javax/net/ssl/KeyManager.java
+++ b/luni/src/main/java/javax/net/ssl/KeyManager.java
diff --git a/x-net/src/main/java/javax/net/ssl/KeyManagerFactory.java b/luni/src/main/java/javax/net/ssl/KeyManagerFactory.java
index 99a37a8..99a37a8 100644
--- a/x-net/src/main/java/javax/net/ssl/KeyManagerFactory.java
+++ b/luni/src/main/java/javax/net/ssl/KeyManagerFactory.java
diff --git a/x-net/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java b/luni/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java
index 39925f9..39925f9 100644
--- a/x-net/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java
+++ b/luni/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java
diff --git a/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java b/luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
index d30cc8a..d30cc8a 100644
--- a/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
+++ b/luni/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
diff --git a/x-net/src/main/java/javax/net/ssl/ManagerFactoryParameters.java b/luni/src/main/java/javax/net/ssl/ManagerFactoryParameters.java
index b90deeb..b90deeb 100644
--- a/x-net/src/main/java/javax/net/ssl/ManagerFactoryParameters.java
+++ b/luni/src/main/java/javax/net/ssl/ManagerFactoryParameters.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLContext.java b/luni/src/main/java/javax/net/ssl/SSLContext.java
index 8a0a157..8a0a157 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLContext.java
+++ b/luni/src/main/java/javax/net/ssl/SSLContext.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLContextSpi.java b/luni/src/main/java/javax/net/ssl/SSLContextSpi.java
index 44d2c59..44d2c59 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLContextSpi.java
+++ b/luni/src/main/java/javax/net/ssl/SSLContextSpi.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLEngine.java b/luni/src/main/java/javax/net/ssl/SSLEngine.java
index 46e11a4..46e11a4 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLEngine.java
+++ b/luni/src/main/java/javax/net/ssl/SSLEngine.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLEngineResult.java b/luni/src/main/java/javax/net/ssl/SSLEngineResult.java
index 8a98831..8a98831 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLEngineResult.java
+++ b/luni/src/main/java/javax/net/ssl/SSLEngineResult.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLException.java b/luni/src/main/java/javax/net/ssl/SSLException.java
index 5d716f7..5d716f7 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLException.java
+++ b/luni/src/main/java/javax/net/ssl/SSLException.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLHandshakeException.java b/luni/src/main/java/javax/net/ssl/SSLHandshakeException.java
index 1c17ae7..1c17ae7 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLHandshakeException.java
+++ b/luni/src/main/java/javax/net/ssl/SSLHandshakeException.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLKeyException.java b/luni/src/main/java/javax/net/ssl/SSLKeyException.java
index 6d81676..6d81676 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLKeyException.java
+++ b/luni/src/main/java/javax/net/ssl/SSLKeyException.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLPeerUnverifiedException.java b/luni/src/main/java/javax/net/ssl/SSLPeerUnverifiedException.java
index bb5bd64..bb5bd64 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLPeerUnverifiedException.java
+++ b/luni/src/main/java/javax/net/ssl/SSLPeerUnverifiedException.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLPermission.java b/luni/src/main/java/javax/net/ssl/SSLPermission.java
index 5b5c76f..5b5c76f 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLPermission.java
+++ b/luni/src/main/java/javax/net/ssl/SSLPermission.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLProtocolException.java b/luni/src/main/java/javax/net/ssl/SSLProtocolException.java
index 50ed74d..50ed74d 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLProtocolException.java
+++ b/luni/src/main/java/javax/net/ssl/SSLProtocolException.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLServerSocket.java b/luni/src/main/java/javax/net/ssl/SSLServerSocket.java
index 8bd8918..8bd8918 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLServerSocket.java
+++ b/luni/src/main/java/javax/net/ssl/SSLServerSocket.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLServerSocketFactory.java b/luni/src/main/java/javax/net/ssl/SSLServerSocketFactory.java
index ccb2c5d..ccb2c5d 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLServerSocketFactory.java
+++ b/luni/src/main/java/javax/net/ssl/SSLServerSocketFactory.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLSession.java b/luni/src/main/java/javax/net/ssl/SSLSession.java
index 14a312a..14a312a 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLSession.java
+++ b/luni/src/main/java/javax/net/ssl/SSLSession.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java b/luni/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java
index 19ae835..19ae835 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java
+++ b/luni/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLSessionBindingListener.java b/luni/src/main/java/javax/net/ssl/SSLSessionBindingListener.java
index 43ad745..43ad745 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLSessionBindingListener.java
+++ b/luni/src/main/java/javax/net/ssl/SSLSessionBindingListener.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLSessionContext.java b/luni/src/main/java/javax/net/ssl/SSLSessionContext.java
index 154376e..154376e 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLSessionContext.java
+++ b/luni/src/main/java/javax/net/ssl/SSLSessionContext.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLSocket.java b/luni/src/main/java/javax/net/ssl/SSLSocket.java
index 4a70843..4a70843 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLSocket.java
+++ b/luni/src/main/java/javax/net/ssl/SSLSocket.java
diff --git a/x-net/src/main/java/javax/net/ssl/SSLSocketFactory.java b/luni/src/main/java/javax/net/ssl/SSLSocketFactory.java
index b75c218..b75c218 100644
--- a/x-net/src/main/java/javax/net/ssl/SSLSocketFactory.java
+++ b/luni/src/main/java/javax/net/ssl/SSLSocketFactory.java
diff --git a/x-net/src/main/java/javax/net/ssl/TrustManager.java b/luni/src/main/java/javax/net/ssl/TrustManager.java
index 9bdb16b..9bdb16b 100644
--- a/x-net/src/main/java/javax/net/ssl/TrustManager.java
+++ b/luni/src/main/java/javax/net/ssl/TrustManager.java
diff --git a/x-net/src/main/java/javax/net/ssl/TrustManagerFactory.java b/luni/src/main/java/javax/net/ssl/TrustManagerFactory.java
index 6d9e4c9..6d9e4c9 100644
--- a/x-net/src/main/java/javax/net/ssl/TrustManagerFactory.java
+++ b/luni/src/main/java/javax/net/ssl/TrustManagerFactory.java
diff --git a/x-net/src/main/java/javax/net/ssl/TrustManagerFactorySpi.java b/luni/src/main/java/javax/net/ssl/TrustManagerFactorySpi.java
index 1b04c5b..1b04c5b 100644
--- a/x-net/src/main/java/javax/net/ssl/TrustManagerFactorySpi.java
+++ b/luni/src/main/java/javax/net/ssl/TrustManagerFactorySpi.java
diff --git a/x-net/src/main/java/javax/net/ssl/X509ExtendedKeyManager.java b/luni/src/main/java/javax/net/ssl/X509ExtendedKeyManager.java
index 3298d8e..3298d8e 100644
--- a/x-net/src/main/java/javax/net/ssl/X509ExtendedKeyManager.java
+++ b/luni/src/main/java/javax/net/ssl/X509ExtendedKeyManager.java
diff --git a/x-net/src/main/java/javax/net/ssl/X509KeyManager.java b/luni/src/main/java/javax/net/ssl/X509KeyManager.java
index aebc427..aebc427 100644
--- a/x-net/src/main/java/javax/net/ssl/X509KeyManager.java
+++ b/luni/src/main/java/javax/net/ssl/X509KeyManager.java
diff --git a/x-net/src/main/java/javax/net/ssl/X509TrustManager.java b/luni/src/main/java/javax/net/ssl/X509TrustManager.java
index 7d7827e..7d7827e 100644
--- a/x-net/src/main/java/javax/net/ssl/X509TrustManager.java
+++ b/luni/src/main/java/javax/net/ssl/X509TrustManager.java
diff --git a/x-net/src/main/java/javax/net/ssl/package.html b/luni/src/main/java/javax/net/ssl/package.html
index 14753c8..14753c8 100644
--- a/x-net/src/main/java/javax/net/ssl/package.html
+++ b/luni/src/main/java/javax/net/ssl/package.html
diff --git a/xml/src/main/java/javax/xml/XMLConstants.java b/luni/src/main/java/javax/xml/XMLConstants.java
index f65a6f3..f65a6f3 100644
--- a/xml/src/main/java/javax/xml/XMLConstants.java
+++ b/luni/src/main/java/javax/xml/XMLConstants.java
diff --git a/xml/src/main/java/javax/xml/datatype/DatatypeConfigurationException.java b/luni/src/main/java/javax/xml/datatype/DatatypeConfigurationException.java
index 2afffbf..2afffbf 100644
--- a/xml/src/main/java/javax/xml/datatype/DatatypeConfigurationException.java
+++ b/luni/src/main/java/javax/xml/datatype/DatatypeConfigurationException.java
diff --git a/xml/src/main/java/javax/xml/datatype/DatatypeConstants.java b/luni/src/main/java/javax/xml/datatype/DatatypeConstants.java
index 4c2d271..4c2d271 100644
--- a/xml/src/main/java/javax/xml/datatype/DatatypeConstants.java
+++ b/luni/src/main/java/javax/xml/datatype/DatatypeConstants.java
diff --git a/xml/src/main/java/javax/xml/datatype/DatatypeFactory.java b/luni/src/main/java/javax/xml/datatype/DatatypeFactory.java
index fb302dc..fb302dc 100644
--- a/xml/src/main/java/javax/xml/datatype/DatatypeFactory.java
+++ b/luni/src/main/java/javax/xml/datatype/DatatypeFactory.java
diff --git a/xml/src/main/java/javax/xml/datatype/Duration.java b/luni/src/main/java/javax/xml/datatype/Duration.java
index 8eed4d5..8eed4d5 100644
--- a/xml/src/main/java/javax/xml/datatype/Duration.java
+++ b/luni/src/main/java/javax/xml/datatype/Duration.java
diff --git a/xml/src/main/java/javax/xml/datatype/FactoryFinder.java b/luni/src/main/java/javax/xml/datatype/FactoryFinder.java
index ddea15b..ddea15b 100644
--- a/xml/src/main/java/javax/xml/datatype/FactoryFinder.java
+++ b/luni/src/main/java/javax/xml/datatype/FactoryFinder.java
diff --git a/xml/src/main/java/javax/xml/datatype/SecuritySupport.java b/luni/src/main/java/javax/xml/datatype/SecuritySupport.java
index da82748..da82748 100644
--- a/xml/src/main/java/javax/xml/datatype/SecuritySupport.java
+++ b/luni/src/main/java/javax/xml/datatype/SecuritySupport.java
diff --git a/xml/src/main/java/javax/xml/datatype/XMLGregorianCalendar.java b/luni/src/main/java/javax/xml/datatype/XMLGregorianCalendar.java
index c2ff3e6..c2ff3e6 100644
--- a/xml/src/main/java/javax/xml/datatype/XMLGregorianCalendar.java
+++ b/luni/src/main/java/javax/xml/datatype/XMLGregorianCalendar.java
diff --git a/xml/src/main/java/javax/xml/datatype/package.html b/luni/src/main/java/javax/xml/datatype/package.html
index 6218533..6218533 100644
--- a/xml/src/main/java/javax/xml/datatype/package.html
+++ b/luni/src/main/java/javax/xml/datatype/package.html
diff --git a/xml/src/main/java/javax/xml/namespace/NamespaceContext.java b/luni/src/main/java/javax/xml/namespace/NamespaceContext.java
index 182287c..182287c 100644
--- a/xml/src/main/java/javax/xml/namespace/NamespaceContext.java
+++ b/luni/src/main/java/javax/xml/namespace/NamespaceContext.java
diff --git a/xml/src/main/java/javax/xml/namespace/QName.java b/luni/src/main/java/javax/xml/namespace/QName.java
index 8fd5f07..8fd5f07 100644
--- a/xml/src/main/java/javax/xml/namespace/QName.java
+++ b/luni/src/main/java/javax/xml/namespace/QName.java
diff --git a/xml/src/main/java/javax/xml/namespace/package.html b/luni/src/main/java/javax/xml/namespace/package.html
index a5296f7..a5296f7 100644
--- a/xml/src/main/java/javax/xml/namespace/package.html
+++ b/luni/src/main/java/javax/xml/namespace/package.html
diff --git a/xml/src/main/java/javax/xml/package.html b/luni/src/main/java/javax/xml/package.html
index f3d8318..f3d8318 100644
--- a/xml/src/main/java/javax/xml/package.html
+++ b/luni/src/main/java/javax/xml/package.html
diff --git a/xml/src/main/java/javax/xml/parsers/DocumentBuilder.java b/luni/src/main/java/javax/xml/parsers/DocumentBuilder.java
index 1f0163b..1f0163b 100644
--- a/xml/src/main/java/javax/xml/parsers/DocumentBuilder.java
+++ b/luni/src/main/java/javax/xml/parsers/DocumentBuilder.java
diff --git a/xml/src/main/java/javax/xml/parsers/DocumentBuilderFactory.java b/luni/src/main/java/javax/xml/parsers/DocumentBuilderFactory.java
index 01da97b..01da97b 100644
--- a/xml/src/main/java/javax/xml/parsers/DocumentBuilderFactory.java
+++ b/luni/src/main/java/javax/xml/parsers/DocumentBuilderFactory.java
diff --git a/xml/src/main/java/javax/xml/parsers/FactoryConfigurationError.java b/luni/src/main/java/javax/xml/parsers/FactoryConfigurationError.java
index cf8c9e9..cf8c9e9 100644
--- a/xml/src/main/java/javax/xml/parsers/FactoryConfigurationError.java
+++ b/luni/src/main/java/javax/xml/parsers/FactoryConfigurationError.java
diff --git a/xml/src/main/java/javax/xml/parsers/FilePathToURI.java b/luni/src/main/java/javax/xml/parsers/FilePathToURI.java
index 0dd38b7..0dd38b7 100644
--- a/xml/src/main/java/javax/xml/parsers/FilePathToURI.java
+++ b/luni/src/main/java/javax/xml/parsers/FilePathToURI.java
diff --git a/xml/src/main/java/javax/xml/parsers/ParserConfigurationException.java b/luni/src/main/java/javax/xml/parsers/ParserConfigurationException.java
index c106e4f..c106e4f 100644
--- a/xml/src/main/java/javax/xml/parsers/ParserConfigurationException.java
+++ b/luni/src/main/java/javax/xml/parsers/ParserConfigurationException.java
diff --git a/xml/src/main/java/javax/xml/parsers/SAXParser.java b/luni/src/main/java/javax/xml/parsers/SAXParser.java
index 8c52461..8c52461 100644
--- a/xml/src/main/java/javax/xml/parsers/SAXParser.java
+++ b/luni/src/main/java/javax/xml/parsers/SAXParser.java
diff --git a/xml/src/main/java/javax/xml/parsers/SAXParserFactory.java b/luni/src/main/java/javax/xml/parsers/SAXParserFactory.java
index 5cb6ad7..5cb6ad7 100644
--- a/xml/src/main/java/javax/xml/parsers/SAXParserFactory.java
+++ b/luni/src/main/java/javax/xml/parsers/SAXParserFactory.java
diff --git a/xml/src/main/java/javax/xml/parsers/SecuritySupport.java b/luni/src/main/java/javax/xml/parsers/SecuritySupport.java
index bd655a8..bd655a8 100644
--- a/xml/src/main/java/javax/xml/parsers/SecuritySupport.java
+++ b/luni/src/main/java/javax/xml/parsers/SecuritySupport.java
diff --git a/xml/src/main/java/javax/xml/parsers/package.html b/luni/src/main/java/javax/xml/parsers/package.html
index 92e09d5..92e09d5 100644
--- a/xml/src/main/java/javax/xml/parsers/package.html
+++ b/luni/src/main/java/javax/xml/parsers/package.html
diff --git a/xml/src/main/java/javax/xml/transform/ErrorListener.java b/luni/src/main/java/javax/xml/transform/ErrorListener.java
index 0849132..0849132 100644
--- a/xml/src/main/java/javax/xml/transform/ErrorListener.java
+++ b/luni/src/main/java/javax/xml/transform/ErrorListener.java
diff --git a/xml/src/main/java/javax/xml/transform/OutputKeys.java b/luni/src/main/java/javax/xml/transform/OutputKeys.java
index 8383cdb..8383cdb 100644
--- a/xml/src/main/java/javax/xml/transform/OutputKeys.java
+++ b/luni/src/main/java/javax/xml/transform/OutputKeys.java
diff --git a/xml/src/main/java/javax/xml/transform/Result.java b/luni/src/main/java/javax/xml/transform/Result.java
index a5cb8e7..a5cb8e7 100644
--- a/xml/src/main/java/javax/xml/transform/Result.java
+++ b/luni/src/main/java/javax/xml/transform/Result.java
diff --git a/xml/src/main/java/javax/xml/transform/SecuritySupport.java b/luni/src/main/java/javax/xml/transform/SecuritySupport.java
index 6ac527d..6ac527d 100644
--- a/xml/src/main/java/javax/xml/transform/SecuritySupport.java
+++ b/luni/src/main/java/javax/xml/transform/SecuritySupport.java
diff --git a/xml/src/main/java/javax/xml/transform/Source.java b/luni/src/main/java/javax/xml/transform/Source.java
index 44cbf24..44cbf24 100644
--- a/xml/src/main/java/javax/xml/transform/Source.java
+++ b/luni/src/main/java/javax/xml/transform/Source.java
diff --git a/xml/src/main/java/javax/xml/transform/SourceLocator.java b/luni/src/main/java/javax/xml/transform/SourceLocator.java
index 632eee8..632eee8 100644
--- a/xml/src/main/java/javax/xml/transform/SourceLocator.java
+++ b/luni/src/main/java/javax/xml/transform/SourceLocator.java
diff --git a/xml/src/main/java/javax/xml/transform/Templates.java b/luni/src/main/java/javax/xml/transform/Templates.java
index 1d6f46a..1d6f46a 100644
--- a/xml/src/main/java/javax/xml/transform/Templates.java
+++ b/luni/src/main/java/javax/xml/transform/Templates.java
diff --git a/xml/src/main/java/javax/xml/transform/Transformer.java b/luni/src/main/java/javax/xml/transform/Transformer.java
index 30f795d..30f795d 100644
--- a/xml/src/main/java/javax/xml/transform/Transformer.java
+++ b/luni/src/main/java/javax/xml/transform/Transformer.java
diff --git a/xml/src/main/java/javax/xml/transform/TransformerConfigurationException.java b/luni/src/main/java/javax/xml/transform/TransformerConfigurationException.java
index 50fe50d..50fe50d 100644
--- a/xml/src/main/java/javax/xml/transform/TransformerConfigurationException.java
+++ b/luni/src/main/java/javax/xml/transform/TransformerConfigurationException.java
diff --git a/xml/src/main/java/javax/xml/transform/TransformerException.java b/luni/src/main/java/javax/xml/transform/TransformerException.java
index fbcb1b0..fbcb1b0 100644
--- a/xml/src/main/java/javax/xml/transform/TransformerException.java
+++ b/luni/src/main/java/javax/xml/transform/TransformerException.java
diff --git a/xml/src/main/java/javax/xml/transform/TransformerFactory.java b/luni/src/main/java/javax/xml/transform/TransformerFactory.java
index daabe2b..daabe2b 100644
--- a/xml/src/main/java/javax/xml/transform/TransformerFactory.java
+++ b/luni/src/main/java/javax/xml/transform/TransformerFactory.java
diff --git a/xml/src/main/java/javax/xml/transform/TransformerFactoryConfigurationError.java b/luni/src/main/java/javax/xml/transform/TransformerFactoryConfigurationError.java
index b738a7c..b738a7c 100644
--- a/xml/src/main/java/javax/xml/transform/TransformerFactoryConfigurationError.java
+++ b/luni/src/main/java/javax/xml/transform/TransformerFactoryConfigurationError.java
diff --git a/xml/src/main/java/javax/xml/transform/URIResolver.java b/luni/src/main/java/javax/xml/transform/URIResolver.java
index f8ab601..f8ab601 100644
--- a/xml/src/main/java/javax/xml/transform/URIResolver.java
+++ b/luni/src/main/java/javax/xml/transform/URIResolver.java
diff --git a/xml/src/main/java/javax/xml/transform/dom/DOMLocator.java b/luni/src/main/java/javax/xml/transform/dom/DOMLocator.java
index c4389ab..c4389ab 100644
--- a/xml/src/main/java/javax/xml/transform/dom/DOMLocator.java
+++ b/luni/src/main/java/javax/xml/transform/dom/DOMLocator.java
diff --git a/xml/src/main/java/javax/xml/transform/dom/DOMResult.java b/luni/src/main/java/javax/xml/transform/dom/DOMResult.java
index de430da..de430da 100644
--- a/xml/src/main/java/javax/xml/transform/dom/DOMResult.java
+++ b/luni/src/main/java/javax/xml/transform/dom/DOMResult.java
diff --git a/xml/src/main/java/javax/xml/transform/dom/DOMSource.java b/luni/src/main/java/javax/xml/transform/dom/DOMSource.java
index b37c173..b37c173 100644
--- a/xml/src/main/java/javax/xml/transform/dom/DOMSource.java
+++ b/luni/src/main/java/javax/xml/transform/dom/DOMSource.java
diff --git a/xml/src/main/java/javax/xml/transform/dom/package.html b/luni/src/main/java/javax/xml/transform/dom/package.html
index 267e771..267e771 100644
--- a/xml/src/main/java/javax/xml/transform/dom/package.html
+++ b/luni/src/main/java/javax/xml/transform/dom/package.html
diff --git a/xml/src/main/java/javax/xml/transform/overview.html b/luni/src/main/java/javax/xml/transform/overview.html
index 918db9b..918db9b 100644
--- a/xml/src/main/java/javax/xml/transform/overview.html
+++ b/luni/src/main/java/javax/xml/transform/overview.html
diff --git a/xml/src/main/java/javax/xml/transform/package.html b/luni/src/main/java/javax/xml/transform/package.html
index ca08c7c..ca08c7c 100644
--- a/xml/src/main/java/javax/xml/transform/package.html
+++ b/luni/src/main/java/javax/xml/transform/package.html
diff --git a/xml/src/main/java/javax/xml/transform/sax/SAXResult.java b/luni/src/main/java/javax/xml/transform/sax/SAXResult.java
index c327b0e..c327b0e 100644
--- a/xml/src/main/java/javax/xml/transform/sax/SAXResult.java
+++ b/luni/src/main/java/javax/xml/transform/sax/SAXResult.java
diff --git a/xml/src/main/java/javax/xml/transform/sax/SAXSource.java b/luni/src/main/java/javax/xml/transform/sax/SAXSource.java
index 62381bb..62381bb 100644
--- a/xml/src/main/java/javax/xml/transform/sax/SAXSource.java
+++ b/luni/src/main/java/javax/xml/transform/sax/SAXSource.java
diff --git a/xml/src/main/java/javax/xml/transform/sax/SAXTransformerFactory.java b/luni/src/main/java/javax/xml/transform/sax/SAXTransformerFactory.java
index 662ea20..662ea20 100644
--- a/xml/src/main/java/javax/xml/transform/sax/SAXTransformerFactory.java
+++ b/luni/src/main/java/javax/xml/transform/sax/SAXTransformerFactory.java
diff --git a/xml/src/main/java/javax/xml/transform/sax/TemplatesHandler.java b/luni/src/main/java/javax/xml/transform/sax/TemplatesHandler.java
index 4a31c2f..4a31c2f 100644
--- a/xml/src/main/java/javax/xml/transform/sax/TemplatesHandler.java
+++ b/luni/src/main/java/javax/xml/transform/sax/TemplatesHandler.java
diff --git a/xml/src/main/java/javax/xml/transform/sax/TransformerHandler.java b/luni/src/main/java/javax/xml/transform/sax/TransformerHandler.java
index f044ac0..f044ac0 100644
--- a/xml/src/main/java/javax/xml/transform/sax/TransformerHandler.java
+++ b/luni/src/main/java/javax/xml/transform/sax/TransformerHandler.java
diff --git a/xml/src/main/java/javax/xml/transform/sax/package.html b/luni/src/main/java/javax/xml/transform/sax/package.html
index 7a0d707..7a0d707 100644
--- a/xml/src/main/java/javax/xml/transform/sax/package.html
+++ b/luni/src/main/java/javax/xml/transform/sax/package.html
diff --git a/xml/src/main/java/javax/xml/transform/stream/FilePathToURI.java b/luni/src/main/java/javax/xml/transform/stream/FilePathToURI.java
index 6310312..6310312 100644
--- a/xml/src/main/java/javax/xml/transform/stream/FilePathToURI.java
+++ b/luni/src/main/java/javax/xml/transform/stream/FilePathToURI.java
diff --git a/xml/src/main/java/javax/xml/transform/stream/StreamResult.java b/luni/src/main/java/javax/xml/transform/stream/StreamResult.java
index 7a92a7c..7a92a7c 100644
--- a/xml/src/main/java/javax/xml/transform/stream/StreamResult.java
+++ b/luni/src/main/java/javax/xml/transform/stream/StreamResult.java
diff --git a/xml/src/main/java/javax/xml/transform/stream/StreamSource.java b/luni/src/main/java/javax/xml/transform/stream/StreamSource.java
index 61b7b7d..61b7b7d 100644
--- a/xml/src/main/java/javax/xml/transform/stream/StreamSource.java
+++ b/luni/src/main/java/javax/xml/transform/stream/StreamSource.java
diff --git a/xml/src/main/java/javax/xml/transform/stream/package.html b/luni/src/main/java/javax/xml/transform/stream/package.html
index df54abd..df54abd 100644
--- a/xml/src/main/java/javax/xml/transform/stream/package.html
+++ b/luni/src/main/java/javax/xml/transform/stream/package.html
diff --git a/xml/src/main/java/javax/xml/validation/Schema.java b/luni/src/main/java/javax/xml/validation/Schema.java
index ddb21f4..ddb21f4 100644
--- a/xml/src/main/java/javax/xml/validation/Schema.java
+++ b/luni/src/main/java/javax/xml/validation/Schema.java
diff --git a/xml/src/main/java/javax/xml/validation/SchemaFactory.java b/luni/src/main/java/javax/xml/validation/SchemaFactory.java
index 143b8ca..143b8ca 100644
--- a/xml/src/main/java/javax/xml/validation/SchemaFactory.java
+++ b/luni/src/main/java/javax/xml/validation/SchemaFactory.java
diff --git a/xml/src/main/java/javax/xml/validation/SchemaFactoryFinder.java b/luni/src/main/java/javax/xml/validation/SchemaFactoryFinder.java
index ba9a92e..ba9a92e 100644
--- a/xml/src/main/java/javax/xml/validation/SchemaFactoryFinder.java
+++ b/luni/src/main/java/javax/xml/validation/SchemaFactoryFinder.java
diff --git a/xml/src/main/java/javax/xml/validation/SchemaFactoryLoader.java b/luni/src/main/java/javax/xml/validation/SchemaFactoryLoader.java
index 34c94a4..34c94a4 100644
--- a/xml/src/main/java/javax/xml/validation/SchemaFactoryLoader.java
+++ b/luni/src/main/java/javax/xml/validation/SchemaFactoryLoader.java
diff --git a/xml/src/main/java/javax/xml/validation/SecuritySupport.java b/luni/src/main/java/javax/xml/validation/SecuritySupport.java
index 7821ad9..7821ad9 100644
--- a/xml/src/main/java/javax/xml/validation/SecuritySupport.java
+++ b/luni/src/main/java/javax/xml/validation/SecuritySupport.java
diff --git a/xml/src/main/java/javax/xml/validation/TypeInfoProvider.java b/luni/src/main/java/javax/xml/validation/TypeInfoProvider.java
index de1282a..de1282a 100644
--- a/xml/src/main/java/javax/xml/validation/TypeInfoProvider.java
+++ b/luni/src/main/java/javax/xml/validation/TypeInfoProvider.java
diff --git a/xml/src/main/java/javax/xml/validation/Validator.java b/luni/src/main/java/javax/xml/validation/Validator.java
index 63f320a..63f320a 100644
--- a/xml/src/main/java/javax/xml/validation/Validator.java
+++ b/luni/src/main/java/javax/xml/validation/Validator.java
diff --git a/xml/src/main/java/javax/xml/validation/ValidatorHandler.java b/luni/src/main/java/javax/xml/validation/ValidatorHandler.java
index 0ab5edf..0ab5edf 100644
--- a/xml/src/main/java/javax/xml/validation/ValidatorHandler.java
+++ b/luni/src/main/java/javax/xml/validation/ValidatorHandler.java
diff --git a/xml/src/main/java/javax/xml/validation/package.html b/luni/src/main/java/javax/xml/validation/package.html
index b9f71a4..b9f71a4 100644
--- a/xml/src/main/java/javax/xml/validation/package.html
+++ b/luni/src/main/java/javax/xml/validation/package.html
diff --git a/xml/src/main/java/javax/xml/xpath/SecuritySupport.java b/luni/src/main/java/javax/xml/xpath/SecuritySupport.java
index 2490552..2490552 100644
--- a/xml/src/main/java/javax/xml/xpath/SecuritySupport.java
+++ b/luni/src/main/java/javax/xml/xpath/SecuritySupport.java
diff --git a/xml/src/main/java/javax/xml/xpath/XPath.java b/luni/src/main/java/javax/xml/xpath/XPath.java
index 749b9b5..749b9b5 100644
--- a/xml/src/main/java/javax/xml/xpath/XPath.java
+++ b/luni/src/main/java/javax/xml/xpath/XPath.java
diff --git a/xml/src/main/java/javax/xml/xpath/XPathConstants.java b/luni/src/main/java/javax/xml/xpath/XPathConstants.java
index 25f1b53..25f1b53 100644
--- a/xml/src/main/java/javax/xml/xpath/XPathConstants.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathConstants.java
diff --git a/xml/src/main/java/javax/xml/xpath/XPathException.java b/luni/src/main/java/javax/xml/xpath/XPathException.java
index 04d7a75..04d7a75 100644
--- a/xml/src/main/java/javax/xml/xpath/XPathException.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathException.java
diff --git a/xml/src/main/java/javax/xml/xpath/XPathExpression.java b/luni/src/main/java/javax/xml/xpath/XPathExpression.java
index 68296ed..68296ed 100644
--- a/xml/src/main/java/javax/xml/xpath/XPathExpression.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathExpression.java
diff --git a/xml/src/main/java/javax/xml/xpath/XPathExpressionException.java b/luni/src/main/java/javax/xml/xpath/XPathExpressionException.java
index f21fd7a..f21fd7a 100644
--- a/xml/src/main/java/javax/xml/xpath/XPathExpressionException.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathExpressionException.java
diff --git a/xml/src/main/java/javax/xml/xpath/XPathFactory.java b/luni/src/main/java/javax/xml/xpath/XPathFactory.java
index 410181c..410181c 100644
--- a/xml/src/main/java/javax/xml/xpath/XPathFactory.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathFactory.java
diff --git a/xml/src/main/java/javax/xml/xpath/XPathFactoryConfigurationException.java b/luni/src/main/java/javax/xml/xpath/XPathFactoryConfigurationException.java
index f6f64c2..f6f64c2 100644
--- a/xml/src/main/java/javax/xml/xpath/XPathFactoryConfigurationException.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathFactoryConfigurationException.java
diff --git a/xml/src/main/java/javax/xml/xpath/XPathFactoryFinder.java b/luni/src/main/java/javax/xml/xpath/XPathFactoryFinder.java
index 39d2f49..39d2f49 100644
--- a/xml/src/main/java/javax/xml/xpath/XPathFactoryFinder.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathFactoryFinder.java
diff --git a/xml/src/main/java/javax/xml/xpath/XPathFunction.java b/luni/src/main/java/javax/xml/xpath/XPathFunction.java
index e64560e..e64560e 100644
--- a/xml/src/main/java/javax/xml/xpath/XPathFunction.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathFunction.java
diff --git a/xml/src/main/java/javax/xml/xpath/XPathFunctionException.java b/luni/src/main/java/javax/xml/xpath/XPathFunctionException.java
index 6890124..6890124 100644
--- a/xml/src/main/java/javax/xml/xpath/XPathFunctionException.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathFunctionException.java
diff --git a/xml/src/main/java/javax/xml/xpath/XPathFunctionResolver.java b/luni/src/main/java/javax/xml/xpath/XPathFunctionResolver.java
index 7dae4d7..7dae4d7 100644
--- a/xml/src/main/java/javax/xml/xpath/XPathFunctionResolver.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathFunctionResolver.java
diff --git a/xml/src/main/java/javax/xml/xpath/XPathVariableResolver.java b/luni/src/main/java/javax/xml/xpath/XPathVariableResolver.java
index c173db5..c173db5 100644
--- a/xml/src/main/java/javax/xml/xpath/XPathVariableResolver.java
+++ b/luni/src/main/java/javax/xml/xpath/XPathVariableResolver.java
diff --git a/xml/src/main/java/javax/xml/xpath/package.html b/luni/src/main/java/javax/xml/xpath/package.html
index edeb448..edeb448 100644
--- a/xml/src/main/java/javax/xml/xpath/package.html
+++ b/luni/src/main/java/javax/xml/xpath/package.html
diff --git a/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/LangAccess.java b/luni/src/main/java/org/apache/harmony/kernel/vm/LangAccess.java
index 8b321e4..8b321e4 100644
--- a/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/LangAccess.java
+++ b/luni/src/main/java/org/apache/harmony/kernel/vm/LangAccess.java
diff --git a/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/ReflectionAccess.java b/luni/src/main/java/org/apache/harmony/kernel/vm/ReflectionAccess.java
index 1487ba1..1487ba1 100644
--- a/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/ReflectionAccess.java
+++ b/luni/src/main/java/org/apache/harmony/kernel/vm/ReflectionAccess.java
diff --git a/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/StringUtils.java b/luni/src/main/java/org/apache/harmony/kernel/vm/StringUtils.java
index b392388..b392388 100644
--- a/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/StringUtils.java
+++ b/luni/src/main/java/org/apache/harmony/kernel/vm/StringUtils.java
diff --git a/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/VM.java b/luni/src/main/java/org/apache/harmony/kernel/vm/VM.java
index 8aa7c4b..8aa7c4b 100644
--- a/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/VM.java
+++ b/luni/src/main/java/org/apache/harmony/kernel/vm/VM.java
diff --git a/luni-kernel/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java b/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
index a898f54..a898f54 100644
--- a/luni-kernel/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
+++ b/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
diff --git a/luni-kernel/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java b/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java
index f8dea31..f8dea31 100644
--- a/luni-kernel/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java
+++ b/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/ExpatAttributes.java b/luni/src/main/java/org/apache/harmony/xml/ExpatAttributes.java
index ed6cb11..ed6cb11 100644
--- a/xml/src/main/java/org/apache/harmony/xml/ExpatAttributes.java
+++ b/luni/src/main/java/org/apache/harmony/xml/ExpatAttributes.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/ExpatException.java b/luni/src/main/java/org/apache/harmony/xml/ExpatException.java
index da3db9d..da3db9d 100644
--- a/xml/src/main/java/org/apache/harmony/xml/ExpatException.java
+++ b/luni/src/main/java/org/apache/harmony/xml/ExpatException.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/ExpatParser.java b/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java
index be933ca..be933ca 100644
--- a/xml/src/main/java/org/apache/harmony/xml/ExpatParser.java
+++ b/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/ExpatPullParser.java b/luni/src/main/java/org/apache/harmony/xml/ExpatPullParser.java
index 4759718..4759718 100644
--- a/xml/src/main/java/org/apache/harmony/xml/ExpatPullParser.java
+++ b/luni/src/main/java/org/apache/harmony/xml/ExpatPullParser.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/ExpatReader.java b/luni/src/main/java/org/apache/harmony/xml/ExpatReader.java
index 3bf5d07..3bf5d07 100644
--- a/xml/src/main/java/org/apache/harmony/xml/ExpatReader.java
+++ b/luni/src/main/java/org/apache/harmony/xml/ExpatReader.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/AttrImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/AttrImpl.java
index c601de6..c601de6 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/AttrImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/AttrImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/CDATASectionImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/CDATASectionImpl.java
index 7d122f2..7d122f2 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/CDATASectionImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/CDATASectionImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/CharacterDataImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/CharacterDataImpl.java
index 2d4c3b4..2d4c3b4 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/CharacterDataImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/CharacterDataImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/CommentImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/CommentImpl.java
index 5f8a4e0..5f8a4e0 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/CommentImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/CommentImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java
index 1a8acbc..1a8acbc 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/DOMImplementationImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DOMImplementationImpl.java
index 3106c3f..3106c3f 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/DOMImplementationImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/DOMImplementationImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/DocumentFragmentImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DocumentFragmentImpl.java
index 1a33631..1a33631 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/DocumentFragmentImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/DocumentFragmentImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/DocumentImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DocumentImpl.java
index 56283a8..56283a8 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/DocumentImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/DocumentImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/DocumentTypeImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DocumentTypeImpl.java
index b0e8eda..b0e8eda 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/DocumentTypeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/DocumentTypeImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java
index cbc4570..cbc4570 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/ElementImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/EntityImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/EntityImpl.java
index 6b4afc0..6b4afc0 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/EntityImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/EntityImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/EntityReferenceImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/EntityReferenceImpl.java
index d4b62b1..d4b62b1 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/EntityReferenceImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/EntityReferenceImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/InnerNodeImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/InnerNodeImpl.java
index bd4affb..bd4affb 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/InnerNodeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/InnerNodeImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/LeafNodeImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/LeafNodeImpl.java
index ebb3fc5..ebb3fc5 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/LeafNodeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/LeafNodeImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/NamedNodeMapImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/NamedNodeMapImpl.java
index 6eb8efa..6eb8efa 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/NamedNodeMapImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/NamedNodeMapImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
index 8beb18c..8beb18c 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/NodeImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/NodeListImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/NodeListImpl.java
index caa56af..caa56af 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/NodeListImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/NodeListImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/NotationImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/NotationImpl.java
index 5bc6789..5bc6789 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/NotationImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/NotationImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/ProcessingInstructionImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/ProcessingInstructionImpl.java
index 115245d..115245d 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/ProcessingInstructionImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/ProcessingInstructionImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/dom/TextImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/TextImpl.java
index 7b61b02..7b61b02 100644
--- a/xml/src/main/java/org/apache/harmony/xml/dom/TextImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/dom/TextImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderFactoryImpl.java
index 5cdba97..5cdba97 100644
--- a/xml/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderFactoryImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
index 31384a0..31384a0 100644
--- a/xml/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/parsers/SAXParserFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserFactoryImpl.java
index 6846216..6846216 100644
--- a/xml/src/main/java/org/apache/harmony/xml/parsers/SAXParserFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserFactoryImpl.java
diff --git a/xml/src/main/java/org/apache/harmony/xml/parsers/SAXParserImpl.java b/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserImpl.java
index 55de4b3..55de4b3 100644
--- a/xml/src/main/java/org/apache/harmony/xml/parsers/SAXParserImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xml/parsers/SAXParserImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/AbstractSessionContext.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AbstractSessionContext.java
index 7a0985e..7a0985e 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/AbstractSessionContext.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AbstractSessionContext.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertException.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertException.java
index f607364..f607364 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertException.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertException.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertProtocol.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertProtocol.java
index a12d00a..a12d00a 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertProtocol.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/AlertProtocol.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Appendable.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Appendable.java
index 070f42a..070f42a 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Appendable.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Appendable.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java
index 8065860..8065860 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateMessage.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java
index 7246c4d..7246c4d 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateRequest.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java
index 9b18ecb..9b18ecb 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CertificateVerify.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java
index f084195..f084195 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/CipherSuite.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
index 34252f0..34252f0 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java
index 5764105..5764105 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHello.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java
index af751c2..af751c2 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientKeyExchange.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java
index 66e8d03..66e8d03 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientSessionContext.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionState.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionState.java
index 49a7af9..49a7af9 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionState.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionState.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateSSLv3.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateSSLv3.java
index 07bd340..07bd340 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateSSLv3.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateSSLv3.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java
index 949e655..949e655 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ConnectionStateTLS.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ContentType.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ContentType.java
index 69704f5..69704f5 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ContentType.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ContentType.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DHParameters.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DHParameters.java
index 441fc5f..441fc5f 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DHParameters.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DHParameters.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DataStream.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DataStream.java
index ffc8612..ffc8612 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DataStream.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DataStream.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
index 3b2e103..3b2e103 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DelegatedTask.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java
index a0f18b4..a0f18b4 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/DigitalSignature.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/EndOfBufferException.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/EndOfBufferException.java
index 1dcdd20..1dcdd20 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/EndOfBufferException.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/EndOfBufferException.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/EndOfSourceException.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/EndOfSourceException.java
index 631679a..631679a 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/EndOfSourceException.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/EndOfSourceException.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/FileClientSessionCache.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/FileClientSessionCache.java
index d438779..d438779 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/FileClientSessionCache.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/FileClientSessionCache.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java
index 6b555c6..6b555c6 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Finished.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Handshake.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Handshake.java
index 64e73dd..64e73dd 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Handshake.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Handshake.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
index 74cc27d..74cc27d 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeIODataStream.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
index 6579398..6579398 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java
index 40d4a71..40d4a71 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HelloRequest.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java
index 083a342..083a342 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerFactoryImpl.java
index 3b55299..3b55299 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerFactoryImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
index f63170f..f63170f 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java
index c06aa7e..c06aa7e 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Logger.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java
index f1b2515..f1b2515 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/Message.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java
index 2220d36..2220d36 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigest.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigest.java
index 919d9e1..919d9e1 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigest.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigest.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java
index 4ba3a74..4ba3a74 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketFactoryImpl.java
index f342457..f342457 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketFactoryImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java
index 8d5a43e..8d5a43e 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java
index f42bcae..f42bcae 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java
index 3db6301..3db6301 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java
index 7b6d7c8..7b6d7c8 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
index edef590..edef590 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImplWrapper.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImplWrapper.java
index 959f2a0..959f2a0 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImplWrapper.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImplWrapper.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java
index c2f91a3..c2f91a3 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/PRF.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ProtocolVersion.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ProtocolVersion.java
index def27f9..def27f9 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ProtocolVersion.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ProtocolVersion.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java
index 31bb681..31bb681 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLBufferedInput.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLClientSessionCache.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLClientSessionCache.java
index 8a73fa5..8a73fa5 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLClientSessionCache.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLClientSessionCache.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
index 34942e1..34942e1 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java
index 9a2cb5e..9a2cb5e 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineAppData.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineDataStream.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineDataStream.java
index e209dd1..e209dd1 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineDataStream.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineDataStream.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
index c28a311..c28a311 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java
index b2501a7..b2501a7 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLInputStream.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
index 9c6f0a0..9c6f0a0 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
index 423a817..423a817 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLRecordProtocol.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSessionCache.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSessionCache.java
index 32a0e72..32a0e72 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSessionCache.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSessionCache.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java
index 922de2b..922de2b 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLStreamedInput.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLStreamedInput.java
index c040653..c040653 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLStreamedInput.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLStreamedInput.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLv3Constants.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLv3Constants.java
index 07aaca8..07aaca8 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLv3Constants.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLv3Constants.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
index b76c42f..b76c42f 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java
index 1cd9624..1cd9624 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHello.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java
index 73b6a81..73b6a81 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHelloDone.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java
index af056a3..af056a3 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerKeyExchange.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerSessionContext.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerSessionContext.java
index 160188d..160188d 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerSessionContext.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerSessionContext.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java
index c473864..c473864 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java
diff --git a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
index 543dfb2..543dfb2 100644
--- a/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
diff --git a/xml/src/main/java/org/apache/xalan/Version.java b/luni/src/main/java/org/apache/xalan/Version.java
index 23e8fbe..23e8fbe 100644
--- a/xml/src/main/java/org/apache/xalan/Version.java
+++ b/luni/src/main/java/org/apache/xalan/Version.java
diff --git a/xml/src/main/java/org/apache/xalan/Version.src b/luni/src/main/java/org/apache/xalan/Version.src
index f1fb77e..f1fb77e 100644
--- a/xml/src/main/java/org/apache/xalan/Version.src
+++ b/luni/src/main/java/org/apache/xalan/Version.src
diff --git a/xml/src/main/java/org/apache/xalan/extensions/ExpressionContext.java b/luni/src/main/java/org/apache/xalan/extensions/ExpressionContext.java
index b40bb9a..b40bb9a 100644
--- a/xml/src/main/java/org/apache/xalan/extensions/ExpressionContext.java
+++ b/luni/src/main/java/org/apache/xalan/extensions/ExpressionContext.java
diff --git a/xml/src/main/java/org/apache/xalan/extensions/ExpressionVisitor.java b/luni/src/main/java/org/apache/xalan/extensions/ExpressionVisitor.java
index cd895df..cd895df 100644
--- a/xml/src/main/java/org/apache/xalan/extensions/ExpressionVisitor.java
+++ b/luni/src/main/java/org/apache/xalan/extensions/ExpressionVisitor.java
diff --git a/xml/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java b/luni/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java
index 9c46e8a..9c46e8a 100644
--- a/xml/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java
+++ b/luni/src/main/java/org/apache/xalan/extensions/ExtensionHandler.java
diff --git a/xml/src/main/java/org/apache/xalan/extensions/ExtensionNamespaceSupport.java b/luni/src/main/java/org/apache/xalan/extensions/ExtensionNamespaceSupport.java
index 8ad232f..8ad232f 100644
--- a/xml/src/main/java/org/apache/xalan/extensions/ExtensionNamespaceSupport.java
+++ b/luni/src/main/java/org/apache/xalan/extensions/ExtensionNamespaceSupport.java
diff --git a/xml/src/main/java/org/apache/xalan/extensions/ExtensionNamespacesManager.java b/luni/src/main/java/org/apache/xalan/extensions/ExtensionNamespacesManager.java
index 867b14c..867b14c 100644
--- a/xml/src/main/java/org/apache/xalan/extensions/ExtensionNamespacesManager.java
+++ b/luni/src/main/java/org/apache/xalan/extensions/ExtensionNamespacesManager.java
diff --git a/xml/src/main/java/org/apache/xalan/extensions/ExtensionsTable.java b/luni/src/main/java/org/apache/xalan/extensions/ExtensionsTable.java
index cb5cc48..cb5cc48 100644
--- a/xml/src/main/java/org/apache/xalan/extensions/ExtensionsTable.java
+++ b/luni/src/main/java/org/apache/xalan/extensions/ExtensionsTable.java
diff --git a/xml/src/main/java/org/apache/xalan/extensions/ObjectFactory.java b/luni/src/main/java/org/apache/xalan/extensions/ObjectFactory.java
index 3772cb7..3772cb7 100755
--- a/xml/src/main/java/org/apache/xalan/extensions/ObjectFactory.java
+++ b/luni/src/main/java/org/apache/xalan/extensions/ObjectFactory.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorAttributeSet.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorAttributeSet.java
index 97f1660..97f1660 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorAttributeSet.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorAttributeSet.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorCharacters.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorCharacters.java
index b318f39..b318f39 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorCharacters.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorCharacters.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorDecimalFormat.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorDecimalFormat.java
index 43250a6..43250a6 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorDecimalFormat.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorDecimalFormat.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorExsltFuncResult.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorExsltFuncResult.java
index 3a909fa..3a909fa 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorExsltFuncResult.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorExsltFuncResult.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java
index 8eb4e41..8eb4e41 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorExsltFunction.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorGlobalParamDecl.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorGlobalParamDecl.java
index 3fa4cc3..3fa4cc3 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorGlobalParamDecl.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorGlobalParamDecl.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java
index 8caacbd..8caacbd 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorGlobalVariableDecl.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorImport.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorImport.java
index c044bcf..c044bcf 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorImport.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorImport.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorInclude.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorInclude.java
index 814a0f3..814a0f3 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorInclude.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorInclude.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorKey.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorKey.java
index 2e4cd2a..2e4cd2a 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorKey.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorKey.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorLRE.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
index baf9f34..baf9f34 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorLRE.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
index 5ba7d19..5ba7d19 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorNamespaceAlias.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorOutputElem.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorOutputElem.java
index cb07b43..cb07b43 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorOutputElem.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorOutputElem.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java
index ba2e443..ba2e443 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorPreserveSpace.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
index 1a6d5d7..1a6d5d7 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorStripSpace.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorStylesheetDoc.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorStylesheetDoc.java
index 169b1d3..169b1d3 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorStylesheetDoc.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorStylesheetDoc.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java
index 9314ebd..9314ebd 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorStylesheetElement.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorTemplate.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorTemplate.java
index cd11ecd..cd11ecd 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorTemplate.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorTemplate.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorTemplateElem.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorTemplateElem.java
index d3331bd..d3331bd 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorTemplateElem.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorTemplateElem.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorText.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorText.java
index 5111a41..5111a41 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorText.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorText.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/ProcessorUnknown.java b/luni/src/main/java/org/apache/xalan/processor/ProcessorUnknown.java
index 8aed015..8aed015 100644
--- a/xml/src/main/java/org/apache/xalan/processor/ProcessorUnknown.java
+++ b/luni/src/main/java/org/apache/xalan/processor/ProcessorUnknown.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/StylesheetHandler.java b/luni/src/main/java/org/apache/xalan/processor/StylesheetHandler.java
index dba47ac..dba47ac 100644
--- a/xml/src/main/java/org/apache/xalan/processor/StylesheetHandler.java
+++ b/luni/src/main/java/org/apache/xalan/processor/StylesheetHandler.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java b/luni/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
index 618b412..618b412 100644
--- a/xml/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
+++ b/luni/src/main/java/org/apache/xalan/processor/TransformerFactoryImpl.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/WhitespaceInfoPaths.java b/luni/src/main/java/org/apache/xalan/processor/WhitespaceInfoPaths.java
index 086345c..086345c 100644
--- a/xml/src/main/java/org/apache/xalan/processor/WhitespaceInfoPaths.java
+++ b/luni/src/main/java/org/apache/xalan/processor/WhitespaceInfoPaths.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/XSLProcessorVersion.src b/luni/src/main/java/org/apache/xalan/processor/XSLProcessorVersion.src
index caae25d..caae25d 100644
--- a/xml/src/main/java/org/apache/xalan/processor/XSLProcessorVersion.src
+++ b/luni/src/main/java/org/apache/xalan/processor/XSLProcessorVersion.src
diff --git a/xml/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java b/luni/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java
index 6e00c88..6e00c88 100644
--- a/xml/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java
+++ b/luni/src/main/java/org/apache/xalan/processor/XSLTAttributeDef.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/XSLTElementDef.java b/luni/src/main/java/org/apache/xalan/processor/XSLTElementDef.java
index 1129639..1129639 100644
--- a/xml/src/main/java/org/apache/xalan/processor/XSLTElementDef.java
+++ b/luni/src/main/java/org/apache/xalan/processor/XSLTElementDef.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java b/luni/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
index 7858b42..7858b42 100644
--- a/xml/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
+++ b/luni/src/main/java/org/apache/xalan/processor/XSLTElementProcessor.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/XSLTSchema.java b/luni/src/main/java/org/apache/xalan/processor/XSLTSchema.java
index 8f6eb2e..8f6eb2e 100644
--- a/xml/src/main/java/org/apache/xalan/processor/XSLTSchema.java
+++ b/luni/src/main/java/org/apache/xalan/processor/XSLTSchema.java
diff --git a/xml/src/main/java/org/apache/xalan/processor/package.html b/luni/src/main/java/org/apache/xalan/processor/package.html
index 6d1dd4e..6d1dd4e 100644
--- a/xml/src/main/java/org/apache/xalan/processor/package.html
+++ b/luni/src/main/java/org/apache/xalan/processor/package.html
diff --git a/xml/src/main/java/org/apache/xalan/res/XSLMessages.java b/luni/src/main/java/org/apache/xalan/res/XSLMessages.java
index cbbfd88..cbbfd88 100644
--- a/xml/src/main/java/org/apache/xalan/res/XSLMessages.java
+++ b/luni/src/main/java/org/apache/xalan/res/XSLMessages.java
diff --git a/xml/src/main/java/org/apache/xalan/res/XSLTErrorResources.java b/luni/src/main/java/org/apache/xalan/res/XSLTErrorResources.java
index 8310540..8310540 100644
--- a/xml/src/main/java/org/apache/xalan/res/XSLTErrorResources.java
+++ b/luni/src/main/java/org/apache/xalan/res/XSLTErrorResources.java
diff --git a/xml/src/main/java/org/apache/xalan/res/XSLTInfo.properties b/luni/src/main/java/org/apache/xalan/res/XSLTInfo.properties
index 309ac32..309ac32 100644
--- a/xml/src/main/java/org/apache/xalan/res/XSLTInfo.properties
+++ b/luni/src/main/java/org/apache/xalan/res/XSLTInfo.properties
diff --git a/xml/src/main/java/org/apache/xalan/res/package.html b/luni/src/main/java/org/apache/xalan/res/package.html
index b4acbad..b4acbad 100644
--- a/xml/src/main/java/org/apache/xalan/res/package.html
+++ b/luni/src/main/java/org/apache/xalan/res/package.html
diff --git a/xml/src/main/java/org/apache/xalan/serialize/SerializerUtils.java b/luni/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
index 5127989..5127989 100644
--- a/xml/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
+++ b/luni/src/main/java/org/apache/xalan/serialize/SerializerUtils.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/AVT.java b/luni/src/main/java/org/apache/xalan/templates/AVT.java
index a8247e1..a8247e1 100644
--- a/xml/src/main/java/org/apache/xalan/templates/AVT.java
+++ b/luni/src/main/java/org/apache/xalan/templates/AVT.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/AVTPart.java b/luni/src/main/java/org/apache/xalan/templates/AVTPart.java
index 4d9a02d..4d9a02d 100644
--- a/xml/src/main/java/org/apache/xalan/templates/AVTPart.java
+++ b/luni/src/main/java/org/apache/xalan/templates/AVTPart.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/AVTPartSimple.java b/luni/src/main/java/org/apache/xalan/templates/AVTPartSimple.java
index 0e489d3..0e489d3 100644
--- a/xml/src/main/java/org/apache/xalan/templates/AVTPartSimple.java
+++ b/luni/src/main/java/org/apache/xalan/templates/AVTPartSimple.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/AVTPartXPath.java b/luni/src/main/java/org/apache/xalan/templates/AVTPartXPath.java
index dde5f31..dde5f31 100644
--- a/xml/src/main/java/org/apache/xalan/templates/AVTPartXPath.java
+++ b/luni/src/main/java/org/apache/xalan/templates/AVTPartXPath.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/AbsPathChecker.java b/luni/src/main/java/org/apache/xalan/templates/AbsPathChecker.java
index 9303d30..9303d30 100644
--- a/xml/src/main/java/org/apache/xalan/templates/AbsPathChecker.java
+++ b/luni/src/main/java/org/apache/xalan/templates/AbsPathChecker.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/Constants.java b/luni/src/main/java/org/apache/xalan/templates/Constants.java
index 717fa35..717fa35 100644
--- a/xml/src/main/java/org/apache/xalan/templates/Constants.java
+++ b/luni/src/main/java/org/apache/xalan/templates/Constants.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java b/luni/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java
index 7291484..7291484 100644
--- a/xml/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java
+++ b/luni/src/main/java/org/apache/xalan/templates/DecimalFormatProperties.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemApplyImport.java b/luni/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
index 39b9919..39b9919 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemApplyImport.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java b/luni/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
index e332ff0..e332ff0 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemApplyTemplates.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemAttribute.java b/luni/src/main/java/org/apache/xalan/templates/ElemAttribute.java
index a6ca934..a6ca934 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemAttribute.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemAttribute.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java b/luni/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
index 8f85122..8f85122 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemAttributeSet.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java b/luni/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
index 8bcb37c..8bcb37c 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemCallTemplate.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemChoose.java b/luni/src/main/java/org/apache/xalan/templates/ElemChoose.java
index caa44f3..caa44f3 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemChoose.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemChoose.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemComment.java b/luni/src/main/java/org/apache/xalan/templates/ElemComment.java
index 49e9311..49e9311 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemComment.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemComment.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemCopy.java b/luni/src/main/java/org/apache/xalan/templates/ElemCopy.java
index 344c13d..344c13d 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemCopy.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemCopy.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemCopyOf.java b/luni/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
index 8423992..8423992 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemCopyOf.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemElement.java b/luni/src/main/java/org/apache/xalan/templates/ElemElement.java
index 3f13eb4..3f13eb4 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemElement.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemElement.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemEmpty.java b/luni/src/main/java/org/apache/xalan/templates/ElemEmpty.java
index ea4662f..ea4662f 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemEmpty.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemEmpty.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemExsltFuncResult.java b/luni/src/main/java/org/apache/xalan/templates/ElemExsltFuncResult.java
index 32bdbf0..32bdbf0 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemExsltFuncResult.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemExsltFuncResult.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemExsltFunction.java b/luni/src/main/java/org/apache/xalan/templates/ElemExsltFunction.java
index acf3374..acf3374 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemExsltFunction.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemExsltFunction.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemExtensionCall.java b/luni/src/main/java/org/apache/xalan/templates/ElemExtensionCall.java
index cdbd069..cdbd069 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemExtensionCall.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemExtensionCall.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemExtensionDecl.java b/luni/src/main/java/org/apache/xalan/templates/ElemExtensionDecl.java
index 0e09bfd..0e09bfd 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemExtensionDecl.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemExtensionDecl.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemExtensionScript.java b/luni/src/main/java/org/apache/xalan/templates/ElemExtensionScript.java
index 0233768..0233768 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemExtensionScript.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemExtensionScript.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemFallback.java b/luni/src/main/java/org/apache/xalan/templates/ElemFallback.java
index 914cdf5..914cdf5 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemFallback.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemFallback.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemForEach.java b/luni/src/main/java/org/apache/xalan/templates/ElemForEach.java
index 72b3d7a..72b3d7a 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemForEach.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemForEach.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemIf.java b/luni/src/main/java/org/apache/xalan/templates/ElemIf.java
index 27814d9..27814d9 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemIf.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemIf.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemLiteralResult.java b/luni/src/main/java/org/apache/xalan/templates/ElemLiteralResult.java
index 3fc7db2..3fc7db2 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemLiteralResult.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemLiteralResult.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemMessage.java b/luni/src/main/java/org/apache/xalan/templates/ElemMessage.java
index 1cfdf17..1cfdf17 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemMessage.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemMessage.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemNumber.java b/luni/src/main/java/org/apache/xalan/templates/ElemNumber.java
index 1335902..1335902 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemNumber.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemNumber.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemOtherwise.java b/luni/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
index c2a137a..c2a137a 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemOtherwise.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemPI.java b/luni/src/main/java/org/apache/xalan/templates/ElemPI.java
index 449a6b7..449a6b7 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemPI.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemPI.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemParam.java b/luni/src/main/java/org/apache/xalan/templates/ElemParam.java
index 5e3feed..5e3feed 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemParam.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemParam.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemSort.java b/luni/src/main/java/org/apache/xalan/templates/ElemSort.java
index c8f6c14..c8f6c14 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemSort.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemSort.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemTemplate.java b/luni/src/main/java/org/apache/xalan/templates/ElemTemplate.java
index cc17381..cc17381 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemTemplate.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemTemplate.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java b/luni/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
index 8a4cedf..8a4cedf 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemTemplateElement.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemText.java b/luni/src/main/java/org/apache/xalan/templates/ElemText.java
index 7dc22da..7dc22da 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemText.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemText.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java b/luni/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
index 1d6f5e1..1d6f5e1 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemTextLiteral.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemUnknown.java b/luni/src/main/java/org/apache/xalan/templates/ElemUnknown.java
index 618ba3f..618ba3f 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemUnknown.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemUnknown.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemUse.java b/luni/src/main/java/org/apache/xalan/templates/ElemUse.java
index 85d3a57..85d3a57 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemUse.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemUse.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemValueOf.java b/luni/src/main/java/org/apache/xalan/templates/ElemValueOf.java
index a8d38c7..a8d38c7 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemValueOf.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemValueOf.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemVariable.java b/luni/src/main/java/org/apache/xalan/templates/ElemVariable.java
index 099463a..099463a 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemVariable.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemVariable.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemVariablePsuedo.java b/luni/src/main/java/org/apache/xalan/templates/ElemVariablePsuedo.java
index 9200e8c..9200e8c 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemVariablePsuedo.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemVariablePsuedo.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemWhen.java b/luni/src/main/java/org/apache/xalan/templates/ElemWhen.java
index b129161..b129161 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemWhen.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemWhen.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/ElemWithParam.java b/luni/src/main/java/org/apache/xalan/templates/ElemWithParam.java
index b59212c..b59212c 100644
--- a/xml/src/main/java/org/apache/xalan/templates/ElemWithParam.java
+++ b/luni/src/main/java/org/apache/xalan/templates/ElemWithParam.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/FuncDocument.java b/luni/src/main/java/org/apache/xalan/templates/FuncDocument.java
index ba2d38d..ba2d38d 100644
--- a/xml/src/main/java/org/apache/xalan/templates/FuncDocument.java
+++ b/luni/src/main/java/org/apache/xalan/templates/FuncDocument.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/FuncFormatNumb.java b/luni/src/main/java/org/apache/xalan/templates/FuncFormatNumb.java
index bf1a877..bf1a877 100644
--- a/xml/src/main/java/org/apache/xalan/templates/FuncFormatNumb.java
+++ b/luni/src/main/java/org/apache/xalan/templates/FuncFormatNumb.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/FuncKey.java b/luni/src/main/java/org/apache/xalan/templates/FuncKey.java
index 0f98fc2..0f98fc2 100644
--- a/xml/src/main/java/org/apache/xalan/templates/FuncKey.java
+++ b/luni/src/main/java/org/apache/xalan/templates/FuncKey.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/KeyDeclaration.java b/luni/src/main/java/org/apache/xalan/templates/KeyDeclaration.java
index 5caacbe..5caacbe 100644
--- a/xml/src/main/java/org/apache/xalan/templates/KeyDeclaration.java
+++ b/luni/src/main/java/org/apache/xalan/templates/KeyDeclaration.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/NamespaceAlias.java b/luni/src/main/java/org/apache/xalan/templates/NamespaceAlias.java
index 76aee1a..76aee1a 100644
--- a/xml/src/main/java/org/apache/xalan/templates/NamespaceAlias.java
+++ b/luni/src/main/java/org/apache/xalan/templates/NamespaceAlias.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/OutputProperties.java b/luni/src/main/java/org/apache/xalan/templates/OutputProperties.java
index e4bc447..e4bc447 100644
--- a/xml/src/main/java/org/apache/xalan/templates/OutputProperties.java
+++ b/luni/src/main/java/org/apache/xalan/templates/OutputProperties.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/RedundentExprEliminator.java b/luni/src/main/java/org/apache/xalan/templates/RedundentExprEliminator.java
index a2a0c03..a2a0c03 100644
--- a/xml/src/main/java/org/apache/xalan/templates/RedundentExprEliminator.java
+++ b/luni/src/main/java/org/apache/xalan/templates/RedundentExprEliminator.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/Stylesheet.java b/luni/src/main/java/org/apache/xalan/templates/Stylesheet.java
index 11bbe9e..11bbe9e 100644
--- a/xml/src/main/java/org/apache/xalan/templates/Stylesheet.java
+++ b/luni/src/main/java/org/apache/xalan/templates/Stylesheet.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/StylesheetComposed.java b/luni/src/main/java/org/apache/xalan/templates/StylesheetComposed.java
index 595410e..595410e 100644
--- a/xml/src/main/java/org/apache/xalan/templates/StylesheetComposed.java
+++ b/luni/src/main/java/org/apache/xalan/templates/StylesheetComposed.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/StylesheetRoot.java b/luni/src/main/java/org/apache/xalan/templates/StylesheetRoot.java
index 2cc8935..2cc8935 100644
--- a/xml/src/main/java/org/apache/xalan/templates/StylesheetRoot.java
+++ b/luni/src/main/java/org/apache/xalan/templates/StylesheetRoot.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/TemplateList.java b/luni/src/main/java/org/apache/xalan/templates/TemplateList.java
index 90c3169..90c3169 100644
--- a/xml/src/main/java/org/apache/xalan/templates/TemplateList.java
+++ b/luni/src/main/java/org/apache/xalan/templates/TemplateList.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/TemplateSubPatternAssociation.java b/luni/src/main/java/org/apache/xalan/templates/TemplateSubPatternAssociation.java
index 40477aa..40477aa 100644
--- a/xml/src/main/java/org/apache/xalan/templates/TemplateSubPatternAssociation.java
+++ b/luni/src/main/java/org/apache/xalan/templates/TemplateSubPatternAssociation.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/VarNameCollector.java b/luni/src/main/java/org/apache/xalan/templates/VarNameCollector.java
index c9842fc..c9842fc 100644
--- a/xml/src/main/java/org/apache/xalan/templates/VarNameCollector.java
+++ b/luni/src/main/java/org/apache/xalan/templates/VarNameCollector.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/WhiteSpaceInfo.java b/luni/src/main/java/org/apache/xalan/templates/WhiteSpaceInfo.java
index 5bf45b7..5bf45b7 100644
--- a/xml/src/main/java/org/apache/xalan/templates/WhiteSpaceInfo.java
+++ b/luni/src/main/java/org/apache/xalan/templates/WhiteSpaceInfo.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/XMLNSDecl.java b/luni/src/main/java/org/apache/xalan/templates/XMLNSDecl.java
index 4bc1523..4bc1523 100644
--- a/xml/src/main/java/org/apache/xalan/templates/XMLNSDecl.java
+++ b/luni/src/main/java/org/apache/xalan/templates/XMLNSDecl.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/XSLTVisitable.java b/luni/src/main/java/org/apache/xalan/templates/XSLTVisitable.java
index a35a6e1..a35a6e1 100644
--- a/xml/src/main/java/org/apache/xalan/templates/XSLTVisitable.java
+++ b/luni/src/main/java/org/apache/xalan/templates/XSLTVisitable.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/XSLTVisitor.java b/luni/src/main/java/org/apache/xalan/templates/XSLTVisitor.java
index cb68f1f..cb68f1f 100644
--- a/xml/src/main/java/org/apache/xalan/templates/XSLTVisitor.java
+++ b/luni/src/main/java/org/apache/xalan/templates/XSLTVisitor.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/XUnresolvedVariable.java b/luni/src/main/java/org/apache/xalan/templates/XUnresolvedVariable.java
index e821c80..e821c80 100644
--- a/xml/src/main/java/org/apache/xalan/templates/XUnresolvedVariable.java
+++ b/luni/src/main/java/org/apache/xalan/templates/XUnresolvedVariable.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/XUnresolvedVariableSimple.java b/luni/src/main/java/org/apache/xalan/templates/XUnresolvedVariableSimple.java
index 92e8654..92e8654 100644
--- a/xml/src/main/java/org/apache/xalan/templates/XUnresolvedVariableSimple.java
+++ b/luni/src/main/java/org/apache/xalan/templates/XUnresolvedVariableSimple.java
diff --git a/xml/src/main/java/org/apache/xalan/templates/package.html b/luni/src/main/java/org/apache/xalan/templates/package.html
index 240f6a5..240f6a5 100644
--- a/xml/src/main/java/org/apache/xalan/templates/package.html
+++ b/luni/src/main/java/org/apache/xalan/templates/package.html
diff --git a/xml/src/main/java/org/apache/xalan/transformer/ClonerToResultTree.java b/luni/src/main/java/org/apache/xalan/transformer/ClonerToResultTree.java
index cc7ea6c..cc7ea6c 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/ClonerToResultTree.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/ClonerToResultTree.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/Counter.java b/luni/src/main/java/org/apache/xalan/transformer/Counter.java
index a8aabd8..a8aabd8 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/Counter.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/Counter.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/CountersTable.java b/luni/src/main/java/org/apache/xalan/transformer/CountersTable.java
index 258fdb1..258fdb1 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/CountersTable.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/CountersTable.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/DecimalToRoman.java b/luni/src/main/java/org/apache/xalan/transformer/DecimalToRoman.java
index 3a600d0..3a600d0 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/DecimalToRoman.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/DecimalToRoman.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/KeyIterator.java b/luni/src/main/java/org/apache/xalan/transformer/KeyIterator.java
index 588f0eb..588f0eb 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/KeyIterator.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/KeyIterator.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/KeyManager.java b/luni/src/main/java/org/apache/xalan/transformer/KeyManager.java
index 884783c..884783c 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/KeyManager.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/KeyManager.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/KeyTable.java b/luni/src/main/java/org/apache/xalan/transformer/KeyTable.java
index fcfa366..fcfa366 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/KeyTable.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/KeyTable.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/MsgMgr.java b/luni/src/main/java/org/apache/xalan/transformer/MsgMgr.java
index 7f42c29..7f42c29 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/MsgMgr.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/MsgMgr.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/NodeSortKey.java b/luni/src/main/java/org/apache/xalan/transformer/NodeSortKey.java
index 91a1fd5..91a1fd5 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/NodeSortKey.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/NodeSortKey.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/NodeSorter.java b/luni/src/main/java/org/apache/xalan/transformer/NodeSorter.java
index d7977b2..d7977b2 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/NodeSorter.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/NodeSorter.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/SerializerSwitcher.java b/luni/src/main/java/org/apache/xalan/transformer/SerializerSwitcher.java
index 73ec2d4..73ec2d4 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/SerializerSwitcher.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/SerializerSwitcher.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/TrAXFilter.java b/luni/src/main/java/org/apache/xalan/transformer/TrAXFilter.java
index c32a081..c32a081 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/TrAXFilter.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/TrAXFilter.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/TransformState.java b/luni/src/main/java/org/apache/xalan/transformer/TransformState.java
index 3f04554..3f04554 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/TransformState.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/TransformState.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/TransformerClient.java b/luni/src/main/java/org/apache/xalan/transformer/TransformerClient.java
index b35b036..b35b036 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/TransformerClient.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/TransformerClient.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/TransformerHandlerImpl.java b/luni/src/main/java/org/apache/xalan/transformer/TransformerHandlerImpl.java
index 3f4c948..3f4c948 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/TransformerHandlerImpl.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/TransformerHandlerImpl.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java b/luni/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java
index c7b2534..c7b2534 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/TransformerIdentityImpl.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/TransformerImpl.java b/luni/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
index cf550b9..cf550b9 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/TransformerImpl.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java b/luni/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java
index 3e78cbc..3e78cbc 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/TreeWalker2Result.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/XalanProperties.java b/luni/src/main/java/org/apache/xalan/transformer/XalanProperties.java
index 28df780..28df780 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/XalanProperties.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/XalanProperties.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/XalanTransformState.java b/luni/src/main/java/org/apache/xalan/transformer/XalanTransformState.java
index cae10a2..cae10a2 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/XalanTransformState.java
+++ b/luni/src/main/java/org/apache/xalan/transformer/XalanTransformState.java
diff --git a/xml/src/main/java/org/apache/xalan/transformer/package.html b/luni/src/main/java/org/apache/xalan/transformer/package.html
index 763b1c1..763b1c1 100644
--- a/xml/src/main/java/org/apache/xalan/transformer/package.html
+++ b/luni/src/main/java/org/apache/xalan/transformer/package.html
diff --git a/xml/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java b/luni/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java
index 7ba3899..7ba3899 100644
--- a/xml/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java
+++ b/luni/src/main/java/org/apache/xalan/xslt/EnvironmentCheck.java
diff --git a/xml/src/main/java/org/apache/xalan/xslt/ObjectFactory.java b/luni/src/main/java/org/apache/xalan/xslt/ObjectFactory.java
index 1029b87..1029b87 100755
--- a/xml/src/main/java/org/apache/xalan/xslt/ObjectFactory.java
+++ b/luni/src/main/java/org/apache/xalan/xslt/ObjectFactory.java
diff --git a/xml/src/main/java/org/apache/xalan/xslt/SecuritySupport.java b/luni/src/main/java/org/apache/xalan/xslt/SecuritySupport.java
index 49e207a..49e207a 100755
--- a/xml/src/main/java/org/apache/xalan/xslt/SecuritySupport.java
+++ b/luni/src/main/java/org/apache/xalan/xslt/SecuritySupport.java
diff --git a/xml/src/main/java/org/apache/xalan/xslt/SecuritySupport12.java b/luni/src/main/java/org/apache/xalan/xslt/SecuritySupport12.java
index e751f8b..e751f8b 100755
--- a/xml/src/main/java/org/apache/xalan/xslt/SecuritySupport12.java
+++ b/luni/src/main/java/org/apache/xalan/xslt/SecuritySupport12.java
diff --git a/xml/src/main/java/org/apache/xalan/xslt/package.html b/luni/src/main/java/org/apache/xalan/xslt/package.html
index 61018f4..61018f4 100644
--- a/xml/src/main/java/org/apache/xalan/xslt/package.html
+++ b/luni/src/main/java/org/apache/xalan/xslt/package.html
diff --git a/xml/src/main/java/org/apache/xml/dtm/Axis.java b/luni/src/main/java/org/apache/xml/dtm/Axis.java
index 915a358..915a358 100644
--- a/xml/src/main/java/org/apache/xml/dtm/Axis.java
+++ b/luni/src/main/java/org/apache/xml/dtm/Axis.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/DTM.java b/luni/src/main/java/org/apache/xml/dtm/DTM.java
index 0722ff7..0722ff7 100644
--- a/xml/src/main/java/org/apache/xml/dtm/DTM.java
+++ b/luni/src/main/java/org/apache/xml/dtm/DTM.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/DTMAxisIterator.java b/luni/src/main/java/org/apache/xml/dtm/DTMAxisIterator.java
index b84efaa..b84efaa 100644
--- a/xml/src/main/java/org/apache/xml/dtm/DTMAxisIterator.java
+++ b/luni/src/main/java/org/apache/xml/dtm/DTMAxisIterator.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/DTMAxisTraverser.java b/luni/src/main/java/org/apache/xml/dtm/DTMAxisTraverser.java
index 9045235..9045235 100644
--- a/xml/src/main/java/org/apache/xml/dtm/DTMAxisTraverser.java
+++ b/luni/src/main/java/org/apache/xml/dtm/DTMAxisTraverser.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/DTMConfigurationException.java b/luni/src/main/java/org/apache/xml/dtm/DTMConfigurationException.java
index 5de4ca7..5de4ca7 100644
--- a/xml/src/main/java/org/apache/xml/dtm/DTMConfigurationException.java
+++ b/luni/src/main/java/org/apache/xml/dtm/DTMConfigurationException.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/DTMDOMException.java b/luni/src/main/java/org/apache/xml/dtm/DTMDOMException.java
index 42a770c..42a770c 100644
--- a/xml/src/main/java/org/apache/xml/dtm/DTMDOMException.java
+++ b/luni/src/main/java/org/apache/xml/dtm/DTMDOMException.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/DTMException.java b/luni/src/main/java/org/apache/xml/dtm/DTMException.java
index 030dc1f..030dc1f 100644
--- a/xml/src/main/java/org/apache/xml/dtm/DTMException.java
+++ b/luni/src/main/java/org/apache/xml/dtm/DTMException.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/DTMFilter.java b/luni/src/main/java/org/apache/xml/dtm/DTMFilter.java
index 5d0dfe0..5d0dfe0 100644
--- a/xml/src/main/java/org/apache/xml/dtm/DTMFilter.java
+++ b/luni/src/main/java/org/apache/xml/dtm/DTMFilter.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/DTMIterator.java b/luni/src/main/java/org/apache/xml/dtm/DTMIterator.java
index a251c11..a251c11 100644
--- a/xml/src/main/java/org/apache/xml/dtm/DTMIterator.java
+++ b/luni/src/main/java/org/apache/xml/dtm/DTMIterator.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/DTMManager.java b/luni/src/main/java/org/apache/xml/dtm/DTMManager.java
index d716c57..d716c57 100644
--- a/xml/src/main/java/org/apache/xml/dtm/DTMManager.java
+++ b/luni/src/main/java/org/apache/xml/dtm/DTMManager.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/DTMWSFilter.java b/luni/src/main/java/org/apache/xml/dtm/DTMWSFilter.java
index 7a16fe1..7a16fe1 100644
--- a/xml/src/main/java/org/apache/xml/dtm/DTMWSFilter.java
+++ b/luni/src/main/java/org/apache/xml/dtm/DTMWSFilter.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ObjectFactory.java b/luni/src/main/java/org/apache/xml/dtm/ObjectFactory.java
index 09f308d..09f308d 100755
--- a/xml/src/main/java/org/apache/xml/dtm/ObjectFactory.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ObjectFactory.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/SecuritySupport.java b/luni/src/main/java/org/apache/xml/dtm/SecuritySupport.java
index 6ea002c..6ea002c 100644
--- a/xml/src/main/java/org/apache/xml/dtm/SecuritySupport.java
+++ b/luni/src/main/java/org/apache/xml/dtm/SecuritySupport.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/SecuritySupport12.java b/luni/src/main/java/org/apache/xml/dtm/SecuritySupport12.java
index 7b083d0..7b083d0 100644
--- a/xml/src/main/java/org/apache/xml/dtm/SecuritySupport12.java
+++ b/luni/src/main/java/org/apache/xml/dtm/SecuritySupport12.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/ChunkedIntArray.java b/luni/src/main/java/org/apache/xml/dtm/ref/ChunkedIntArray.java
index 31517a7..31517a7 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/ChunkedIntArray.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/ChunkedIntArray.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/CoroutineManager.java b/luni/src/main/java/org/apache/xml/dtm/ref/CoroutineManager.java
index d353149..d353149 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/CoroutineManager.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/CoroutineManager.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java
index d4acca4..d4acca4 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMAxisIterNodeList.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java
index 99c176b..99c176b 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMAxisIteratorBase.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMChildIterNodeList.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMChildIterNodeList.java
index 29104db..29104db 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMChildIterNodeList.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMChildIterNodeList.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java
index d0647bf..d0647bf 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBase.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java
index d554119..d554119 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseIterators.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
index 0984fec..0984fec 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMDocumentImpl.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMDocumentImpl.java
index a564115..a564115 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMDocumentImpl.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMDocumentImpl.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java
index 5ba4151..5ba4151 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMManagerDefault.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMNamedNodeMap.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMNamedNodeMap.java
index 4bb1322..4bb1322 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMNamedNodeMap.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMNamedNodeMap.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeIterator.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeIterator.java
index a482757..a482757 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeIterator.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeIterator.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeList.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeList.java
index f265080..f265080 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeList.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeList.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeListBase.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeListBase.java
index 60bac3d..60bac3d 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeListBase.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeListBase.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeProxy.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeProxy.java
index ebd578c..ebd578c 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMNodeProxy.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMNodeProxy.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMStringPool.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMStringPool.java
index a47e7bf..a47e7bf 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMStringPool.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMStringPool.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/DTMTreeWalker.java b/luni/src/main/java/org/apache/xml/dtm/ref/DTMTreeWalker.java
index 73d2fc0..73d2fc0 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/DTMTreeWalker.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/DTMTreeWalker.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/ExpandedNameTable.java b/luni/src/main/java/org/apache/xml/dtm/ref/ExpandedNameTable.java
index 9fcdbd6..9fcdbd6 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/ExpandedNameTable.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/ExpandedNameTable.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/ExtendedType.java b/luni/src/main/java/org/apache/xml/dtm/ref/ExtendedType.java
index fd4e1d0..fd4e1d0 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/ExtendedType.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/ExtendedType.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource.java b/luni/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource.java
index 5a12ff6..5a12ff6 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java b/luni/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java
index 7192094..7192094 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/IncrementalSAXSource_Filter.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/NodeLocator.java b/luni/src/main/java/org/apache/xml/dtm/ref/NodeLocator.java
index c5fd89b..c5fd89b 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/NodeLocator.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/NodeLocator.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/SecuritySupport.java b/luni/src/main/java/org/apache/xml/dtm/ref/SecuritySupport.java
index 0dd7ac4..0dd7ac4 100755
--- a/xml/src/main/java/org/apache/xml/dtm/ref/SecuritySupport.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/SecuritySupport.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/SecuritySupport12.java b/luni/src/main/java/org/apache/xml/dtm/ref/SecuritySupport12.java
index e70c91b..e70c91b 100755
--- a/xml/src/main/java/org/apache/xml/dtm/ref/SecuritySupport12.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/SecuritySupport12.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java b/luni/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
index 2c376a0..2c376a0 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java b/luni/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
index 1629326..1629326 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java b/luni/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
index 8033787..8033787 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java b/luni/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java
index be2941a..be2941a 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM2.java
diff --git a/xml/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java b/luni/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java
index da04a06..da04a06 100644
--- a/xml/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java
+++ b/luni/src/main/java/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java
diff --git a/xml/src/main/java/org/apache/xml/res/XMLErrorResources.java b/luni/src/main/java/org/apache/xml/res/XMLErrorResources.java
index ef036f2..ef036f2 100644
--- a/xml/src/main/java/org/apache/xml/res/XMLErrorResources.java
+++ b/luni/src/main/java/org/apache/xml/res/XMLErrorResources.java
diff --git a/xml/src/main/java/org/apache/xml/res/XMLMessages.java b/luni/src/main/java/org/apache/xml/res/XMLMessages.java
index 9a2412e..9a2412e 100644
--- a/xml/src/main/java/org/apache/xml/res/XMLMessages.java
+++ b/luni/src/main/java/org/apache/xml/res/XMLMessages.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/AttributesImplSerializer.java b/luni/src/main/java/org/apache/xml/serializer/AttributesImplSerializer.java
index 440d4c9..440d4c9 100644
--- a/xml/src/main/java/org/apache/xml/serializer/AttributesImplSerializer.java
+++ b/luni/src/main/java/org/apache/xml/serializer/AttributesImplSerializer.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/CharInfo.java b/luni/src/main/java/org/apache/xml/serializer/CharInfo.java
index ef5e449..ef5e449 100644
--- a/xml/src/main/java/org/apache/xml/serializer/CharInfo.java
+++ b/luni/src/main/java/org/apache/xml/serializer/CharInfo.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/DOM3Serializer.java b/luni/src/main/java/org/apache/xml/serializer/DOM3Serializer.java
index df0e1fd..df0e1fd 100644
--- a/xml/src/main/java/org/apache/xml/serializer/DOM3Serializer.java
+++ b/luni/src/main/java/org/apache/xml/serializer/DOM3Serializer.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/DOMSerializer.java b/luni/src/main/java/org/apache/xml/serializer/DOMSerializer.java
index 86752b6..86752b6 100644
--- a/xml/src/main/java/org/apache/xml/serializer/DOMSerializer.java
+++ b/luni/src/main/java/org/apache/xml/serializer/DOMSerializer.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/ElemContext.java b/luni/src/main/java/org/apache/xml/serializer/ElemContext.java
index 0461645..0461645 100644
--- a/xml/src/main/java/org/apache/xml/serializer/ElemContext.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ElemContext.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/ElemDesc.java b/luni/src/main/java/org/apache/xml/serializer/ElemDesc.java
index f551210..f551210 100644
--- a/xml/src/main/java/org/apache/xml/serializer/ElemDesc.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ElemDesc.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/EncodingInfo.java b/luni/src/main/java/org/apache/xml/serializer/EncodingInfo.java
index 60465d4..60465d4 100644
--- a/xml/src/main/java/org/apache/xml/serializer/EncodingInfo.java
+++ b/luni/src/main/java/org/apache/xml/serializer/EncodingInfo.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/Encodings.java b/luni/src/main/java/org/apache/xml/serializer/Encodings.java
index 0831ef5..0831ef5 100644
--- a/xml/src/main/java/org/apache/xml/serializer/Encodings.java
+++ b/luni/src/main/java/org/apache/xml/serializer/Encodings.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/Encodings.properties b/luni/src/main/java/org/apache/xml/serializer/Encodings.properties
index 71ebde8..71ebde8 100644
--- a/xml/src/main/java/org/apache/xml/serializer/Encodings.properties
+++ b/luni/src/main/java/org/apache/xml/serializer/Encodings.properties
diff --git a/xml/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java b/luni/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java
index a811228..a811228 100644
--- a/xml/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ExtendedContentHandler.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java b/luni/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java
index a825604..a825604 100644
--- a/xml/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ExtendedLexicalHandler.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/HTMLEntities.properties b/luni/src/main/java/org/apache/xml/serializer/HTMLEntities.properties
index 2de4df6..2de4df6 100644
--- a/xml/src/main/java/org/apache/xml/serializer/HTMLEntities.properties
+++ b/luni/src/main/java/org/apache/xml/serializer/HTMLEntities.properties
diff --git a/xml/src/main/java/org/apache/xml/serializer/Method.java b/luni/src/main/java/org/apache/xml/serializer/Method.java
index 0fb66f0..0fb66f0 100644
--- a/xml/src/main/java/org/apache/xml/serializer/Method.java
+++ b/luni/src/main/java/org/apache/xml/serializer/Method.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/NamespaceMappings.java b/luni/src/main/java/org/apache/xml/serializer/NamespaceMappings.java
index 3c67d80..3c67d80 100644
--- a/xml/src/main/java/org/apache/xml/serializer/NamespaceMappings.java
+++ b/luni/src/main/java/org/apache/xml/serializer/NamespaceMappings.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/ObjectFactory.java b/luni/src/main/java/org/apache/xml/serializer/ObjectFactory.java
index 560d984..560d984 100755
--- a/xml/src/main/java/org/apache/xml/serializer/ObjectFactory.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ObjectFactory.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java b/luni/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java
index cb41927..cb41927 100644
--- a/xml/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java
+++ b/luni/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/OutputPropertyUtils.java b/luni/src/main/java/org/apache/xml/serializer/OutputPropertyUtils.java
index 98b67ba..98b67ba 100644
--- a/xml/src/main/java/org/apache/xml/serializer/OutputPropertyUtils.java
+++ b/luni/src/main/java/org/apache/xml/serializer/OutputPropertyUtils.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/SecuritySupport.java b/luni/src/main/java/org/apache/xml/serializer/SecuritySupport.java
index 2779261..2779261 100644
--- a/xml/src/main/java/org/apache/xml/serializer/SecuritySupport.java
+++ b/luni/src/main/java/org/apache/xml/serializer/SecuritySupport.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/SecuritySupport12.java b/luni/src/main/java/org/apache/xml/serializer/SecuritySupport12.java
index a5e7fad..a5e7fad 100644
--- a/xml/src/main/java/org/apache/xml/serializer/SecuritySupport12.java
+++ b/luni/src/main/java/org/apache/xml/serializer/SecuritySupport12.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/SerializationHandler.java b/luni/src/main/java/org/apache/xml/serializer/SerializationHandler.java
index 57029e0..57029e0 100644
--- a/xml/src/main/java/org/apache/xml/serializer/SerializationHandler.java
+++ b/luni/src/main/java/org/apache/xml/serializer/SerializationHandler.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/Serializer.java b/luni/src/main/java/org/apache/xml/serializer/Serializer.java
index 849d39a..849d39a 100644
--- a/xml/src/main/java/org/apache/xml/serializer/Serializer.java
+++ b/luni/src/main/java/org/apache/xml/serializer/Serializer.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/SerializerBase.java b/luni/src/main/java/org/apache/xml/serializer/SerializerBase.java
index 8e7d38b..8e7d38b 100644
--- a/xml/src/main/java/org/apache/xml/serializer/SerializerBase.java
+++ b/luni/src/main/java/org/apache/xml/serializer/SerializerBase.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/SerializerConstants.java b/luni/src/main/java/org/apache/xml/serializer/SerializerConstants.java
index 87f5052..87f5052 100644
--- a/xml/src/main/java/org/apache/xml/serializer/SerializerConstants.java
+++ b/luni/src/main/java/org/apache/xml/serializer/SerializerConstants.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/SerializerFactory.java b/luni/src/main/java/org/apache/xml/serializer/SerializerFactory.java
index f4e5986..f4e5986 100644
--- a/xml/src/main/java/org/apache/xml/serializer/SerializerFactory.java
+++ b/luni/src/main/java/org/apache/xml/serializer/SerializerFactory.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/SerializerTrace.java b/luni/src/main/java/org/apache/xml/serializer/SerializerTrace.java
index df612f5..df612f5 100644
--- a/xml/src/main/java/org/apache/xml/serializer/SerializerTrace.java
+++ b/luni/src/main/java/org/apache/xml/serializer/SerializerTrace.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/SerializerTraceWriter.java b/luni/src/main/java/org/apache/xml/serializer/SerializerTraceWriter.java
index 5255dba..5255dba 100644
--- a/xml/src/main/java/org/apache/xml/serializer/SerializerTraceWriter.java
+++ b/luni/src/main/java/org/apache/xml/serializer/SerializerTraceWriter.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/ToHTMLStream.java b/luni/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
index 4f2927a..4f2927a 100644
--- a/xml/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ToHTMLStream.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/ToSAXHandler.java b/luni/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
index 97adcba..97adcba 100644
--- a/xml/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ToSAXHandler.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/ToStream.java b/luni/src/main/java/org/apache/xml/serializer/ToStream.java
index c56f747..c56f747 100644
--- a/xml/src/main/java/org/apache/xml/serializer/ToStream.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ToStream.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java b/luni/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
index f472a6d..f472a6d 100644
--- a/xml/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ToTextSAXHandler.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/ToTextStream.java b/luni/src/main/java/org/apache/xml/serializer/ToTextStream.java
index b0d066e..b0d066e 100644
--- a/xml/src/main/java/org/apache/xml/serializer/ToTextStream.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ToTextStream.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/ToUnknownStream.java b/luni/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
index baa1ca2..baa1ca2 100644
--- a/xml/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ToUnknownStream.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java b/luni/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
index edb1e35..edb1e35 100644
--- a/xml/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ToXMLSAXHandler.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/ToXMLStream.java b/luni/src/main/java/org/apache/xml/serializer/ToXMLStream.java
index d962189..d962189 100644
--- a/xml/src/main/java/org/apache/xml/serializer/ToXMLStream.java
+++ b/luni/src/main/java/org/apache/xml/serializer/ToXMLStream.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/TransformStateSetter.java b/luni/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
index 1342f35..1342f35 100644
--- a/xml/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
+++ b/luni/src/main/java/org/apache/xml/serializer/TransformStateSetter.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/TreeWalker.java b/luni/src/main/java/org/apache/xml/serializer/TreeWalker.java
index bf9c568..bf9c568 100644
--- a/xml/src/main/java/org/apache/xml/serializer/TreeWalker.java
+++ b/luni/src/main/java/org/apache/xml/serializer/TreeWalker.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/Version.java b/luni/src/main/java/org/apache/xml/serializer/Version.java
index 17e73d5..17e73d5 100644
--- a/xml/src/main/java/org/apache/xml/serializer/Version.java
+++ b/luni/src/main/java/org/apache/xml/serializer/Version.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/Version.src b/luni/src/main/java/org/apache/xml/serializer/Version.src
index 46402cb..46402cb 100644
--- a/xml/src/main/java/org/apache/xml/serializer/Version.src
+++ b/luni/src/main/java/org/apache/xml/serializer/Version.src
diff --git a/xml/src/main/java/org/apache/xml/serializer/WriterChain.java b/luni/src/main/java/org/apache/xml/serializer/WriterChain.java
index 24246e6..24246e6 100644
--- a/xml/src/main/java/org/apache/xml/serializer/WriterChain.java
+++ b/luni/src/main/java/org/apache/xml/serializer/WriterChain.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/WriterToASCI.java b/luni/src/main/java/org/apache/xml/serializer/WriterToASCI.java
index acc4f5a..acc4f5a 100644
--- a/xml/src/main/java/org/apache/xml/serializer/WriterToASCI.java
+++ b/luni/src/main/java/org/apache/xml/serializer/WriterToASCI.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/WriterToUTF8Buffered.java b/luni/src/main/java/org/apache/xml/serializer/WriterToUTF8Buffered.java
index abff1b9..abff1b9 100644
--- a/xml/src/main/java/org/apache/xml/serializer/WriterToUTF8Buffered.java
+++ b/luni/src/main/java/org/apache/xml/serializer/WriterToUTF8Buffered.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/XMLEntities.properties b/luni/src/main/java/org/apache/xml/serializer/XMLEntities.properties
index c30bed3..c30bed3 100644
--- a/xml/src/main/java/org/apache/xml/serializer/XMLEntities.properties
+++ b/luni/src/main/java/org/apache/xml/serializer/XMLEntities.properties
diff --git a/xml/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java b/luni/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java
index a6fa0f8..a6fa0f8 100644
--- a/xml/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java
+++ b/luni/src/main/java/org/apache/xml/serializer/XSLOutputAttributes.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java b/luni/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
index fcc9882..fcc9882 100644
--- a/xml/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
+++ b/luni/src/main/java/org/apache/xml/serializer/dom3/DOM3SerializerImpl.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java b/luni/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java
index 0b62423..0b62423 100644
--- a/xml/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java
+++ b/luni/src/main/java/org/apache/xml/serializer/dom3/DOM3TreeWalker.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/dom3/DOMConstants.java b/luni/src/main/java/org/apache/xml/serializer/dom3/DOMConstants.java
index dae4f59..dae4f59 100644
--- a/xml/src/main/java/org/apache/xml/serializer/dom3/DOMConstants.java
+++ b/luni/src/main/java/org/apache/xml/serializer/dom3/DOMConstants.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java b/luni/src/main/java/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java
index fd88266..fd88266 100644
--- a/xml/src/main/java/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java
+++ b/luni/src/main/java/org/apache/xml/serializer/dom3/DOMErrorHandlerImpl.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/dom3/DOMErrorImpl.java b/luni/src/main/java/org/apache/xml/serializer/dom3/DOMErrorImpl.java
index 3895a53..3895a53 100644
--- a/xml/src/main/java/org/apache/xml/serializer/dom3/DOMErrorImpl.java
+++ b/luni/src/main/java/org/apache/xml/serializer/dom3/DOMErrorImpl.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/dom3/DOMLocatorImpl.java b/luni/src/main/java/org/apache/xml/serializer/dom3/DOMLocatorImpl.java
index 8add00c..8add00c 100644
--- a/xml/src/main/java/org/apache/xml/serializer/dom3/DOMLocatorImpl.java
+++ b/luni/src/main/java/org/apache/xml/serializer/dom3/DOMLocatorImpl.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/dom3/DOMOutputImpl.java b/luni/src/main/java/org/apache/xml/serializer/dom3/DOMOutputImpl.java
index 54327c0..54327c0 100644
--- a/xml/src/main/java/org/apache/xml/serializer/dom3/DOMOutputImpl.java
+++ b/luni/src/main/java/org/apache/xml/serializer/dom3/DOMOutputImpl.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/dom3/DOMStringListImpl.java b/luni/src/main/java/org/apache/xml/serializer/dom3/DOMStringListImpl.java
index 5ace83a..5ace83a 100644
--- a/xml/src/main/java/org/apache/xml/serializer/dom3/DOMStringListImpl.java
+++ b/luni/src/main/java/org/apache/xml/serializer/dom3/DOMStringListImpl.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java b/luni/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java
index acac6fc..acac6fc 100644
--- a/xml/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java
+++ b/luni/src/main/java/org/apache/xml/serializer/dom3/LSSerializerImpl.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java b/luni/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
index fc2b0ea..fc2b0ea 100644
--- a/xml/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
+++ b/luni/src/main/java/org/apache/xml/serializer/dom3/NamespaceSupport.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/output_html.properties b/luni/src/main/java/org/apache/xml/serializer/output_html.properties
index 71ca138..71ca138 100644
--- a/xml/src/main/java/org/apache/xml/serializer/output_html.properties
+++ b/luni/src/main/java/org/apache/xml/serializer/output_html.properties
diff --git a/xml/src/main/java/org/apache/xml/serializer/output_text.properties b/luni/src/main/java/org/apache/xml/serializer/output_text.properties
index 25f906e..25f906e 100644
--- a/xml/src/main/java/org/apache/xml/serializer/output_text.properties
+++ b/luni/src/main/java/org/apache/xml/serializer/output_text.properties
diff --git a/xml/src/main/java/org/apache/xml/serializer/output_unknown.properties b/luni/src/main/java/org/apache/xml/serializer/output_unknown.properties
index dd70ff0..dd70ff0 100644
--- a/xml/src/main/java/org/apache/xml/serializer/output_unknown.properties
+++ b/luni/src/main/java/org/apache/xml/serializer/output_unknown.properties
diff --git a/xml/src/main/java/org/apache/xml/serializer/output_xml.properties b/luni/src/main/java/org/apache/xml/serializer/output_xml.properties
index 6a9617c..6a9617c 100644
--- a/xml/src/main/java/org/apache/xml/serializer/output_xml.properties
+++ b/luni/src/main/java/org/apache/xml/serializer/output_xml.properties
diff --git a/xml/src/main/java/org/apache/xml/serializer/package.html b/luni/src/main/java/org/apache/xml/serializer/package.html
index c6bde48..c6bde48 100644
--- a/xml/src/main/java/org/apache/xml/serializer/package.html
+++ b/luni/src/main/java/org/apache/xml/serializer/package.html
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/AttList.java b/luni/src/main/java/org/apache/xml/serializer/utils/AttList.java
index 2d676fa..2d676fa 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/AttList.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/AttList.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/DOM2Helper.java b/luni/src/main/java/org/apache/xml/serializer/utils/DOM2Helper.java
index cafd825..cafd825 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/DOM2Helper.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/DOM2Helper.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/Messages.java b/luni/src/main/java/org/apache/xml/serializer/utils/Messages.java
index e70fc3a..e70fc3a 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/Messages.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/Messages.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/MsgKey.java b/luni/src/main/java/org/apache/xml/serializer/utils/MsgKey.java
index 8ec6336..8ec6336 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/MsgKey.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/MsgKey.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages.java
index 997bfc1..997bfc1 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ca.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ca.java
index ad5b3ae..ad5b3ae 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ca.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ca.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_cs.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_cs.java
index 12b61bc..12b61bc 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_cs.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_cs.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_de.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_de.java
index e583e87..e583e87 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_de.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_de.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_en.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_en.java
index f79d1c6..f79d1c6 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_en.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_en.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_es.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_es.java
index 7f69976..7f69976 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_es.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_es.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_fr.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_fr.java
index 1f45524..1f45524 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_fr.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_fr.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_hu.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_hu.java
index 3e3c60e..3e3c60e 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_hu.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_hu.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_it.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_it.java
index d116bd9..d116bd9 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_it.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_it.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ja.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ja.java
index 0a969b9..0a969b9 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ja.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ja.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ko.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ko.java
index 3d2f011..3d2f011 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ko.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ko.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pl.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pl.java
index 06d97ae..06d97ae 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pl.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pl.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java
index b5bdb23..b5bdb23 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_pt_BR.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ru.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ru.java
index 2935048..2935048 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ru.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_ru.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sk.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sk.java
index fdabf07..fdabf07 100755
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sk.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sk.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sl.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sl.java
index fa40d4e..fa40d4e 100755
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sl.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sl.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sv.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sv.java
index 717ac41..717ac41 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sv.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_sv.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_tr.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_tr.java
index 58d0088..58d0088 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_tr.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_tr.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh.java
index dbb230d..dbb230d 100755
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java
index e8719ac..e8719ac 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_CN.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java
index 9525b18..9525b18 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SerializerMessages_zh_TW.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/StringToIntTable.java b/luni/src/main/java/org/apache/xml/serializer/utils/StringToIntTable.java
index 13c753b..13c753b 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/StringToIntTable.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/StringToIntTable.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/SystemIDResolver.java b/luni/src/main/java/org/apache/xml/serializer/utils/SystemIDResolver.java
index f10a300..f10a300 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/SystemIDResolver.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/SystemIDResolver.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/URI.java b/luni/src/main/java/org/apache/xml/serializer/utils/URI.java
index b77518b..b77518b 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/URI.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/URI.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/Utils.java b/luni/src/main/java/org/apache/xml/serializer/utils/Utils.java
index 8990143..8990143 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/Utils.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/Utils.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/WrappedRuntimeException.java b/luni/src/main/java/org/apache/xml/serializer/utils/WrappedRuntimeException.java
index e26eb3f..e26eb3f 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/WrappedRuntimeException.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/WrappedRuntimeException.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/XML11Char.java b/luni/src/main/java/org/apache/xml/serializer/utils/XML11Char.java
index 2cbd522..2cbd522 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/XML11Char.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/XML11Char.java
diff --git a/xml/src/main/java/org/apache/xml/serializer/utils/XMLChar.java b/luni/src/main/java/org/apache/xml/serializer/utils/XMLChar.java
index 313dd10..313dd10 100644
--- a/xml/src/main/java/org/apache/xml/serializer/utils/XMLChar.java
+++ b/luni/src/main/java/org/apache/xml/serializer/utils/XMLChar.java
diff --git a/xml/src/main/java/org/apache/xml/utils/AttList.java b/luni/src/main/java/org/apache/xml/utils/AttList.java
index 7d40f0d..7d40f0d 100644
--- a/xml/src/main/java/org/apache/xml/utils/AttList.java
+++ b/luni/src/main/java/org/apache/xml/utils/AttList.java
diff --git a/xml/src/main/java/org/apache/xml/utils/BoolStack.java b/luni/src/main/java/org/apache/xml/utils/BoolStack.java
index aadb10d..aadb10d 100644
--- a/xml/src/main/java/org/apache/xml/utils/BoolStack.java
+++ b/luni/src/main/java/org/apache/xml/utils/BoolStack.java
diff --git a/xml/src/main/java/org/apache/xml/utils/Constants.java b/luni/src/main/java/org/apache/xml/utils/Constants.java
index 435f9ab..435f9ab 100644
--- a/xml/src/main/java/org/apache/xml/utils/Constants.java
+++ b/luni/src/main/java/org/apache/xml/utils/Constants.java
diff --git a/xml/src/main/java/org/apache/xml/utils/DOM2Helper.java b/luni/src/main/java/org/apache/xml/utils/DOM2Helper.java
index 98198e6..98198e6 100644
--- a/xml/src/main/java/org/apache/xml/utils/DOM2Helper.java
+++ b/luni/src/main/java/org/apache/xml/utils/DOM2Helper.java
diff --git a/xml/src/main/java/org/apache/xml/utils/DOMBuilder.java b/luni/src/main/java/org/apache/xml/utils/DOMBuilder.java
index 3475ca1..3475ca1 100644
--- a/xml/src/main/java/org/apache/xml/utils/DOMBuilder.java
+++ b/luni/src/main/java/org/apache/xml/utils/DOMBuilder.java
diff --git a/xml/src/main/java/org/apache/xml/utils/DOMHelper.java b/luni/src/main/java/org/apache/xml/utils/DOMHelper.java
index 53d0adc..53d0adc 100644
--- a/xml/src/main/java/org/apache/xml/utils/DOMHelper.java
+++ b/luni/src/main/java/org/apache/xml/utils/DOMHelper.java
diff --git a/xml/src/main/java/org/apache/xml/utils/DOMOrder.java b/luni/src/main/java/org/apache/xml/utils/DOMOrder.java
index 338fced..338fced 100644
--- a/xml/src/main/java/org/apache/xml/utils/DOMOrder.java
+++ b/luni/src/main/java/org/apache/xml/utils/DOMOrder.java
diff --git a/xml/src/main/java/org/apache/xml/utils/DefaultErrorHandler.java b/luni/src/main/java/org/apache/xml/utils/DefaultErrorHandler.java
index bcd3860..bcd3860 100644
--- a/xml/src/main/java/org/apache/xml/utils/DefaultErrorHandler.java
+++ b/luni/src/main/java/org/apache/xml/utils/DefaultErrorHandler.java
diff --git a/xml/src/main/java/org/apache/xml/utils/FastStringBuffer.java b/luni/src/main/java/org/apache/xml/utils/FastStringBuffer.java
index e79d4fe..e79d4fe 100644
--- a/xml/src/main/java/org/apache/xml/utils/FastStringBuffer.java
+++ b/luni/src/main/java/org/apache/xml/utils/FastStringBuffer.java
diff --git a/xml/src/main/java/org/apache/xml/utils/IntStack.java b/luni/src/main/java/org/apache/xml/utils/IntStack.java
index 0212cef..0212cef 100644
--- a/xml/src/main/java/org/apache/xml/utils/IntStack.java
+++ b/luni/src/main/java/org/apache/xml/utils/IntStack.java
diff --git a/xml/src/main/java/org/apache/xml/utils/IntVector.java b/luni/src/main/java/org/apache/xml/utils/IntVector.java
index f815e4f..f815e4f 100644
--- a/xml/src/main/java/org/apache/xml/utils/IntVector.java
+++ b/luni/src/main/java/org/apache/xml/utils/IntVector.java
diff --git a/xml/src/main/java/org/apache/xml/utils/NSInfo.java b/luni/src/main/java/org/apache/xml/utils/NSInfo.java
index 70f4be2..70f4be2 100644
--- a/xml/src/main/java/org/apache/xml/utils/NSInfo.java
+++ b/luni/src/main/java/org/apache/xml/utils/NSInfo.java
diff --git a/xml/src/main/java/org/apache/xml/utils/NameSpace.java b/luni/src/main/java/org/apache/xml/utils/NameSpace.java
index 0387df1..0387df1 100644
--- a/xml/src/main/java/org/apache/xml/utils/NameSpace.java
+++ b/luni/src/main/java/org/apache/xml/utils/NameSpace.java
diff --git a/xml/src/main/java/org/apache/xml/utils/NamespaceSupport2.java b/luni/src/main/java/org/apache/xml/utils/NamespaceSupport2.java
index de7eb16..de7eb16 100644
--- a/xml/src/main/java/org/apache/xml/utils/NamespaceSupport2.java
+++ b/luni/src/main/java/org/apache/xml/utils/NamespaceSupport2.java
diff --git a/xml/src/main/java/org/apache/xml/utils/NodeConsumer.java b/luni/src/main/java/org/apache/xml/utils/NodeConsumer.java
index 17e5c1c..17e5c1c 100644
--- a/xml/src/main/java/org/apache/xml/utils/NodeConsumer.java
+++ b/luni/src/main/java/org/apache/xml/utils/NodeConsumer.java
diff --git a/xml/src/main/java/org/apache/xml/utils/NodeVector.java b/luni/src/main/java/org/apache/xml/utils/NodeVector.java
index c33d5c9..c33d5c9 100644
--- a/xml/src/main/java/org/apache/xml/utils/NodeVector.java
+++ b/luni/src/main/java/org/apache/xml/utils/NodeVector.java
diff --git a/xml/src/main/java/org/apache/xml/utils/ObjectFactory.java b/luni/src/main/java/org/apache/xml/utils/ObjectFactory.java
index cd41234..cd41234 100644
--- a/xml/src/main/java/org/apache/xml/utils/ObjectFactory.java
+++ b/luni/src/main/java/org/apache/xml/utils/ObjectFactory.java
diff --git a/xml/src/main/java/org/apache/xml/utils/ObjectPool.java b/luni/src/main/java/org/apache/xml/utils/ObjectPool.java
index 43d71ab..43d71ab 100644
--- a/xml/src/main/java/org/apache/xml/utils/ObjectPool.java
+++ b/luni/src/main/java/org/apache/xml/utils/ObjectPool.java
diff --git a/xml/src/main/java/org/apache/xml/utils/ObjectStack.java b/luni/src/main/java/org/apache/xml/utils/ObjectStack.java
index 7b406f6..7b406f6 100644
--- a/xml/src/main/java/org/apache/xml/utils/ObjectStack.java
+++ b/luni/src/main/java/org/apache/xml/utils/ObjectStack.java
diff --git a/xml/src/main/java/org/apache/xml/utils/ObjectVector.java b/luni/src/main/java/org/apache/xml/utils/ObjectVector.java
index 9b6cbb2..9b6cbb2 100644
--- a/xml/src/main/java/org/apache/xml/utils/ObjectVector.java
+++ b/luni/src/main/java/org/apache/xml/utils/ObjectVector.java
diff --git a/xml/src/main/java/org/apache/xml/utils/PrefixResolver.java b/luni/src/main/java/org/apache/xml/utils/PrefixResolver.java
index bdeb08a..bdeb08a 100644
--- a/xml/src/main/java/org/apache/xml/utils/PrefixResolver.java
+++ b/luni/src/main/java/org/apache/xml/utils/PrefixResolver.java
diff --git a/xml/src/main/java/org/apache/xml/utils/PrefixResolverDefault.java b/luni/src/main/java/org/apache/xml/utils/PrefixResolverDefault.java
index 38ced11..38ced11 100644
--- a/xml/src/main/java/org/apache/xml/utils/PrefixResolverDefault.java
+++ b/luni/src/main/java/org/apache/xml/utils/PrefixResolverDefault.java
diff --git a/xml/src/main/java/org/apache/xml/utils/QName.java b/luni/src/main/java/org/apache/xml/utils/QName.java
index 09fd90d..09fd90d 100644
--- a/xml/src/main/java/org/apache/xml/utils/QName.java
+++ b/luni/src/main/java/org/apache/xml/utils/QName.java
diff --git a/xml/src/main/java/org/apache/xml/utils/SAXSourceLocator.java b/luni/src/main/java/org/apache/xml/utils/SAXSourceLocator.java
index 39fe2a7..39fe2a7 100644
--- a/xml/src/main/java/org/apache/xml/utils/SAXSourceLocator.java
+++ b/luni/src/main/java/org/apache/xml/utils/SAXSourceLocator.java
diff --git a/xml/src/main/java/org/apache/xml/utils/SecuritySupport.java b/luni/src/main/java/org/apache/xml/utils/SecuritySupport.java
index c847fab..c847fab 100644
--- a/xml/src/main/java/org/apache/xml/utils/SecuritySupport.java
+++ b/luni/src/main/java/org/apache/xml/utils/SecuritySupport.java
diff --git a/xml/src/main/java/org/apache/xml/utils/SecuritySupport12.java b/luni/src/main/java/org/apache/xml/utils/SecuritySupport12.java
index 52954b5..52954b5 100644
--- a/xml/src/main/java/org/apache/xml/utils/SecuritySupport12.java
+++ b/luni/src/main/java/org/apache/xml/utils/SecuritySupport12.java
diff --git a/xml/src/main/java/org/apache/xml/utils/StopParseException.java b/luni/src/main/java/org/apache/xml/utils/StopParseException.java
index 2f809da..2f809da 100644
--- a/xml/src/main/java/org/apache/xml/utils/StopParseException.java
+++ b/luni/src/main/java/org/apache/xml/utils/StopParseException.java
diff --git a/xml/src/main/java/org/apache/xml/utils/StringBufferPool.java b/luni/src/main/java/org/apache/xml/utils/StringBufferPool.java
index d70e6de..d70e6de 100644
--- a/xml/src/main/java/org/apache/xml/utils/StringBufferPool.java
+++ b/luni/src/main/java/org/apache/xml/utils/StringBufferPool.java
diff --git a/xml/src/main/java/org/apache/xml/utils/StringToIntTable.java b/luni/src/main/java/org/apache/xml/utils/StringToIntTable.java
index 9287d86..9287d86 100644
--- a/xml/src/main/java/org/apache/xml/utils/StringToIntTable.java
+++ b/luni/src/main/java/org/apache/xml/utils/StringToIntTable.java
diff --git a/xml/src/main/java/org/apache/xml/utils/StringVector.java b/luni/src/main/java/org/apache/xml/utils/StringVector.java
index 79dee1d..79dee1d 100644
--- a/xml/src/main/java/org/apache/xml/utils/StringVector.java
+++ b/luni/src/main/java/org/apache/xml/utils/StringVector.java
diff --git a/xml/src/main/java/org/apache/xml/utils/StylesheetPIHandler.java b/luni/src/main/java/org/apache/xml/utils/StylesheetPIHandler.java
index 8005d06..8005d06 100644
--- a/xml/src/main/java/org/apache/xml/utils/StylesheetPIHandler.java
+++ b/luni/src/main/java/org/apache/xml/utils/StylesheetPIHandler.java
diff --git a/xml/src/main/java/org/apache/xml/utils/SuballocatedIntVector.java b/luni/src/main/java/org/apache/xml/utils/SuballocatedIntVector.java
index 3104939..3104939 100644
--- a/xml/src/main/java/org/apache/xml/utils/SuballocatedIntVector.java
+++ b/luni/src/main/java/org/apache/xml/utils/SuballocatedIntVector.java
diff --git a/xml/src/main/java/org/apache/xml/utils/SystemIDResolver.java b/luni/src/main/java/org/apache/xml/utils/SystemIDResolver.java
index 7fe63f5..7fe63f5 100644
--- a/xml/src/main/java/org/apache/xml/utils/SystemIDResolver.java
+++ b/luni/src/main/java/org/apache/xml/utils/SystemIDResolver.java
diff --git a/xml/src/main/java/org/apache/xml/utils/ThreadControllerWrapper.java b/luni/src/main/java/org/apache/xml/utils/ThreadControllerWrapper.java
index 4a314ea..4a314ea 100644
--- a/xml/src/main/java/org/apache/xml/utils/ThreadControllerWrapper.java
+++ b/luni/src/main/java/org/apache/xml/utils/ThreadControllerWrapper.java
diff --git a/xml/src/main/java/org/apache/xml/utils/TreeWalker.java b/luni/src/main/java/org/apache/xml/utils/TreeWalker.java
index 2ebfe63..2ebfe63 100644
--- a/xml/src/main/java/org/apache/xml/utils/TreeWalker.java
+++ b/luni/src/main/java/org/apache/xml/utils/TreeWalker.java
diff --git a/xml/src/main/java/org/apache/xml/utils/URI.java b/luni/src/main/java/org/apache/xml/utils/URI.java
index 4bee2d1..4bee2d1 100644
--- a/xml/src/main/java/org/apache/xml/utils/URI.java
+++ b/luni/src/main/java/org/apache/xml/utils/URI.java
diff --git a/xml/src/main/java/org/apache/xml/utils/UnImplNode.java b/luni/src/main/java/org/apache/xml/utils/UnImplNode.java
index 88ed983..88ed983 100644
--- a/xml/src/main/java/org/apache/xml/utils/UnImplNode.java
+++ b/luni/src/main/java/org/apache/xml/utils/UnImplNode.java
diff --git a/xml/src/main/java/org/apache/xml/utils/WrappedRuntimeException.java b/luni/src/main/java/org/apache/xml/utils/WrappedRuntimeException.java
index ded920c..ded920c 100644
--- a/xml/src/main/java/org/apache/xml/utils/WrappedRuntimeException.java
+++ b/luni/src/main/java/org/apache/xml/utils/WrappedRuntimeException.java
diff --git a/xml/src/main/java/org/apache/xml/utils/XML11Char.java b/luni/src/main/java/org/apache/xml/utils/XML11Char.java
index 950d485..950d485 100644
--- a/xml/src/main/java/org/apache/xml/utils/XML11Char.java
+++ b/luni/src/main/java/org/apache/xml/utils/XML11Char.java
diff --git a/xml/src/main/java/org/apache/xml/utils/XMLChar.java b/luni/src/main/java/org/apache/xml/utils/XMLChar.java
index 779a4c0..779a4c0 100644
--- a/xml/src/main/java/org/apache/xml/utils/XMLChar.java
+++ b/luni/src/main/java/org/apache/xml/utils/XMLChar.java
diff --git a/xml/src/main/java/org/apache/xml/utils/XMLCharacterRecognizer.java b/luni/src/main/java/org/apache/xml/utils/XMLCharacterRecognizer.java
index 9d879cb..9d879cb 100644
--- a/xml/src/main/java/org/apache/xml/utils/XMLCharacterRecognizer.java
+++ b/luni/src/main/java/org/apache/xml/utils/XMLCharacterRecognizer.java
diff --git a/xml/src/main/java/org/apache/xml/utils/XMLReaderManager.java b/luni/src/main/java/org/apache/xml/utils/XMLReaderManager.java
index 8cc2d33..8cc2d33 100644
--- a/xml/src/main/java/org/apache/xml/utils/XMLReaderManager.java
+++ b/luni/src/main/java/org/apache/xml/utils/XMLReaderManager.java
diff --git a/xml/src/main/java/org/apache/xml/utils/XMLString.java b/luni/src/main/java/org/apache/xml/utils/XMLString.java
index c968d80..c968d80 100644
--- a/xml/src/main/java/org/apache/xml/utils/XMLString.java
+++ b/luni/src/main/java/org/apache/xml/utils/XMLString.java
diff --git a/xml/src/main/java/org/apache/xml/utils/XMLStringDefault.java b/luni/src/main/java/org/apache/xml/utils/XMLStringDefault.java
index 746d25a..746d25a 100644
--- a/xml/src/main/java/org/apache/xml/utils/XMLStringDefault.java
+++ b/luni/src/main/java/org/apache/xml/utils/XMLStringDefault.java
diff --git a/xml/src/main/java/org/apache/xml/utils/XMLStringFactory.java b/luni/src/main/java/org/apache/xml/utils/XMLStringFactory.java
index 3656fa6..3656fa6 100644
--- a/xml/src/main/java/org/apache/xml/utils/XMLStringFactory.java
+++ b/luni/src/main/java/org/apache/xml/utils/XMLStringFactory.java
diff --git a/xml/src/main/java/org/apache/xml/utils/package.html b/luni/src/main/java/org/apache/xml/utils/package.html
index c943bbc..c943bbc 100644
--- a/xml/src/main/java/org/apache/xml/utils/package.html
+++ b/luni/src/main/java/org/apache/xml/utils/package.html
diff --git a/xml/src/main/java/org/apache/xml/utils/res/CharArrayWrapper.java b/luni/src/main/java/org/apache/xml/utils/res/CharArrayWrapper.java
index 62aa7ba..62aa7ba 100755
--- a/xml/src/main/java/org/apache/xml/utils/res/CharArrayWrapper.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/CharArrayWrapper.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/IntArrayWrapper.java b/luni/src/main/java/org/apache/xml/utils/res/IntArrayWrapper.java
index b9794a7..b9794a7 100755
--- a/xml/src/main/java/org/apache/xml/utils/res/IntArrayWrapper.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/IntArrayWrapper.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/LongArrayWrapper.java b/luni/src/main/java/org/apache/xml/utils/res/LongArrayWrapper.java
index a98bbb2..a98bbb2 100755
--- a/xml/src/main/java/org/apache/xml/utils/res/LongArrayWrapper.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/LongArrayWrapper.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/StringArrayWrapper.java b/luni/src/main/java/org/apache/xml/utils/res/StringArrayWrapper.java
index e669e8e..e669e8e 100755
--- a/xml/src/main/java/org/apache/xml/utils/res/StringArrayWrapper.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/StringArrayWrapper.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResourceBundle.java b/luni/src/main/java/org/apache/xml/utils/res/XResourceBundle.java
index 72e829c..72e829c 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResourceBundle.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResourceBundle.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResourceBundleBase.java b/luni/src/main/java/org/apache/xml/utils/res/XResourceBundleBase.java
index fd49302..fd49302 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResourceBundleBase.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResourceBundleBase.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_cy.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_cy.java
index 2c8b42f..2c8b42f 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_cy.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_cy.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_de.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_de.java
index 9a13c37..9a13c37 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_de.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_de.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_el.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_el.java
index d4bc82b..d4bc82b 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_el.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_el.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_en.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_en.java
index 7116607..7116607 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_en.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_en.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_es.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_es.java
index 18ecebc..18ecebc 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_es.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_es.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_fr.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_fr.java
index 55b6c88..55b6c88 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_fr.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_fr.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_he.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_he.java
index 1089eb7..1089eb7 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_he.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_he.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_hy.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_hy.java
index e23154d..e23154d 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_hy.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_hy.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_it.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_it.java
index 8808e37..8808e37 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_it.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_it.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_A.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_A.java
index 3f41216..3f41216 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_A.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_A.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HA.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HA.java
index 7934665..7934665 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HA.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HA.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HI.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HI.java
index 306fcb2..306fcb2 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HI.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_HI.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_I.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_I.java
index b2b6558..b2b6558 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_I.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_ja_JP_I.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_ka.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_ka.java
index 53dd551..53dd551 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_ka.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_ka.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_ko.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_ko.java
index c6a622b..c6a622b 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_ko.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_ko.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_sv.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_sv.java
index a50766d..a50766d 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_sv.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_sv.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_zh_CN.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_zh_CN.java
index 03fdd79..03fdd79 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_zh_CN.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_zh_CN.java
diff --git a/xml/src/main/java/org/apache/xml/utils/res/XResources_zh_TW.java b/luni/src/main/java/org/apache/xml/utils/res/XResources_zh_TW.java
index db531a0..db531a0 100644
--- a/xml/src/main/java/org/apache/xml/utils/res/XResources_zh_TW.java
+++ b/luni/src/main/java/org/apache/xml/utils/res/XResources_zh_TW.java
diff --git a/xml/src/main/java/org/apache/xpath/Arg.java b/luni/src/main/java/org/apache/xpath/Arg.java
index 5582038..5582038 100644
--- a/xml/src/main/java/org/apache/xpath/Arg.java
+++ b/luni/src/main/java/org/apache/xpath/Arg.java
diff --git a/xml/src/main/java/org/apache/xpath/CachedXPathAPI.java b/luni/src/main/java/org/apache/xpath/CachedXPathAPI.java
index 7ecfdfd..7ecfdfd 100644
--- a/xml/src/main/java/org/apache/xpath/CachedXPathAPI.java
+++ b/luni/src/main/java/org/apache/xpath/CachedXPathAPI.java
diff --git a/xml/src/main/java/org/apache/xpath/Expression.java b/luni/src/main/java/org/apache/xpath/Expression.java
index 2b38290..2b38290 100644
--- a/xml/src/main/java/org/apache/xpath/Expression.java
+++ b/luni/src/main/java/org/apache/xpath/Expression.java
diff --git a/xml/src/main/java/org/apache/xpath/ExpressionNode.java b/luni/src/main/java/org/apache/xpath/ExpressionNode.java
index d415867..d415867 100644
--- a/xml/src/main/java/org/apache/xpath/ExpressionNode.java
+++ b/luni/src/main/java/org/apache/xpath/ExpressionNode.java
diff --git a/xml/src/main/java/org/apache/xpath/ExpressionOwner.java b/luni/src/main/java/org/apache/xpath/ExpressionOwner.java
index 54c1b13..54c1b13 100644
--- a/xml/src/main/java/org/apache/xpath/ExpressionOwner.java
+++ b/luni/src/main/java/org/apache/xpath/ExpressionOwner.java
diff --git a/xml/src/main/java/org/apache/xpath/ExtensionsProvider.java b/luni/src/main/java/org/apache/xpath/ExtensionsProvider.java
index c49d14e..c49d14e 100644
--- a/xml/src/main/java/org/apache/xpath/ExtensionsProvider.java
+++ b/luni/src/main/java/org/apache/xpath/ExtensionsProvider.java
diff --git a/xml/src/main/java/org/apache/xpath/FoundIndex.java b/luni/src/main/java/org/apache/xpath/FoundIndex.java
index 67ec811..67ec811 100644
--- a/xml/src/main/java/org/apache/xpath/FoundIndex.java
+++ b/luni/src/main/java/org/apache/xpath/FoundIndex.java
diff --git a/xml/src/main/java/org/apache/xpath/NodeSet.java b/luni/src/main/java/org/apache/xpath/NodeSet.java
index d1c7f80..d1c7f80 100644
--- a/xml/src/main/java/org/apache/xpath/NodeSet.java
+++ b/luni/src/main/java/org/apache/xpath/NodeSet.java
diff --git a/xml/src/main/java/org/apache/xpath/NodeSetDTM.java b/luni/src/main/java/org/apache/xpath/NodeSetDTM.java
index f92d505..f92d505 100644
--- a/xml/src/main/java/org/apache/xpath/NodeSetDTM.java
+++ b/luni/src/main/java/org/apache/xpath/NodeSetDTM.java
diff --git a/xml/src/main/java/org/apache/xpath/SourceTree.java b/luni/src/main/java/org/apache/xpath/SourceTree.java
index 6492810..6492810 100644
--- a/xml/src/main/java/org/apache/xpath/SourceTree.java
+++ b/luni/src/main/java/org/apache/xpath/SourceTree.java
diff --git a/xml/src/main/java/org/apache/xpath/SourceTreeManager.java b/luni/src/main/java/org/apache/xpath/SourceTreeManager.java
index 0ba44cf..0ba44cf 100644
--- a/xml/src/main/java/org/apache/xpath/SourceTreeManager.java
+++ b/luni/src/main/java/org/apache/xpath/SourceTreeManager.java
diff --git a/xml/src/main/java/org/apache/xpath/VariableStack.java b/luni/src/main/java/org/apache/xpath/VariableStack.java
index e72c265..e72c265 100644
--- a/xml/src/main/java/org/apache/xpath/VariableStack.java
+++ b/luni/src/main/java/org/apache/xpath/VariableStack.java
diff --git a/xml/src/main/java/org/apache/xpath/WhitespaceStrippingElementMatcher.java b/luni/src/main/java/org/apache/xpath/WhitespaceStrippingElementMatcher.java
index 2315b0c..2315b0c 100644
--- a/xml/src/main/java/org/apache/xpath/WhitespaceStrippingElementMatcher.java
+++ b/luni/src/main/java/org/apache/xpath/WhitespaceStrippingElementMatcher.java
diff --git a/xml/src/main/java/org/apache/xpath/XPath.java b/luni/src/main/java/org/apache/xpath/XPath.java
index 56c2b73..56c2b73 100644
--- a/xml/src/main/java/org/apache/xpath/XPath.java
+++ b/luni/src/main/java/org/apache/xpath/XPath.java
diff --git a/xml/src/main/java/org/apache/xpath/XPathAPI.java b/luni/src/main/java/org/apache/xpath/XPathAPI.java
index 01d1741..01d1741 100644
--- a/xml/src/main/java/org/apache/xpath/XPathAPI.java
+++ b/luni/src/main/java/org/apache/xpath/XPathAPI.java
diff --git a/xml/src/main/java/org/apache/xpath/XPathContext.java b/luni/src/main/java/org/apache/xpath/XPathContext.java
index 5da437e..5da437e 100644
--- a/xml/src/main/java/org/apache/xpath/XPathContext.java
+++ b/luni/src/main/java/org/apache/xpath/XPathContext.java
diff --git a/xml/src/main/java/org/apache/xpath/XPathException.java b/luni/src/main/java/org/apache/xpath/XPathException.java
index 315a5d6..315a5d6 100644
--- a/xml/src/main/java/org/apache/xpath/XPathException.java
+++ b/luni/src/main/java/org/apache/xpath/XPathException.java
diff --git a/xml/src/main/java/org/apache/xpath/XPathFactory.java b/luni/src/main/java/org/apache/xpath/XPathFactory.java
index df7df4a..df7df4a 100644
--- a/xml/src/main/java/org/apache/xpath/XPathFactory.java
+++ b/luni/src/main/java/org/apache/xpath/XPathFactory.java
diff --git a/xml/src/main/java/org/apache/xpath/XPathProcessorException.java b/luni/src/main/java/org/apache/xpath/XPathProcessorException.java
index e3dcfea..e3dcfea 100644
--- a/xml/src/main/java/org/apache/xpath/XPathProcessorException.java
+++ b/luni/src/main/java/org/apache/xpath/XPathProcessorException.java
diff --git a/xml/src/main/java/org/apache/xpath/XPathVisitable.java b/luni/src/main/java/org/apache/xpath/XPathVisitable.java
index 271d4c2..271d4c2 100644
--- a/xml/src/main/java/org/apache/xpath/XPathVisitable.java
+++ b/luni/src/main/java/org/apache/xpath/XPathVisitable.java
diff --git a/xml/src/main/java/org/apache/xpath/XPathVisitor.java b/luni/src/main/java/org/apache/xpath/XPathVisitor.java
index b5375b4..b5375b4 100644
--- a/xml/src/main/java/org/apache/xpath/XPathVisitor.java
+++ b/luni/src/main/java/org/apache/xpath/XPathVisitor.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/AttributeIterator.java b/luni/src/main/java/org/apache/xpath/axes/AttributeIterator.java
index b3cc1cc..b3cc1cc 100644
--- a/xml/src/main/java/org/apache/xpath/axes/AttributeIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/AttributeIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/AxesWalker.java b/luni/src/main/java/org/apache/xpath/axes/AxesWalker.java
index 524d004..524d004 100644
--- a/xml/src/main/java/org/apache/xpath/axes/AxesWalker.java
+++ b/luni/src/main/java/org/apache/xpath/axes/AxesWalker.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/BasicTestIterator.java b/luni/src/main/java/org/apache/xpath/axes/BasicTestIterator.java
index 75a8135..75a8135 100644
--- a/xml/src/main/java/org/apache/xpath/axes/BasicTestIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/BasicTestIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/ChildIterator.java b/luni/src/main/java/org/apache/xpath/axes/ChildIterator.java
index 4ce7733..4ce7733 100644
--- a/xml/src/main/java/org/apache/xpath/axes/ChildIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/ChildIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/ChildTestIterator.java b/luni/src/main/java/org/apache/xpath/axes/ChildTestIterator.java
index ee33a4e..ee33a4e 100644
--- a/xml/src/main/java/org/apache/xpath/axes/ChildTestIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/ChildTestIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/ContextNodeList.java b/luni/src/main/java/org/apache/xpath/axes/ContextNodeList.java
index f5e24ce..f5e24ce 100644
--- a/xml/src/main/java/org/apache/xpath/axes/ContextNodeList.java
+++ b/luni/src/main/java/org/apache/xpath/axes/ContextNodeList.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/DescendantIterator.java b/luni/src/main/java/org/apache/xpath/axes/DescendantIterator.java
index 5706125..5706125 100644
--- a/xml/src/main/java/org/apache/xpath/axes/DescendantIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/DescendantIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/FilterExprIterator.java b/luni/src/main/java/org/apache/xpath/axes/FilterExprIterator.java
index 60776d1..60776d1 100644
--- a/xml/src/main/java/org/apache/xpath/axes/FilterExprIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/FilterExprIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java b/luni/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
index 9f11944..9f11944 100644
--- a/xml/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
+++ b/luni/src/main/java/org/apache/xpath/axes/FilterExprIteratorSimple.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/FilterExprWalker.java b/luni/src/main/java/org/apache/xpath/axes/FilterExprWalker.java
index cc7e7db..cc7e7db 100644
--- a/xml/src/main/java/org/apache/xpath/axes/FilterExprWalker.java
+++ b/luni/src/main/java/org/apache/xpath/axes/FilterExprWalker.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/HasPositionalPredChecker.java b/luni/src/main/java/org/apache/xpath/axes/HasPositionalPredChecker.java
index 3fc6424..3fc6424 100644
--- a/xml/src/main/java/org/apache/xpath/axes/HasPositionalPredChecker.java
+++ b/luni/src/main/java/org/apache/xpath/axes/HasPositionalPredChecker.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/IteratorPool.java b/luni/src/main/java/org/apache/xpath/axes/IteratorPool.java
index ef97c44..ef97c44 100644
--- a/xml/src/main/java/org/apache/xpath/axes/IteratorPool.java
+++ b/luni/src/main/java/org/apache/xpath/axes/IteratorPool.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/LocPathIterator.java b/luni/src/main/java/org/apache/xpath/axes/LocPathIterator.java
index 214eba1..214eba1 100644
--- a/xml/src/main/java/org/apache/xpath/axes/LocPathIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/LocPathIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/MatchPatternIterator.java b/luni/src/main/java/org/apache/xpath/axes/MatchPatternIterator.java
index 2647d82..2647d82 100644
--- a/xml/src/main/java/org/apache/xpath/axes/MatchPatternIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/MatchPatternIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/NodeSequence.java b/luni/src/main/java/org/apache/xpath/axes/NodeSequence.java
index 9b3e398..9b3e398 100644
--- a/xml/src/main/java/org/apache/xpath/axes/NodeSequence.java
+++ b/luni/src/main/java/org/apache/xpath/axes/NodeSequence.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/OneStepIterator.java b/luni/src/main/java/org/apache/xpath/axes/OneStepIterator.java
index 43ae094..43ae094 100644
--- a/xml/src/main/java/org/apache/xpath/axes/OneStepIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/OneStepIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/OneStepIteratorForward.java b/luni/src/main/java/org/apache/xpath/axes/OneStepIteratorForward.java
index 854da45..854da45 100644
--- a/xml/src/main/java/org/apache/xpath/axes/OneStepIteratorForward.java
+++ b/luni/src/main/java/org/apache/xpath/axes/OneStepIteratorForward.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/PathComponent.java b/luni/src/main/java/org/apache/xpath/axes/PathComponent.java
index c7a2b85..c7a2b85 100644
--- a/xml/src/main/java/org/apache/xpath/axes/PathComponent.java
+++ b/luni/src/main/java/org/apache/xpath/axes/PathComponent.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/PredicatedNodeTest.java b/luni/src/main/java/org/apache/xpath/axes/PredicatedNodeTest.java
index f72ea3a..f72ea3a 100644
--- a/xml/src/main/java/org/apache/xpath/axes/PredicatedNodeTest.java
+++ b/luni/src/main/java/org/apache/xpath/axes/PredicatedNodeTest.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/RTFIterator.java b/luni/src/main/java/org/apache/xpath/axes/RTFIterator.java
index cb018b4..cb018b4 100644
--- a/xml/src/main/java/org/apache/xpath/axes/RTFIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/RTFIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/ReverseAxesWalker.java b/luni/src/main/java/org/apache/xpath/axes/ReverseAxesWalker.java
index 4efd804..4efd804 100644
--- a/xml/src/main/java/org/apache/xpath/axes/ReverseAxesWalker.java
+++ b/luni/src/main/java/org/apache/xpath/axes/ReverseAxesWalker.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/SelfIteratorNoPredicate.java b/luni/src/main/java/org/apache/xpath/axes/SelfIteratorNoPredicate.java
index b63f8d6..b63f8d6 100644
--- a/xml/src/main/java/org/apache/xpath/axes/SelfIteratorNoPredicate.java
+++ b/luni/src/main/java/org/apache/xpath/axes/SelfIteratorNoPredicate.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/SubContextList.java b/luni/src/main/java/org/apache/xpath/axes/SubContextList.java
index e422586..e422586 100644
--- a/xml/src/main/java/org/apache/xpath/axes/SubContextList.java
+++ b/luni/src/main/java/org/apache/xpath/axes/SubContextList.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/UnionChildIterator.java b/luni/src/main/java/org/apache/xpath/axes/UnionChildIterator.java
index 19cd4ec..19cd4ec 100644
--- a/xml/src/main/java/org/apache/xpath/axes/UnionChildIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/UnionChildIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/UnionPathIterator.java b/luni/src/main/java/org/apache/xpath/axes/UnionPathIterator.java
index 6d714bb..6d714bb 100644
--- a/xml/src/main/java/org/apache/xpath/axes/UnionPathIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/UnionPathIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/WalkerFactory.java b/luni/src/main/java/org/apache/xpath/axes/WalkerFactory.java
index 363fab1..363fab1 100644
--- a/xml/src/main/java/org/apache/xpath/axes/WalkerFactory.java
+++ b/luni/src/main/java/org/apache/xpath/axes/WalkerFactory.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/WalkingIterator.java b/luni/src/main/java/org/apache/xpath/axes/WalkingIterator.java
index e82a125..e82a125 100644
--- a/xml/src/main/java/org/apache/xpath/axes/WalkingIterator.java
+++ b/luni/src/main/java/org/apache/xpath/axes/WalkingIterator.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/WalkingIteratorSorted.java b/luni/src/main/java/org/apache/xpath/axes/WalkingIteratorSorted.java
index 0878cfe..0878cfe 100644
--- a/xml/src/main/java/org/apache/xpath/axes/WalkingIteratorSorted.java
+++ b/luni/src/main/java/org/apache/xpath/axes/WalkingIteratorSorted.java
diff --git a/xml/src/main/java/org/apache/xpath/axes/package.html b/luni/src/main/java/org/apache/xpath/axes/package.html
index 4fc1234..4fc1234 100644
--- a/xml/src/main/java/org/apache/xpath/axes/package.html
+++ b/luni/src/main/java/org/apache/xpath/axes/package.html
diff --git a/xml/src/main/java/org/apache/xpath/compiler/Compiler.java b/luni/src/main/java/org/apache/xpath/compiler/Compiler.java
index 70b1ea1..70b1ea1 100644
--- a/xml/src/main/java/org/apache/xpath/compiler/Compiler.java
+++ b/luni/src/main/java/org/apache/xpath/compiler/Compiler.java
diff --git a/xml/src/main/java/org/apache/xpath/compiler/FunctionTable.java b/luni/src/main/java/org/apache/xpath/compiler/FunctionTable.java
index 1ffb564..1ffb564 100644
--- a/xml/src/main/java/org/apache/xpath/compiler/FunctionTable.java
+++ b/luni/src/main/java/org/apache/xpath/compiler/FunctionTable.java
diff --git a/xml/src/main/java/org/apache/xpath/compiler/Keywords.java b/luni/src/main/java/org/apache/xpath/compiler/Keywords.java
index b624a87..b624a87 100644
--- a/xml/src/main/java/org/apache/xpath/compiler/Keywords.java
+++ b/luni/src/main/java/org/apache/xpath/compiler/Keywords.java
diff --git a/xml/src/main/java/org/apache/xpath/compiler/Lexer.java b/luni/src/main/java/org/apache/xpath/compiler/Lexer.java
index 008ac43..008ac43 100644
--- a/xml/src/main/java/org/apache/xpath/compiler/Lexer.java
+++ b/luni/src/main/java/org/apache/xpath/compiler/Lexer.java
diff --git a/xml/src/main/java/org/apache/xpath/compiler/OpCodes.java b/luni/src/main/java/org/apache/xpath/compiler/OpCodes.java
index 04bb958..04bb958 100644
--- a/xml/src/main/java/org/apache/xpath/compiler/OpCodes.java
+++ b/luni/src/main/java/org/apache/xpath/compiler/OpCodes.java
diff --git a/xml/src/main/java/org/apache/xpath/compiler/OpMap.java b/luni/src/main/java/org/apache/xpath/compiler/OpMap.java
index 349721f..349721f 100644
--- a/xml/src/main/java/org/apache/xpath/compiler/OpMap.java
+++ b/luni/src/main/java/org/apache/xpath/compiler/OpMap.java
diff --git a/xml/src/main/java/org/apache/xpath/compiler/OpMapVector.java b/luni/src/main/java/org/apache/xpath/compiler/OpMapVector.java
index a2c53d2..a2c53d2 100644
--- a/xml/src/main/java/org/apache/xpath/compiler/OpMapVector.java
+++ b/luni/src/main/java/org/apache/xpath/compiler/OpMapVector.java
diff --git a/xml/src/main/java/org/apache/xpath/compiler/PsuedoNames.java b/luni/src/main/java/org/apache/xpath/compiler/PsuedoNames.java
index d585c81..d585c81 100644
--- a/xml/src/main/java/org/apache/xpath/compiler/PsuedoNames.java
+++ b/luni/src/main/java/org/apache/xpath/compiler/PsuedoNames.java
diff --git a/xml/src/main/java/org/apache/xpath/compiler/XPathDumper.java b/luni/src/main/java/org/apache/xpath/compiler/XPathDumper.java
index c53e0a5..c53e0a5 100644
--- a/xml/src/main/java/org/apache/xpath/compiler/XPathDumper.java
+++ b/luni/src/main/java/org/apache/xpath/compiler/XPathDumper.java
diff --git a/xml/src/main/java/org/apache/xpath/compiler/XPathParser.java b/luni/src/main/java/org/apache/xpath/compiler/XPathParser.java
index 58067e1..58067e1 100644
--- a/xml/src/main/java/org/apache/xpath/compiler/XPathParser.java
+++ b/luni/src/main/java/org/apache/xpath/compiler/XPathParser.java
diff --git a/xml/src/main/java/org/apache/xpath/compiler/package.html b/luni/src/main/java/org/apache/xpath/compiler/package.html
index 6f45248..6f45248 100644
--- a/xml/src/main/java/org/apache/xpath/compiler/package.html
+++ b/luni/src/main/java/org/apache/xpath/compiler/package.html
diff --git a/xml/src/main/java/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java b/luni/src/main/java/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java
index b63eb85..b63eb85 100644
--- a/xml/src/main/java/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java
+++ b/luni/src/main/java/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncBoolean.java b/luni/src/main/java/org/apache/xpath/functions/FuncBoolean.java
index 36eb203..36eb203 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncBoolean.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncBoolean.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncCeiling.java b/luni/src/main/java/org/apache/xpath/functions/FuncCeiling.java
index f496d25..f496d25 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncCeiling.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncCeiling.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncConcat.java b/luni/src/main/java/org/apache/xpath/functions/FuncConcat.java
index 570f585..570f585 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncConcat.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncConcat.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncContains.java b/luni/src/main/java/org/apache/xpath/functions/FuncContains.java
index 0c6849f..0c6849f 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncContains.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncContains.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncCount.java b/luni/src/main/java/org/apache/xpath/functions/FuncCount.java
index 71e7ba8..71e7ba8 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncCount.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncCount.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncCurrent.java b/luni/src/main/java/org/apache/xpath/functions/FuncCurrent.java
index 764cc0d..764cc0d 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncCurrent.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncCurrent.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncDoclocation.java b/luni/src/main/java/org/apache/xpath/functions/FuncDoclocation.java
index 50d0b15..50d0b15 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncDoclocation.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncDoclocation.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncExtElementAvailable.java b/luni/src/main/java/org/apache/xpath/functions/FuncExtElementAvailable.java
index 5feea0d..5feea0d 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncExtElementAvailable.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncExtElementAvailable.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncExtFunction.java b/luni/src/main/java/org/apache/xpath/functions/FuncExtFunction.java
index 9293ccc..9293ccc 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncExtFunction.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncExtFunction.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncExtFunctionAvailable.java b/luni/src/main/java/org/apache/xpath/functions/FuncExtFunctionAvailable.java
index 8e4e5d7..8e4e5d7 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncExtFunctionAvailable.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncExtFunctionAvailable.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncFalse.java b/luni/src/main/java/org/apache/xpath/functions/FuncFalse.java
index 5bb671b..5bb671b 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncFalse.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncFalse.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncFloor.java b/luni/src/main/java/org/apache/xpath/functions/FuncFloor.java
index 3dda98d..3dda98d 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncFloor.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncFloor.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncGenerateId.java b/luni/src/main/java/org/apache/xpath/functions/FuncGenerateId.java
index a79dcca..a79dcca 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncGenerateId.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncGenerateId.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncId.java b/luni/src/main/java/org/apache/xpath/functions/FuncId.java
index b06d66f..b06d66f 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncId.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncId.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncLang.java b/luni/src/main/java/org/apache/xpath/functions/FuncLang.java
index 61b8d25..61b8d25 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncLang.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncLang.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncLast.java b/luni/src/main/java/org/apache/xpath/functions/FuncLast.java
index 93f1afd..93f1afd 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncLast.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncLast.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncLocalPart.java b/luni/src/main/java/org/apache/xpath/functions/FuncLocalPart.java
index f73a1d8..f73a1d8 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncLocalPart.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncLocalPart.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncNamespace.java b/luni/src/main/java/org/apache/xpath/functions/FuncNamespace.java
index 6c040e6..6c040e6 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncNamespace.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncNamespace.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncNormalizeSpace.java b/luni/src/main/java/org/apache/xpath/functions/FuncNormalizeSpace.java
index 5c00d20..5c00d20 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncNormalizeSpace.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncNormalizeSpace.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncNot.java b/luni/src/main/java/org/apache/xpath/functions/FuncNot.java
index b69a450..b69a450 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncNot.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncNot.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncNumber.java b/luni/src/main/java/org/apache/xpath/functions/FuncNumber.java
index 401447c..401447c 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncNumber.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncNumber.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncPosition.java b/luni/src/main/java/org/apache/xpath/functions/FuncPosition.java
index c6b9a05..c6b9a05 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncPosition.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncPosition.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncQname.java b/luni/src/main/java/org/apache/xpath/functions/FuncQname.java
index db51cab..db51cab 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncQname.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncQname.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncRound.java b/luni/src/main/java/org/apache/xpath/functions/FuncRound.java
index 78943c5..78943c5 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncRound.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncRound.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncStartsWith.java b/luni/src/main/java/org/apache/xpath/functions/FuncStartsWith.java
index 5a090a2..5a090a2 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncStartsWith.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncStartsWith.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncString.java b/luni/src/main/java/org/apache/xpath/functions/FuncString.java
index 4107b22..4107b22 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncString.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncString.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncStringLength.java b/luni/src/main/java/org/apache/xpath/functions/FuncStringLength.java
index bc8bce6..bc8bce6 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncStringLength.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncStringLength.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncSubstring.java b/luni/src/main/java/org/apache/xpath/functions/FuncSubstring.java
index b2254e2..b2254e2 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncSubstring.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncSubstring.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncSubstringAfter.java b/luni/src/main/java/org/apache/xpath/functions/FuncSubstringAfter.java
index 9685977..9685977 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncSubstringAfter.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncSubstringAfter.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncSubstringBefore.java b/luni/src/main/java/org/apache/xpath/functions/FuncSubstringBefore.java
index 4dcd2f1..4dcd2f1 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncSubstringBefore.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncSubstringBefore.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncSum.java b/luni/src/main/java/org/apache/xpath/functions/FuncSum.java
index 1abbe65..1abbe65 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncSum.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncSum.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncSystemProperty.java b/luni/src/main/java/org/apache/xpath/functions/FuncSystemProperty.java
index 154e686..154e686 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncSystemProperty.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncSystemProperty.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncTranslate.java b/luni/src/main/java/org/apache/xpath/functions/FuncTranslate.java
index 4eb1fc8..4eb1fc8 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncTranslate.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncTranslate.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncTrue.java b/luni/src/main/java/org/apache/xpath/functions/FuncTrue.java
index b8c7479..b8c7479 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncTrue.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncTrue.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FuncUnparsedEntityURI.java b/luni/src/main/java/org/apache/xpath/functions/FuncUnparsedEntityURI.java
index 4517e0d..4517e0d 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FuncUnparsedEntityURI.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FuncUnparsedEntityURI.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/Function.java b/luni/src/main/java/org/apache/xpath/functions/Function.java
index 6e923a4..6e923a4 100644
--- a/xml/src/main/java/org/apache/xpath/functions/Function.java
+++ b/luni/src/main/java/org/apache/xpath/functions/Function.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/Function2Args.java b/luni/src/main/java/org/apache/xpath/functions/Function2Args.java
index 7c36c4a..7c36c4a 100644
--- a/xml/src/main/java/org/apache/xpath/functions/Function2Args.java
+++ b/luni/src/main/java/org/apache/xpath/functions/Function2Args.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/Function3Args.java b/luni/src/main/java/org/apache/xpath/functions/Function3Args.java
index bb49216..bb49216 100644
--- a/xml/src/main/java/org/apache/xpath/functions/Function3Args.java
+++ b/luni/src/main/java/org/apache/xpath/functions/Function3Args.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FunctionDef1Arg.java b/luni/src/main/java/org/apache/xpath/functions/FunctionDef1Arg.java
index 40e36cf..40e36cf 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FunctionDef1Arg.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FunctionDef1Arg.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FunctionMultiArgs.java b/luni/src/main/java/org/apache/xpath/functions/FunctionMultiArgs.java
index 559e66f..559e66f 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FunctionMultiArgs.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FunctionMultiArgs.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/FunctionOneArg.java b/luni/src/main/java/org/apache/xpath/functions/FunctionOneArg.java
index 40ea4ff..40ea4ff 100644
--- a/xml/src/main/java/org/apache/xpath/functions/FunctionOneArg.java
+++ b/luni/src/main/java/org/apache/xpath/functions/FunctionOneArg.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/ObjectFactory.java b/luni/src/main/java/org/apache/xpath/functions/ObjectFactory.java
index 96ac601..96ac601 100755
--- a/xml/src/main/java/org/apache/xpath/functions/ObjectFactory.java
+++ b/luni/src/main/java/org/apache/xpath/functions/ObjectFactory.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/SecuritySupport.java b/luni/src/main/java/org/apache/xpath/functions/SecuritySupport.java
index 556a159..556a159 100644
--- a/xml/src/main/java/org/apache/xpath/functions/SecuritySupport.java
+++ b/luni/src/main/java/org/apache/xpath/functions/SecuritySupport.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/SecuritySupport12.java b/luni/src/main/java/org/apache/xpath/functions/SecuritySupport12.java
index e7edf5a..e7edf5a 100644
--- a/xml/src/main/java/org/apache/xpath/functions/SecuritySupport12.java
+++ b/luni/src/main/java/org/apache/xpath/functions/SecuritySupport12.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/WrongNumberArgsException.java b/luni/src/main/java/org/apache/xpath/functions/WrongNumberArgsException.java
index 6f11938..6f11938 100644
--- a/xml/src/main/java/org/apache/xpath/functions/WrongNumberArgsException.java
+++ b/luni/src/main/java/org/apache/xpath/functions/WrongNumberArgsException.java
diff --git a/xml/src/main/java/org/apache/xpath/functions/package.html b/luni/src/main/java/org/apache/xpath/functions/package.html
index 362770a..362770a 100644
--- a/xml/src/main/java/org/apache/xpath/functions/package.html
+++ b/luni/src/main/java/org/apache/xpath/functions/package.html
diff --git a/xml/src/main/java/org/apache/xpath/jaxp/JAXPExtensionsProvider.java b/luni/src/main/java/org/apache/xpath/jaxp/JAXPExtensionsProvider.java
index fced9c7..fced9c7 100644
--- a/xml/src/main/java/org/apache/xpath/jaxp/JAXPExtensionsProvider.java
+++ b/luni/src/main/java/org/apache/xpath/jaxp/JAXPExtensionsProvider.java
diff --git a/xml/src/main/java/org/apache/xpath/jaxp/JAXPPrefixResolver.java b/luni/src/main/java/org/apache/xpath/jaxp/JAXPPrefixResolver.java
index 9208dc1..9208dc1 100644
--- a/xml/src/main/java/org/apache/xpath/jaxp/JAXPPrefixResolver.java
+++ b/luni/src/main/java/org/apache/xpath/jaxp/JAXPPrefixResolver.java
diff --git a/xml/src/main/java/org/apache/xpath/jaxp/JAXPVariableStack.java b/luni/src/main/java/org/apache/xpath/jaxp/JAXPVariableStack.java
index ec076ea..ec076ea 100644
--- a/xml/src/main/java/org/apache/xpath/jaxp/JAXPVariableStack.java
+++ b/luni/src/main/java/org/apache/xpath/jaxp/JAXPVariableStack.java
diff --git a/xml/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java b/luni/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java
index ba6c1b4..ba6c1b4 100644
--- a/xml/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java
+++ b/luni/src/main/java/org/apache/xpath/jaxp/XPathExpressionImpl.java
diff --git a/xml/src/main/java/org/apache/xpath/jaxp/XPathFactoryImpl.java b/luni/src/main/java/org/apache/xpath/jaxp/XPathFactoryImpl.java
index 669673e..669673e 100644
--- a/xml/src/main/java/org/apache/xpath/jaxp/XPathFactoryImpl.java
+++ b/luni/src/main/java/org/apache/xpath/jaxp/XPathFactoryImpl.java
diff --git a/xml/src/main/java/org/apache/xpath/jaxp/XPathImpl.java b/luni/src/main/java/org/apache/xpath/jaxp/XPathImpl.java
index 9889e48..9889e48 100644
--- a/xml/src/main/java/org/apache/xpath/jaxp/XPathImpl.java
+++ b/luni/src/main/java/org/apache/xpath/jaxp/XPathImpl.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/DTMXRTreeFrag.java b/luni/src/main/java/org/apache/xpath/objects/DTMXRTreeFrag.java
index 2c75eb4..2c75eb4 100755
--- a/xml/src/main/java/org/apache/xpath/objects/DTMXRTreeFrag.java
+++ b/luni/src/main/java/org/apache/xpath/objects/DTMXRTreeFrag.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XBoolean.java b/luni/src/main/java/org/apache/xpath/objects/XBoolean.java
index 9bf3049..9bf3049 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XBoolean.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XBoolean.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XBooleanStatic.java b/luni/src/main/java/org/apache/xpath/objects/XBooleanStatic.java
index 0e9d7b2..0e9d7b2 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XBooleanStatic.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XBooleanStatic.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XMLStringFactoryImpl.java b/luni/src/main/java/org/apache/xpath/objects/XMLStringFactoryImpl.java
index db42db0..db42db0 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XMLStringFactoryImpl.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XMLStringFactoryImpl.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XNodeSet.java b/luni/src/main/java/org/apache/xpath/objects/XNodeSet.java
index 2b38506..2b38506 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XNodeSet.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XNodeSet.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XNodeSetForDOM.java b/luni/src/main/java/org/apache/xpath/objects/XNodeSetForDOM.java
index 7075d3e..7075d3e 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XNodeSetForDOM.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XNodeSetForDOM.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XNull.java b/luni/src/main/java/org/apache/xpath/objects/XNull.java
index 1a5fa82..1a5fa82 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XNull.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XNull.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XNumber.java b/luni/src/main/java/org/apache/xpath/objects/XNumber.java
index b56fec4..b56fec4 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XNumber.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XNumber.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XObject.java b/luni/src/main/java/org/apache/xpath/objects/XObject.java
index 85b2369..85b2369 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XObject.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XObject.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XObjectFactory.java b/luni/src/main/java/org/apache/xpath/objects/XObjectFactory.java
index 2a5176e..2a5176e 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XObjectFactory.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XObjectFactory.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XRTreeFrag.java b/luni/src/main/java/org/apache/xpath/objects/XRTreeFrag.java
index 048f8ab..048f8ab 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XRTreeFrag.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XRTreeFrag.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XRTreeFragSelectWrapper.java b/luni/src/main/java/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
index 5449e71..5449e71 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XString.java b/luni/src/main/java/org/apache/xpath/objects/XString.java
index 963b832..963b832 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XString.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XString.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XStringForChars.java b/luni/src/main/java/org/apache/xpath/objects/XStringForChars.java
index fe18d23..fe18d23 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XStringForChars.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XStringForChars.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/XStringForFSB.java b/luni/src/main/java/org/apache/xpath/objects/XStringForFSB.java
index 083bfbc..083bfbc 100644
--- a/xml/src/main/java/org/apache/xpath/objects/XStringForFSB.java
+++ b/luni/src/main/java/org/apache/xpath/objects/XStringForFSB.java
diff --git a/xml/src/main/java/org/apache/xpath/objects/package.html b/luni/src/main/java/org/apache/xpath/objects/package.html
index d596ba3..d596ba3 100644
--- a/xml/src/main/java/org/apache/xpath/objects/package.html
+++ b/luni/src/main/java/org/apache/xpath/objects/package.html
diff --git a/xml/src/main/java/org/apache/xpath/operations/And.java b/luni/src/main/java/org/apache/xpath/operations/And.java
index b7f3eab..b7f3eab 100644
--- a/xml/src/main/java/org/apache/xpath/operations/And.java
+++ b/luni/src/main/java/org/apache/xpath/operations/And.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Bool.java b/luni/src/main/java/org/apache/xpath/operations/Bool.java
index 2dd9c6a..2dd9c6a 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Bool.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Bool.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Div.java b/luni/src/main/java/org/apache/xpath/operations/Div.java
index f8b74e1..f8b74e1 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Div.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Div.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Equals.java b/luni/src/main/java/org/apache/xpath/operations/Equals.java
index 8be4186..8be4186 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Equals.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Equals.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Gt.java b/luni/src/main/java/org/apache/xpath/operations/Gt.java
index 3190c83..3190c83 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Gt.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Gt.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Gte.java b/luni/src/main/java/org/apache/xpath/operations/Gte.java
index fd49c4a..fd49c4a 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Gte.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Gte.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Lt.java b/luni/src/main/java/org/apache/xpath/operations/Lt.java
index e023fcb..e023fcb 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Lt.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Lt.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Lte.java b/luni/src/main/java/org/apache/xpath/operations/Lte.java
index cc29b52..cc29b52 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Lte.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Lte.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Minus.java b/luni/src/main/java/org/apache/xpath/operations/Minus.java
index 4659419..4659419 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Minus.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Minus.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Mod.java b/luni/src/main/java/org/apache/xpath/operations/Mod.java
index 61e3308..61e3308 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Mod.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Mod.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Mult.java b/luni/src/main/java/org/apache/xpath/operations/Mult.java
index 2948497..2948497 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Mult.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Mult.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Neg.java b/luni/src/main/java/org/apache/xpath/operations/Neg.java
index e61c045..e61c045 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Neg.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Neg.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/NotEquals.java b/luni/src/main/java/org/apache/xpath/operations/NotEquals.java
index 7ba51a2..7ba51a2 100644
--- a/xml/src/main/java/org/apache/xpath/operations/NotEquals.java
+++ b/luni/src/main/java/org/apache/xpath/operations/NotEquals.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Number.java b/luni/src/main/java/org/apache/xpath/operations/Number.java
index dc5cad0..dc5cad0 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Number.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Number.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Operation.java b/luni/src/main/java/org/apache/xpath/operations/Operation.java
index f601ae6..f601ae6 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Operation.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Operation.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Or.java b/luni/src/main/java/org/apache/xpath/operations/Or.java
index 769d5f9..769d5f9 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Or.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Or.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Plus.java b/luni/src/main/java/org/apache/xpath/operations/Plus.java
index 81980da..81980da 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Plus.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Plus.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Quo.java b/luni/src/main/java/org/apache/xpath/operations/Quo.java
index fe076943..fe076943 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Quo.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Quo.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/String.java b/luni/src/main/java/org/apache/xpath/operations/String.java
index c32678c..c32678c 100644
--- a/xml/src/main/java/org/apache/xpath/operations/String.java
+++ b/luni/src/main/java/org/apache/xpath/operations/String.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/UnaryOperation.java b/luni/src/main/java/org/apache/xpath/operations/UnaryOperation.java
index 394ce88..394ce88 100644
--- a/xml/src/main/java/org/apache/xpath/operations/UnaryOperation.java
+++ b/luni/src/main/java/org/apache/xpath/operations/UnaryOperation.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/Variable.java b/luni/src/main/java/org/apache/xpath/operations/Variable.java
index ab8358d..ab8358d 100644
--- a/xml/src/main/java/org/apache/xpath/operations/Variable.java
+++ b/luni/src/main/java/org/apache/xpath/operations/Variable.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/VariableSafeAbsRef.java b/luni/src/main/java/org/apache/xpath/operations/VariableSafeAbsRef.java
index 63e4324..63e4324 100644
--- a/xml/src/main/java/org/apache/xpath/operations/VariableSafeAbsRef.java
+++ b/luni/src/main/java/org/apache/xpath/operations/VariableSafeAbsRef.java
diff --git a/xml/src/main/java/org/apache/xpath/operations/package.html b/luni/src/main/java/org/apache/xpath/operations/package.html
index e91d869..e91d869 100644
--- a/xml/src/main/java/org/apache/xpath/operations/package.html
+++ b/luni/src/main/java/org/apache/xpath/operations/package.html
diff --git a/xml/src/main/java/org/apache/xpath/package.html b/luni/src/main/java/org/apache/xpath/package.html
index 2536a57..2536a57 100644
--- a/xml/src/main/java/org/apache/xpath/package.html
+++ b/luni/src/main/java/org/apache/xpath/package.html
diff --git a/xml/src/main/java/org/apache/xpath/patterns/ContextMatchStepPattern.java b/luni/src/main/java/org/apache/xpath/patterns/ContextMatchStepPattern.java
index 54ecfae..54ecfae 100644
--- a/xml/src/main/java/org/apache/xpath/patterns/ContextMatchStepPattern.java
+++ b/luni/src/main/java/org/apache/xpath/patterns/ContextMatchStepPattern.java
diff --git a/xml/src/main/java/org/apache/xpath/patterns/FunctionPattern.java b/luni/src/main/java/org/apache/xpath/patterns/FunctionPattern.java
index 3a45c05..3a45c05 100644
--- a/xml/src/main/java/org/apache/xpath/patterns/FunctionPattern.java
+++ b/luni/src/main/java/org/apache/xpath/patterns/FunctionPattern.java
diff --git a/xml/src/main/java/org/apache/xpath/patterns/NodeTest.java b/luni/src/main/java/org/apache/xpath/patterns/NodeTest.java
index 9829146..9829146 100644
--- a/xml/src/main/java/org/apache/xpath/patterns/NodeTest.java
+++ b/luni/src/main/java/org/apache/xpath/patterns/NodeTest.java
diff --git a/xml/src/main/java/org/apache/xpath/patterns/NodeTestFilter.java b/luni/src/main/java/org/apache/xpath/patterns/NodeTestFilter.java
index 82bbc8b..82bbc8b 100644
--- a/xml/src/main/java/org/apache/xpath/patterns/NodeTestFilter.java
+++ b/luni/src/main/java/org/apache/xpath/patterns/NodeTestFilter.java
diff --git a/xml/src/main/java/org/apache/xpath/patterns/StepPattern.java b/luni/src/main/java/org/apache/xpath/patterns/StepPattern.java
index 463b671..463b671 100644
--- a/xml/src/main/java/org/apache/xpath/patterns/StepPattern.java
+++ b/luni/src/main/java/org/apache/xpath/patterns/StepPattern.java
diff --git a/xml/src/main/java/org/apache/xpath/patterns/UnionPattern.java b/luni/src/main/java/org/apache/xpath/patterns/UnionPattern.java
index a06d095..a06d095 100644
--- a/xml/src/main/java/org/apache/xpath/patterns/UnionPattern.java
+++ b/luni/src/main/java/org/apache/xpath/patterns/UnionPattern.java
diff --git a/xml/src/main/java/org/apache/xpath/patterns/package.html b/luni/src/main/java/org/apache/xpath/patterns/package.html
index 12db9e4..12db9e4 100644
--- a/xml/src/main/java/org/apache/xpath/patterns/package.html
+++ b/luni/src/main/java/org/apache/xpath/patterns/package.html
diff --git a/xml/src/main/java/org/apache/xpath/res/XPATHErrorResources.java b/luni/src/main/java/org/apache/xpath/res/XPATHErrorResources.java
index 6c6120f..6c6120f 100644
--- a/xml/src/main/java/org/apache/xpath/res/XPATHErrorResources.java
+++ b/luni/src/main/java/org/apache/xpath/res/XPATHErrorResources.java
diff --git a/xml/src/main/java/org/apache/xpath/res/XPATHMessages.java b/luni/src/main/java/org/apache/xpath/res/XPATHMessages.java
index 7fb6135..7fb6135 100644
--- a/xml/src/main/java/org/apache/xpath/res/XPATHMessages.java
+++ b/luni/src/main/java/org/apache/xpath/res/XPATHMessages.java
diff --git a/xml/src/main/java/org/apache/xpath/res/package.html b/luni/src/main/java/org/apache/xpath/res/package.html
index ad04feb..ad04feb 100644
--- a/xml/src/main/java/org/apache/xpath/res/package.html
+++ b/luni/src/main/java/org/apache/xpath/res/package.html
diff --git a/xml/src/main/java/org/w3c/dom/Attr.java b/luni/src/main/java/org/w3c/dom/Attr.java
index bd7267b..bd7267b 100644
--- a/xml/src/main/java/org/w3c/dom/Attr.java
+++ b/luni/src/main/java/org/w3c/dom/Attr.java
diff --git a/xml/src/main/java/org/w3c/dom/CDATASection.java b/luni/src/main/java/org/w3c/dom/CDATASection.java
index 9267227..9267227 100644
--- a/xml/src/main/java/org/w3c/dom/CDATASection.java
+++ b/luni/src/main/java/org/w3c/dom/CDATASection.java
diff --git a/xml/src/main/java/org/w3c/dom/CharacterData.java b/luni/src/main/java/org/w3c/dom/CharacterData.java
index a12dced..a12dced 100644
--- a/xml/src/main/java/org/w3c/dom/CharacterData.java
+++ b/luni/src/main/java/org/w3c/dom/CharacterData.java
diff --git a/xml/src/main/java/org/w3c/dom/Comment.java b/luni/src/main/java/org/w3c/dom/Comment.java
index b04ed4d..b04ed4d 100644
--- a/xml/src/main/java/org/w3c/dom/Comment.java
+++ b/luni/src/main/java/org/w3c/dom/Comment.java
diff --git a/xml/src/main/java/org/w3c/dom/DOMConfiguration.java b/luni/src/main/java/org/w3c/dom/DOMConfiguration.java
index 7cce160..7cce160 100644
--- a/xml/src/main/java/org/w3c/dom/DOMConfiguration.java
+++ b/luni/src/main/java/org/w3c/dom/DOMConfiguration.java
diff --git a/xml/src/main/java/org/w3c/dom/DOMError.java b/luni/src/main/java/org/w3c/dom/DOMError.java
index 37ed7d1..37ed7d1 100644
--- a/xml/src/main/java/org/w3c/dom/DOMError.java
+++ b/luni/src/main/java/org/w3c/dom/DOMError.java
diff --git a/xml/src/main/java/org/w3c/dom/DOMErrorHandler.java b/luni/src/main/java/org/w3c/dom/DOMErrorHandler.java
index 3d4ad2a..3d4ad2a 100644
--- a/xml/src/main/java/org/w3c/dom/DOMErrorHandler.java
+++ b/luni/src/main/java/org/w3c/dom/DOMErrorHandler.java
diff --git a/xml/src/main/java/org/w3c/dom/DOMException.java b/luni/src/main/java/org/w3c/dom/DOMException.java
index 0b2578f..0b2578f 100644
--- a/xml/src/main/java/org/w3c/dom/DOMException.java
+++ b/luni/src/main/java/org/w3c/dom/DOMException.java
diff --git a/xml/src/main/java/org/w3c/dom/DOMImplementation.java b/luni/src/main/java/org/w3c/dom/DOMImplementation.java
index 5bb71e2..5bb71e2 100644
--- a/xml/src/main/java/org/w3c/dom/DOMImplementation.java
+++ b/luni/src/main/java/org/w3c/dom/DOMImplementation.java
diff --git a/xml/src/main/java/org/w3c/dom/DOMImplementationList.java b/luni/src/main/java/org/w3c/dom/DOMImplementationList.java
index 18349fd..18349fd 100644
--- a/xml/src/main/java/org/w3c/dom/DOMImplementationList.java
+++ b/luni/src/main/java/org/w3c/dom/DOMImplementationList.java
diff --git a/xml/src/main/java/org/w3c/dom/DOMImplementationSource.java b/luni/src/main/java/org/w3c/dom/DOMImplementationSource.java
index 3c32c18..3c32c18 100644
--- a/xml/src/main/java/org/w3c/dom/DOMImplementationSource.java
+++ b/luni/src/main/java/org/w3c/dom/DOMImplementationSource.java
diff --git a/xml/src/main/java/org/w3c/dom/DOMLocator.java b/luni/src/main/java/org/w3c/dom/DOMLocator.java
index fcaaa23..fcaaa23 100644
--- a/xml/src/main/java/org/w3c/dom/DOMLocator.java
+++ b/luni/src/main/java/org/w3c/dom/DOMLocator.java
diff --git a/xml/src/main/java/org/w3c/dom/DOMStringList.java b/luni/src/main/java/org/w3c/dom/DOMStringList.java
index e6c348a..e6c348a 100644
--- a/xml/src/main/java/org/w3c/dom/DOMStringList.java
+++ b/luni/src/main/java/org/w3c/dom/DOMStringList.java
diff --git a/xml/src/main/java/org/w3c/dom/Document.java b/luni/src/main/java/org/w3c/dom/Document.java
index 43ebd4e..43ebd4e 100644
--- a/xml/src/main/java/org/w3c/dom/Document.java
+++ b/luni/src/main/java/org/w3c/dom/Document.java
diff --git a/xml/src/main/java/org/w3c/dom/DocumentFragment.java b/luni/src/main/java/org/w3c/dom/DocumentFragment.java
index 8c4531e..8c4531e 100644
--- a/xml/src/main/java/org/w3c/dom/DocumentFragment.java
+++ b/luni/src/main/java/org/w3c/dom/DocumentFragment.java
diff --git a/xml/src/main/java/org/w3c/dom/DocumentType.java b/luni/src/main/java/org/w3c/dom/DocumentType.java
index 6221c7b..6221c7b 100644
--- a/xml/src/main/java/org/w3c/dom/DocumentType.java
+++ b/luni/src/main/java/org/w3c/dom/DocumentType.java
diff --git a/xml/src/main/java/org/w3c/dom/Element.java b/luni/src/main/java/org/w3c/dom/Element.java
index 6a7f7e3..6a7f7e3 100644
--- a/xml/src/main/java/org/w3c/dom/Element.java
+++ b/luni/src/main/java/org/w3c/dom/Element.java
diff --git a/xml/src/main/java/org/w3c/dom/Entity.java b/luni/src/main/java/org/w3c/dom/Entity.java
index f621c33..f621c33 100644
--- a/xml/src/main/java/org/w3c/dom/Entity.java
+++ b/luni/src/main/java/org/w3c/dom/Entity.java
diff --git a/xml/src/main/java/org/w3c/dom/EntityReference.java b/luni/src/main/java/org/w3c/dom/EntityReference.java
index b42b091..b42b091 100644
--- a/xml/src/main/java/org/w3c/dom/EntityReference.java
+++ b/luni/src/main/java/org/w3c/dom/EntityReference.java
diff --git a/xml/src/main/java/org/w3c/dom/NameList.java b/luni/src/main/java/org/w3c/dom/NameList.java
index 10caa90..10caa90 100644
--- a/xml/src/main/java/org/w3c/dom/NameList.java
+++ b/luni/src/main/java/org/w3c/dom/NameList.java
diff --git a/xml/src/main/java/org/w3c/dom/NamedNodeMap.java b/luni/src/main/java/org/w3c/dom/NamedNodeMap.java
index ad1e67b..ad1e67b 100644
--- a/xml/src/main/java/org/w3c/dom/NamedNodeMap.java
+++ b/luni/src/main/java/org/w3c/dom/NamedNodeMap.java
diff --git a/xml/src/main/java/org/w3c/dom/Node.java b/luni/src/main/java/org/w3c/dom/Node.java
index 989d49a..989d49a 100644
--- a/xml/src/main/java/org/w3c/dom/Node.java
+++ b/luni/src/main/java/org/w3c/dom/Node.java
diff --git a/xml/src/main/java/org/w3c/dom/NodeList.java b/luni/src/main/java/org/w3c/dom/NodeList.java
index e4204ec..e4204ec 100644
--- a/xml/src/main/java/org/w3c/dom/NodeList.java
+++ b/luni/src/main/java/org/w3c/dom/NodeList.java
diff --git a/xml/src/main/java/org/w3c/dom/Notation.java b/luni/src/main/java/org/w3c/dom/Notation.java
index 3739f92..3739f92 100644
--- a/xml/src/main/java/org/w3c/dom/Notation.java
+++ b/luni/src/main/java/org/w3c/dom/Notation.java
diff --git a/xml/src/main/java/org/w3c/dom/ProcessingInstruction.java b/luni/src/main/java/org/w3c/dom/ProcessingInstruction.java
index 0b6825f..0b6825f 100644
--- a/xml/src/main/java/org/w3c/dom/ProcessingInstruction.java
+++ b/luni/src/main/java/org/w3c/dom/ProcessingInstruction.java
diff --git a/xml/src/main/java/org/w3c/dom/Text.java b/luni/src/main/java/org/w3c/dom/Text.java
index 9c294a4..9c294a4 100644
--- a/xml/src/main/java/org/w3c/dom/Text.java
+++ b/luni/src/main/java/org/w3c/dom/Text.java
diff --git a/xml/src/main/java/org/w3c/dom/TypeInfo.java b/luni/src/main/java/org/w3c/dom/TypeInfo.java
index 054f990..054f990 100644
--- a/xml/src/main/java/org/w3c/dom/TypeInfo.java
+++ b/luni/src/main/java/org/w3c/dom/TypeInfo.java
diff --git a/xml/src/main/java/org/w3c/dom/UserDataHandler.java b/luni/src/main/java/org/w3c/dom/UserDataHandler.java
index a16ea73..a16ea73 100644
--- a/xml/src/main/java/org/w3c/dom/UserDataHandler.java
+++ b/luni/src/main/java/org/w3c/dom/UserDataHandler.java
diff --git a/xml/src/main/java/org/w3c/dom/ls/DOMImplementationLS.java b/luni/src/main/java/org/w3c/dom/ls/DOMImplementationLS.java
index c94fc8e..c94fc8e 100644
--- a/xml/src/main/java/org/w3c/dom/ls/DOMImplementationLS.java
+++ b/luni/src/main/java/org/w3c/dom/ls/DOMImplementationLS.java
diff --git a/xml/src/main/java/org/w3c/dom/ls/LSException.java b/luni/src/main/java/org/w3c/dom/ls/LSException.java
index 65a83f0..65a83f0 100644
--- a/xml/src/main/java/org/w3c/dom/ls/LSException.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSException.java
diff --git a/xml/src/main/java/org/w3c/dom/ls/LSInput.java b/luni/src/main/java/org/w3c/dom/ls/LSInput.java
index 862bf77..862bf77 100644
--- a/xml/src/main/java/org/w3c/dom/ls/LSInput.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSInput.java
diff --git a/xml/src/main/java/org/w3c/dom/ls/LSOutput.java b/luni/src/main/java/org/w3c/dom/ls/LSOutput.java
index 2f8675c..2f8675c 100644
--- a/xml/src/main/java/org/w3c/dom/ls/LSOutput.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSOutput.java
diff --git a/xml/src/main/java/org/w3c/dom/ls/LSParser.java b/luni/src/main/java/org/w3c/dom/ls/LSParser.java
index ee918e0..ee918e0 100644
--- a/xml/src/main/java/org/w3c/dom/ls/LSParser.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSParser.java
diff --git a/xml/src/main/java/org/w3c/dom/ls/LSParserFilter.java b/luni/src/main/java/org/w3c/dom/ls/LSParserFilter.java
index 4e61294..4e61294 100644
--- a/xml/src/main/java/org/w3c/dom/ls/LSParserFilter.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSParserFilter.java
diff --git a/xml/src/main/java/org/w3c/dom/ls/LSResourceResolver.java b/luni/src/main/java/org/w3c/dom/ls/LSResourceResolver.java
index c0c523c..c0c523c 100644
--- a/xml/src/main/java/org/w3c/dom/ls/LSResourceResolver.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSResourceResolver.java
diff --git a/xml/src/main/java/org/w3c/dom/ls/LSSerializer.java b/luni/src/main/java/org/w3c/dom/ls/LSSerializer.java
index 33b094a..33b094a 100644
--- a/xml/src/main/java/org/w3c/dom/ls/LSSerializer.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSSerializer.java
diff --git a/xml/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java b/luni/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java
index 9e76b37..9e76b37 100644
--- a/xml/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java
+++ b/luni/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java
diff --git a/xml/src/main/java/org/w3c/dom/package.html b/luni/src/main/java/org/w3c/dom/package.html
index 15f8ff6..15f8ff6 100644
--- a/xml/src/main/java/org/w3c/dom/package.html
+++ b/luni/src/main/java/org/w3c/dom/package.html
diff --git a/xml/src/main/java/org/w3c/dom/traversal/NodeFilter.java b/luni/src/main/java/org/w3c/dom/traversal/NodeFilter.java
index 4d179e7..4d179e7 100644
--- a/xml/src/main/java/org/w3c/dom/traversal/NodeFilter.java
+++ b/luni/src/main/java/org/w3c/dom/traversal/NodeFilter.java
diff --git a/xml/src/main/java/org/w3c/dom/traversal/NodeIterator.java b/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java
index e55cd9f..e55cd9f 100644
--- a/xml/src/main/java/org/w3c/dom/traversal/NodeIterator.java
+++ b/luni/src/main/java/org/w3c/dom/traversal/NodeIterator.java
diff --git a/xml/src/main/java/org/xml/sax/AttributeList.java b/luni/src/main/java/org/xml/sax/AttributeList.java
index 9285eac..9285eac 100644
--- a/xml/src/main/java/org/xml/sax/AttributeList.java
+++ b/luni/src/main/java/org/xml/sax/AttributeList.java
diff --git a/xml/src/main/java/org/xml/sax/Attributes.java b/luni/src/main/java/org/xml/sax/Attributes.java
index b25432d..b25432d 100644
--- a/xml/src/main/java/org/xml/sax/Attributes.java
+++ b/luni/src/main/java/org/xml/sax/Attributes.java
diff --git a/xml/src/main/java/org/xml/sax/ContentHandler.java b/luni/src/main/java/org/xml/sax/ContentHandler.java
index db66c0d..db66c0d 100644
--- a/xml/src/main/java/org/xml/sax/ContentHandler.java
+++ b/luni/src/main/java/org/xml/sax/ContentHandler.java
diff --git a/xml/src/main/java/org/xml/sax/DTDHandler.java b/luni/src/main/java/org/xml/sax/DTDHandler.java
index 13d5eee..13d5eee 100644
--- a/xml/src/main/java/org/xml/sax/DTDHandler.java
+++ b/luni/src/main/java/org/xml/sax/DTDHandler.java
diff --git a/xml/src/main/java/org/xml/sax/DocumentHandler.java b/luni/src/main/java/org/xml/sax/DocumentHandler.java
index 500fe4c..500fe4c 100644
--- a/xml/src/main/java/org/xml/sax/DocumentHandler.java
+++ b/luni/src/main/java/org/xml/sax/DocumentHandler.java
diff --git a/xml/src/main/java/org/xml/sax/EntityResolver.java b/luni/src/main/java/org/xml/sax/EntityResolver.java
index 06ac725..06ac725 100644
--- a/xml/src/main/java/org/xml/sax/EntityResolver.java
+++ b/luni/src/main/java/org/xml/sax/EntityResolver.java
diff --git a/xml/src/main/java/org/xml/sax/ErrorHandler.java b/luni/src/main/java/org/xml/sax/ErrorHandler.java
index e4e4206..e4e4206 100644
--- a/xml/src/main/java/org/xml/sax/ErrorHandler.java
+++ b/luni/src/main/java/org/xml/sax/ErrorHandler.java
diff --git a/xml/src/main/java/org/xml/sax/HandlerBase.java b/luni/src/main/java/org/xml/sax/HandlerBase.java
index 15ea2d4..15ea2d4 100644
--- a/xml/src/main/java/org/xml/sax/HandlerBase.java
+++ b/luni/src/main/java/org/xml/sax/HandlerBase.java
diff --git a/xml/src/main/java/org/xml/sax/InputSource.java b/luni/src/main/java/org/xml/sax/InputSource.java
index b1342ee..b1342ee 100644
--- a/xml/src/main/java/org/xml/sax/InputSource.java
+++ b/luni/src/main/java/org/xml/sax/InputSource.java
diff --git a/xml/src/main/java/org/xml/sax/Locator.java b/luni/src/main/java/org/xml/sax/Locator.java
index f8f3484..f8f3484 100644
--- a/xml/src/main/java/org/xml/sax/Locator.java
+++ b/luni/src/main/java/org/xml/sax/Locator.java
diff --git a/xml/src/main/java/org/xml/sax/Parser.java b/luni/src/main/java/org/xml/sax/Parser.java
index 67a5512..67a5512 100644
--- a/xml/src/main/java/org/xml/sax/Parser.java
+++ b/luni/src/main/java/org/xml/sax/Parser.java
diff --git a/xml/src/main/java/org/xml/sax/SAXException.java b/luni/src/main/java/org/xml/sax/SAXException.java
index 2e5b4cd..2e5b4cd 100644
--- a/xml/src/main/java/org/xml/sax/SAXException.java
+++ b/luni/src/main/java/org/xml/sax/SAXException.java
diff --git a/xml/src/main/java/org/xml/sax/SAXNotRecognizedException.java b/luni/src/main/java/org/xml/sax/SAXNotRecognizedException.java
index 69ba807..69ba807 100644
--- a/xml/src/main/java/org/xml/sax/SAXNotRecognizedException.java
+++ b/luni/src/main/java/org/xml/sax/SAXNotRecognizedException.java
diff --git a/xml/src/main/java/org/xml/sax/SAXNotSupportedException.java b/luni/src/main/java/org/xml/sax/SAXNotSupportedException.java
index bd5b239..bd5b239 100644
--- a/xml/src/main/java/org/xml/sax/SAXNotSupportedException.java
+++ b/luni/src/main/java/org/xml/sax/SAXNotSupportedException.java
diff --git a/xml/src/main/java/org/xml/sax/SAXParseException.java b/luni/src/main/java/org/xml/sax/SAXParseException.java
index a6a93e9..a6a93e9 100644
--- a/xml/src/main/java/org/xml/sax/SAXParseException.java
+++ b/luni/src/main/java/org/xml/sax/SAXParseException.java
diff --git a/xml/src/main/java/org/xml/sax/XMLFilter.java b/luni/src/main/java/org/xml/sax/XMLFilter.java
index 5a399fa..5a399fa 100644
--- a/xml/src/main/java/org/xml/sax/XMLFilter.java
+++ b/luni/src/main/java/org/xml/sax/XMLFilter.java
diff --git a/xml/src/main/java/org/xml/sax/XMLReader.java b/luni/src/main/java/org/xml/sax/XMLReader.java
index d58a4bd..d58a4bd 100644
--- a/xml/src/main/java/org/xml/sax/XMLReader.java
+++ b/luni/src/main/java/org/xml/sax/XMLReader.java
diff --git a/xml/src/main/java/org/xml/sax/ext/Attributes2.java b/luni/src/main/java/org/xml/sax/ext/Attributes2.java
index 45cd551..45cd551 100644
--- a/xml/src/main/java/org/xml/sax/ext/Attributes2.java
+++ b/luni/src/main/java/org/xml/sax/ext/Attributes2.java
diff --git a/xml/src/main/java/org/xml/sax/ext/Attributes2Impl.java b/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java
index fc36805..fc36805 100644
--- a/xml/src/main/java/org/xml/sax/ext/Attributes2Impl.java
+++ b/luni/src/main/java/org/xml/sax/ext/Attributes2Impl.java
diff --git a/xml/src/main/java/org/xml/sax/ext/DeclHandler.java b/luni/src/main/java/org/xml/sax/ext/DeclHandler.java
index 26471f3..26471f3 100644
--- a/xml/src/main/java/org/xml/sax/ext/DeclHandler.java
+++ b/luni/src/main/java/org/xml/sax/ext/DeclHandler.java
diff --git a/xml/src/main/java/org/xml/sax/ext/DefaultHandler2.java b/luni/src/main/java/org/xml/sax/ext/DefaultHandler2.java
index f26564f..f26564f 100644
--- a/xml/src/main/java/org/xml/sax/ext/DefaultHandler2.java
+++ b/luni/src/main/java/org/xml/sax/ext/DefaultHandler2.java
diff --git a/xml/src/main/java/org/xml/sax/ext/EntityResolver2.java b/luni/src/main/java/org/xml/sax/ext/EntityResolver2.java
index 5437a9b..5437a9b 100644
--- a/xml/src/main/java/org/xml/sax/ext/EntityResolver2.java
+++ b/luni/src/main/java/org/xml/sax/ext/EntityResolver2.java
diff --git a/xml/src/main/java/org/xml/sax/ext/LexicalHandler.java b/luni/src/main/java/org/xml/sax/ext/LexicalHandler.java
index e551b61..e551b61 100644
--- a/xml/src/main/java/org/xml/sax/ext/LexicalHandler.java
+++ b/luni/src/main/java/org/xml/sax/ext/LexicalHandler.java
diff --git a/xml/src/main/java/org/xml/sax/ext/Locator2.java b/luni/src/main/java/org/xml/sax/ext/Locator2.java
index 6de9a16..6de9a16 100644
--- a/xml/src/main/java/org/xml/sax/ext/Locator2.java
+++ b/luni/src/main/java/org/xml/sax/ext/Locator2.java
diff --git a/xml/src/main/java/org/xml/sax/ext/Locator2Impl.java b/luni/src/main/java/org/xml/sax/ext/Locator2Impl.java
index 91f912a..91f912a 100644
--- a/xml/src/main/java/org/xml/sax/ext/Locator2Impl.java
+++ b/luni/src/main/java/org/xml/sax/ext/Locator2Impl.java
diff --git a/xml/src/main/java/org/xml/sax/ext/package.html b/luni/src/main/java/org/xml/sax/ext/package.html
index e443df4..e443df4 100644
--- a/xml/src/main/java/org/xml/sax/ext/package.html
+++ b/luni/src/main/java/org/xml/sax/ext/package.html
diff --git a/xml/src/main/java/org/xml/sax/helpers/AttributeListImpl.java b/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java
index fb4aee3..fb4aee3 100644
--- a/xml/src/main/java/org/xml/sax/helpers/AttributeListImpl.java
+++ b/luni/src/main/java/org/xml/sax/helpers/AttributeListImpl.java
diff --git a/xml/src/main/java/org/xml/sax/helpers/AttributesImpl.java b/luni/src/main/java/org/xml/sax/helpers/AttributesImpl.java
index b740e23..b740e23 100644
--- a/xml/src/main/java/org/xml/sax/helpers/AttributesImpl.java
+++ b/luni/src/main/java/org/xml/sax/helpers/AttributesImpl.java
diff --git a/xml/src/main/java/org/xml/sax/helpers/DefaultHandler.java b/luni/src/main/java/org/xml/sax/helpers/DefaultHandler.java
index 8308be7..8308be7 100644
--- a/xml/src/main/java/org/xml/sax/helpers/DefaultHandler.java
+++ b/luni/src/main/java/org/xml/sax/helpers/DefaultHandler.java
diff --git a/xml/src/main/java/org/xml/sax/helpers/LocatorImpl.java b/luni/src/main/java/org/xml/sax/helpers/LocatorImpl.java
index 18445bc..18445bc 100644
--- a/xml/src/main/java/org/xml/sax/helpers/LocatorImpl.java
+++ b/luni/src/main/java/org/xml/sax/helpers/LocatorImpl.java
diff --git a/xml/src/main/java/org/xml/sax/helpers/NamespaceSupport.java b/luni/src/main/java/org/xml/sax/helpers/NamespaceSupport.java
index a737d1d..a737d1d 100644
--- a/xml/src/main/java/org/xml/sax/helpers/NamespaceSupport.java
+++ b/luni/src/main/java/org/xml/sax/helpers/NamespaceSupport.java
diff --git a/xml/src/main/java/org/xml/sax/helpers/NewInstance.java b/luni/src/main/java/org/xml/sax/helpers/NewInstance.java
index e590192..e590192 100644
--- a/xml/src/main/java/org/xml/sax/helpers/NewInstance.java
+++ b/luni/src/main/java/org/xml/sax/helpers/NewInstance.java
diff --git a/xml/src/main/java/org/xml/sax/helpers/ParserAdapter.java b/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java
index 7fc3813..7fc3813 100644
--- a/xml/src/main/java/org/xml/sax/helpers/ParserAdapter.java
+++ b/luni/src/main/java/org/xml/sax/helpers/ParserAdapter.java
diff --git a/xml/src/main/java/org/xml/sax/helpers/ParserFactory.java b/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java
index ffe2a60..ffe2a60 100644
--- a/xml/src/main/java/org/xml/sax/helpers/ParserFactory.java
+++ b/luni/src/main/java/org/xml/sax/helpers/ParserFactory.java
diff --git a/xml/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java b/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java
index 68e2579..68e2579 100644
--- a/xml/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java
+++ b/luni/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java
diff --git a/xml/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java b/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java
index cc8f431..cc8f431 100644
--- a/xml/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java
+++ b/luni/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java
diff --git a/xml/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java b/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java
index b761c34..b761c34 100644
--- a/xml/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java
+++ b/luni/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java
diff --git a/xml/src/main/java/org/xml/sax/helpers/package.html b/luni/src/main/java/org/xml/sax/helpers/package.html
index 8f323c0..8f323c0 100644
--- a/xml/src/main/java/org/xml/sax/helpers/package.html
+++ b/luni/src/main/java/org/xml/sax/helpers/package.html
diff --git a/xml/src/main/java/org/xml/sax/package.html b/luni/src/main/java/org/xml/sax/package.html
index 7d7f257..7d7f257 100644
--- a/xml/src/main/java/org/xml/sax/package.html
+++ b/luni/src/main/java/org/xml/sax/package.html
diff --git a/icu/src/main/native/BidiWrapper.cpp b/luni/src/main/native/BidiWrapper.cpp
index 03efa92..03efa92 100644
--- a/icu/src/main/native/BidiWrapper.cpp
+++ b/luni/src/main/native/BidiWrapper.cpp
diff --git a/icu/src/main/native/ErrorCode.cpp b/luni/src/main/native/ErrorCode.cpp
index a9d0691..a9d0691 100644
--- a/icu/src/main/native/ErrorCode.cpp
+++ b/luni/src/main/native/ErrorCode.cpp
diff --git a/icu/src/main/native/ErrorCode.h b/luni/src/main/native/ErrorCode.h
index e42a519..e42a519 100644
--- a/icu/src/main/native/ErrorCode.h
+++ b/luni/src/main/native/ErrorCode.h
diff --git a/icu/src/main/native/ICU.cpp b/luni/src/main/native/ICU.cpp
index 4f08513..4f08513 100644
--- a/icu/src/main/native/ICU.cpp
+++ b/luni/src/main/native/ICU.cpp
diff --git a/icu/src/main/native/NativeBreakIterator.cpp b/luni/src/main/native/NativeBreakIterator.cpp
index 0be7630..0be7630 100644
--- a/icu/src/main/native/NativeBreakIterator.cpp
+++ b/luni/src/main/native/NativeBreakIterator.cpp
diff --git a/icu/src/main/native/NativeCollation.cpp b/luni/src/main/native/NativeCollation.cpp
index 9a092e8..9a092e8 100644
--- a/icu/src/main/native/NativeCollation.cpp
+++ b/luni/src/main/native/NativeCollation.cpp
diff --git a/icu/src/main/native/NativeConverter.cpp b/luni/src/main/native/NativeConverter.cpp
index 8b3952e..8b3952e 100644
--- a/icu/src/main/native/NativeConverter.cpp
+++ b/luni/src/main/native/NativeConverter.cpp
diff --git a/icu/src/main/native/NativeDecimalFormat.cpp b/luni/src/main/native/NativeDecimalFormat.cpp
index 8f39a39..8f39a39 100644
--- a/icu/src/main/native/NativeDecimalFormat.cpp
+++ b/luni/src/main/native/NativeDecimalFormat.cpp
diff --git a/icu/src/main/native/NativeIDN.cpp b/luni/src/main/native/NativeIDN.cpp
index e8052fc..e8052fc 100644
--- a/icu/src/main/native/NativeIDN.cpp
+++ b/luni/src/main/native/NativeIDN.cpp
diff --git a/icu/src/main/native/NativeNormalizer.cpp b/luni/src/main/native/NativeNormalizer.cpp
index 257cf9b..257cf9b 100644
--- a/icu/src/main/native/NativeNormalizer.cpp
+++ b/luni/src/main/native/NativeNormalizer.cpp
diff --git a/icu/src/main/native/NativeRegEx.cpp b/luni/src/main/native/NativeRegEx.cpp
index 511f1e4..511f1e4 100644
--- a/icu/src/main/native/NativeRegEx.cpp
+++ b/luni/src/main/native/NativeRegEx.cpp
diff --git a/luni-kernel/src/main/native/Register.cpp b/luni/src/main/native/Register.cpp
index 8980cc5..8980cc5 100644
--- a/luni-kernel/src/main/native/Register.cpp
+++ b/luni/src/main/native/Register.cpp
diff --git a/icu/src/main/native/ScopedJavaUnicodeString.h b/luni/src/main/native/ScopedJavaUnicodeString.h
index b108a6b..b108a6b 100644
--- a/icu/src/main/native/ScopedJavaUnicodeString.h
+++ b/luni/src/main/native/ScopedJavaUnicodeString.h
diff --git a/icu/src/main/native/UCharacter.cpp b/luni/src/main/native/UCharacter.cpp
index abad16a..abad16a 100644
--- a/icu/src/main/native/UCharacter.cpp
+++ b/luni/src/main/native/UCharacter.cpp
diff --git a/luni-kernel/src/main/native/java_lang_ProcessManager.cpp b/luni/src/main/native/java_lang_ProcessManager.cpp
index 666a8c7..666a8c7 100644
--- a/luni-kernel/src/main/native/java_lang_ProcessManager.cpp
+++ b/luni/src/main/native/java_lang_ProcessManager.cpp
diff --git a/luni-kernel/src/main/native/java_lang_System.cpp b/luni/src/main/native/java_lang_System.cpp
index b114dab..b114dab 100644
--- a/luni-kernel/src/main/native/java_lang_System.cpp
+++ b/luni/src/main/native/java_lang_System.cpp
diff --git a/xml/src/main/native/org_apache_harmony_xml_ExpatParser.cpp b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
index c684708..c684708 100644
--- a/xml/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
+++ b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
diff --git a/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp b/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
index 86eaadf..86eaadf 100644
--- a/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
+++ b/luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
diff --git a/luni/src/main/native/sub.mk b/luni/src/main/native/sub.mk
index 8b2f277..cf71bcf 100644
--- a/luni/src/main/native/sub.mk
+++ b/luni/src/main/native/sub.mk
@@ -12,7 +12,9 @@ LOCAL_SRC_FILES := \
 	java_lang_Double.c \
 	java_lang_Float.c \
 	java_lang_Math.c \
+        java_lang_ProcessManager.cpp \
 	java_lang_StrictMath.c \
+        java_lang_System.cpp \
 	java_net_InetAddress.cpp \
 	java_net_NetworkInterface.cpp \
 	java_util_zip_Adler32.c \
@@ -26,12 +28,30 @@ LOCAL_SRC_FILES := \
 	org_apache_harmony_luni_platform_OSNetworkSystem.cpp \
 	org_apache_harmony_luni_platform_OSFileSystem.cpp \
 	org_apache_harmony_luni_platform_OSMemory.cpp \
+	org_apache_harmony_xml_ExpatParser.cpp \
+	org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp \
 	zip.c \
 	zipalloc.c \
-	sieb.c
+	sieb.c \
+        BidiWrapper.cpp \
+        ErrorCode.cpp \
+        ICU.cpp \
+        NativeBreakIterator.cpp \
+        NativeCollation.cpp \
+        NativeConverter.cpp \
+        NativeDecimalFormat.cpp \
+        NativeIDN.cpp \
+        NativeNormalizer.cpp \
+        NativeRegEx.cpp \
+        Register.cpp \
+        UCharacter.cpp
 
 
 LOCAL_C_INCLUDES += \
+	external/expat/lib \
+        external/icu4c/common \
+        external/icu4c/i18n \
+	external/openssl/include \
 	external/zlib
 
 # Any shared/static libs that are listed here must also
@@ -39,6 +59,13 @@ LOCAL_C_INCLUDES += \
 # TODO: fix this requirement
 
 LOCAL_SHARED_LIBRARIES += \
+	libcrypto \
+	libcutils \
+        libexpat \
+        libicudata \
+        libicuuc \
+        libicui18n \
+        libssl \
 	libutils \
 	libz
 
diff --git a/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ClientSessionContextTest.java b/luni/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ClientSessionContextTest.java
index af4490b..af4490b 100644
--- a/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ClientSessionContextTest.java
+++ b/luni/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ClientSessionContextTest.java
diff --git a/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/FakeSession.java b/luni/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/FakeSession.java
index 4a793dd..4a793dd 100644
--- a/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/FakeSession.java
+++ b/luni/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/FakeSession.java
diff --git a/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/FileClientSessionCacheTest.java b/luni/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/FileClientSessionCacheTest.java
index ee50863..ee50863 100644
--- a/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/FileClientSessionCacheTest.java
+++ b/luni/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/FileClientSessionCacheTest.java
diff --git a/luni-kernel/src/test/java/java/lang/reflect/AllTests.java b/luni/src/test/java/java/lang/reflect/AllTests.java
index 8d99672..8d99672 100644
--- a/luni-kernel/src/test/java/java/lang/reflect/AllTests.java
+++ b/luni/src/test/java/java/lang/reflect/AllTests.java
diff --git a/luni-kernel/src/test/java/java/lang/reflect/ConstructorTest.java b/luni/src/test/java/java/lang/reflect/ConstructorTest.java
index e2672a8..e2672a8 100644
--- a/luni-kernel/src/test/java/java/lang/reflect/ConstructorTest.java
+++ b/luni/src/test/java/java/lang/reflect/ConstructorTest.java
diff --git a/luni-kernel/src/test/java/java/lang/reflect/MethodTest.java b/luni/src/test/java/java/lang/reflect/MethodTest.java
index ed41de9..ed41de9 100644
--- a/luni-kernel/src/test/java/java/lang/reflect/MethodTest.java
+++ b/luni/src/test/java/java/lang/reflect/MethodTest.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
index b45a75a..b45a75a 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java
index d2dd841..d2dd841 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/BackingStoreExceptionTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/BackingStoreExceptionTest.java
index a98c3b4..a98c3b4 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/BackingStoreExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/BackingStoreExceptionTest.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java
index 4535a59..4535a59 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.java
index c7ff946..c7ff946 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java
index b149225..b149225 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockNodeChangeListener.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockNodeChangeListener.java
index 6e042fa..6e042fa 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockNodeChangeListener.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockNodeChangeListener.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferenceChangeListener.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferenceChangeListener.java
index 9d628a2..9d628a2 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferenceChangeListener.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferenceChangeListener.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java
index d6047fb..d6047fb 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeEventTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeEventTest.java
index e24026c..e24026c 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeEventTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeEventTest.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java
index 8e01589..8e01589 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeEventTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeEventTest.java
index 47e621e..47e621e 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeEventTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeEventTest.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java
index 7080aa5..7080aa5 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java
index 729bc05..729bc05 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java
diff --git a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java
index c6e0861..c6e0861 100644
--- a/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java
+++ b/luni/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java
diff --git a/xml/src/test/java/org/apache/harmony/xml/AllTests.java b/luni/src/test/java/org/apache/harmony/xml/AllTests.java
index c04c1b5..c04c1b5 100644
--- a/xml/src/test/java/org/apache/harmony/xml/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/xml/AllTests.java
diff --git a/xml/src/test/java/org/apache/harmony/xml/ExpatParserTest.java b/luni/src/test/java/org/apache/harmony/xml/ExpatParserTest.java
index ff25ade..ff25ade 100644
--- a/xml/src/test/java/org/apache/harmony/xml/ExpatParserTest.java
+++ b/luni/src/test/java/org/apache/harmony/xml/ExpatParserTest.java
diff --git a/xml/src/test/java/org/apache/harmony/xml/JaxenXPathTestSuite.java b/luni/src/test/java/org/apache/harmony/xml/JaxenXPathTestSuite.java
index 17f0341..17f0341 100644
--- a/xml/src/test/java/org/apache/harmony/xml/JaxenXPathTestSuite.java
+++ b/luni/src/test/java/org/apache/harmony/xml/JaxenXPathTestSuite.java
diff --git a/xml/src/test/java/org/apache/harmony/xml/NamespacedAttributesLookupTest.java b/luni/src/test/java/org/apache/harmony/xml/NamespacedAttributesLookupTest.java
index 4f58262..4f58262 100644
--- a/xml/src/test/java/org/apache/harmony/xml/NamespacedAttributesLookupTest.java
+++ b/luni/src/test/java/org/apache/harmony/xml/NamespacedAttributesLookupTest.java
diff --git a/xml/src/test/java/org/apache/harmony/xml/XsltXPathConformanceTestSuite.java b/luni/src/test/java/org/apache/harmony/xml/XsltXPathConformanceTestSuite.java
index 3f0d2cb..3f0d2cb 100644
--- a/xml/src/test/java/org/apache/harmony/xml/XsltXPathConformanceTestSuite.java
+++ b/luni/src/test/java/org/apache/harmony/xml/XsltXPathConformanceTestSuite.java
diff --git a/x-net/src/test/java/tests/api/javax/net/AllTests.java b/luni/src/test/java/tests/api/javax/net/AllTests.java
index 35cd6f5..35cd6f5 100644
--- a/x-net/src/test/java/tests/api/javax/net/AllTests.java
+++ b/luni/src/test/java/tests/api/javax/net/AllTests.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java
index 1876f22..1876f22 100644
--- a/x-net/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/SocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java
index 05fee79..05fee79 100644
--- a/x-net/src/test/java/tests/api/javax/net/SocketFactoryTest.java
+++ b/luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/AllTests.java b/luni/src/test/java/tests/api/javax/net/ssl/AllTests.java
index 5f9c32d..5f9c32d 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/AllTests.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/AllTests.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java b/luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java
index 45c8d73..45c8d73 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/CertificatesToPlayWith.java b/luni/src/test/java/tests/api/javax/net/ssl/CertificatesToPlayWith.java
index 04a17b2..04a17b2 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/CertificatesToPlayWith.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/CertificatesToPlayWith.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java b/luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java
index aebde6b..aebde6b 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/HostnameVerifierTest.java b/luni/src/test/java/tests/api/javax/net/ssl/HostnameVerifierTest.java
index 15eb1cc..15eb1cc 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/HostnameVerifierTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/HostnameVerifierTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java
index 067b2a9..067b2a9 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java
index f2a4d1c..f2a4d1c 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java
index f25b3ab..f25b3ab 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java
index 2319769..2319769 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java
index 613e701..613e701 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java
index 3929003..3929003 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java
index 2ddb1ed..2ddb1ed 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java
index cf3123a..cf3123a 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java
index 22af271..22af271 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java
index 652b384..652b384 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java
index 4878df8..4878df8 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java
index 8205059..8205059 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java
index 301f510..301f510 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java
index 45bf262..45bf262 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java
index 7d3b48a..7d3b48a 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
index 7e4c9be..7e4c9be 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLPermissionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLPermissionTest.java
index 4da9553..4da9553 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLPermissionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLPermissionTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java
index 9b8b22c..9b8b22c 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLServerSocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketFactoryTest.java
index 979d574..979d574 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLServerSocketFactoryTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketFactoryTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
index d12959b..d12959b 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java
index f95c941..f95c941 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java
index 7b26485..7b26485 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java
index 930b6da..930b6da 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLSessionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionTest.java
index 6f3b61d..6f3b61d 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLSessionTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java
index 05308de..05308de 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java
index a17df93..a17df93 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java
index a933288..a933288 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java
index e16a62f..e16a62f 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java
index 6c6d9aa..6c6d9aa 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java
index 5f711b1..5f711b1 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/X509KeyManagerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/X509KeyManagerTest.java
index 715efcd..715efcd 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/X509KeyManagerTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/X509KeyManagerTest.java
diff --git a/x-net/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java
index d5e4001..d5e4001 100644
--- a/x-net/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java
diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/AllTests.java b/luni/src/test/java/tests/api/javax/xml/parsers/AllTests.java
index aecc746..aecc746 100644
--- a/xml/src/test/java/tests/api/javax/xml/parsers/AllTests.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/AllTests.java
diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java
index 7356d3a..7356d3a 100644
--- a/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java
diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java
index 2818460..2818460 100644
--- a/xml/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java
diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java
index 0b5f230..0b5f230 100644
--- a/xml/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java
diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java
index 63b87a7..63b87a7 100644
--- a/xml/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java
diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java
index d5bf289..d5bf289 100644
--- a/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java
diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java
index a80c4e3..a80c4e3 100644
--- a/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java
diff --git a/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserTestSupport.java b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTestSupport.java
index a1627ba..a1627ba 100644
--- a/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserTestSupport.java
+++ b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTestSupport.java
diff --git a/luni-kernel/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/AllTests.java b/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/AllTests.java
index e9cf80e..e9cf80e 100644
--- a/luni-kernel/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/AllTests.java
+++ b/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/AllTests.java
diff --git a/luni-kernel/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java b/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java
index 8ba2445..8ba2445 100644
--- a/luni-kernel/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java
+++ b/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/AllTests.java b/luni/src/test/java/tests/api/org/xml/sax/AllTests.java
index f7643e9..f7643e9 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/AllTests.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/AllTests.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java b/luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java
index 7c7f591..7c7f591 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/InputSourceTest.java b/luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java
index 7c73b52..7c73b52 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/InputSourceTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java
index afc1f8d..afc1f8d 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java
index 1fab7bf..1fab7bf 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java
index 9060a14..9060a14 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java
index aff0c7f..aff0c7f 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/ext/AllTests.java b/luni/src/test/java/tests/api/org/xml/sax/ext/AllTests.java
index 1334780..1334780 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/ext/AllTests.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/ext/AllTests.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java
index 9ccdc8a..9ccdc8a 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java b/luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java
index 52a5972..52a5972 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java
index b018f59..b018f59 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/helpers/AllTests.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/AllTests.java
index 135496c..135496c 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/helpers/AllTests.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/AllTests.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java
index 00658cb..00658cb 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java
index 0efe25f..0efe25f 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java
index 527048f..527048f 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java
index e6b243c..e6b243c 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java
index b163b54..b163b54 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java
index 608d52c..608d52c 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java
index 113a569..113a569 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java
index 6586461..6586461 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java
index 0fe6f52..0fe6f52 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java
index 2edb918..2edb918 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/BrokenInputStream.java b/luni/src/test/java/tests/api/org/xml/sax/support/BrokenInputStream.java
index daa36f9..daa36f9 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/BrokenInputStream.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/BrokenInputStream.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/DoNothingParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/DoNothingParser.java
index 6049cc6..6049cc6 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/DoNothingParser.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/DoNothingParser.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/DoNothingXMLReader.java b/luni/src/test/java/tests/api/org/xml/sax/support/DoNothingXMLReader.java
index 8687bff..8687bff 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/DoNothingXMLReader.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/DoNothingXMLReader.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/MethodLogger.java b/luni/src/test/java/tests/api/org/xml/sax/support/MethodLogger.java
index 198172b..198172b 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/MethodLogger.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/MethodLogger.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/MockFilter.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockFilter.java
index 0b54bf8..0b54bf8 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/MockFilter.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/MockFilter.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/MockHandler.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockHandler.java
index 98b024a..98b024a 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/MockHandler.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/MockHandler.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/MockParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockParser.java
index 01520f8..01520f8 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/MockParser.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/MockParser.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/MockReader.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockReader.java
index 22a6a57..22a6a57 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/MockReader.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/MockReader.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/MockResolver.java b/luni/src/test/java/tests/api/org/xml/sax/support/MockResolver.java
index ae0066e..ae0066e 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/MockResolver.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/MockResolver.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/NoAccessParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoAccessParser.java
index 5aac9af..5aac9af 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/NoAccessParser.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/NoAccessParser.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/NoAccessXMLReader.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoAccessXMLReader.java
index b6a0a68..b6a0a68 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/NoAccessXMLReader.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/NoAccessXMLReader.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/NoInstanceParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceParser.java
index 8f1692f..8f1692f 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/NoInstanceParser.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceParser.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/NoInstanceXMLReader.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceXMLReader.java
index 764c451..764c451 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/NoInstanceXMLReader.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceXMLReader.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/NoSubclassParser.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassParser.java
index f178998..f178998 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/NoSubclassParser.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassParser.java
diff --git a/xml/src/test/java/tests/api/org/xml/sax/support/NoSubclassXMLReader.java b/luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassXMLReader.java
index acdbd88..acdbd88 100644
--- a/xml/src/test/java/tests/api/org/xml/sax/support/NoSubclassXMLReader.java
+++ b/luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassXMLReader.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/AllTests.java b/luni/src/test/java/tests/org/w3c/dom/AllTests.java
index 5dba844..5dba844 100644
--- a/xml/src/test/java/tests/org/w3c/dom/AllTests.java
+++ b/luni/src/test/java/tests/org/w3c/dom/AllTests.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/AttrGetOwnerElement.java b/luni/src/test/java/tests/org/w3c/dom/AttrGetOwnerElement.java
index bb42121..bb42121 100644
--- a/xml/src/test/java/tests/org/w3c/dom/AttrGetOwnerElement.java
+++ b/luni/src/test/java/tests/org/w3c/dom/AttrGetOwnerElement.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/CreateAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/CreateAttributeNS.java
index 3cd0da6..3cd0da6 100644
--- a/xml/src/test/java/tests/org/w3c/dom/CreateAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/CreateAttributeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/CreateDocument.java b/luni/src/test/java/tests/org/w3c/dom/CreateDocument.java
index 8e1b175..8e1b175 100644
--- a/xml/src/test/java/tests/org/w3c/dom/CreateDocument.java
+++ b/luni/src/test/java/tests/org/w3c/dom/CreateDocument.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/CreateDocumentType.java b/luni/src/test/java/tests/org/w3c/dom/CreateDocumentType.java
index c5061b8..c5061b8 100644
--- a/xml/src/test/java/tests/org/w3c/dom/CreateDocumentType.java
+++ b/luni/src/test/java/tests/org/w3c/dom/CreateDocumentType.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/CreateElementNS.java b/luni/src/test/java/tests/org/w3c/dom/CreateElementNS.java
index 6258936..6258936 100644
--- a/xml/src/test/java/tests/org/w3c/dom/CreateElementNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/CreateElementNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DOMDocumentBuilderFactory.java b/luni/src/test/java/tests/org/w3c/dom/DOMDocumentBuilderFactory.java
index d28b2d7..d28b2d7 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DOMDocumentBuilderFactory.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DOMDocumentBuilderFactory.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocument.java b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocument.java
index d2650a4..d2650a4 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocument.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocument.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocumentType.java b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocumentType.java
index 286e75d..286e75d 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocumentType.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocumentType.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DOMImplementationHasFeature.java b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationHasFeature.java
index 257555b..257555b 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DOMImplementationHasFeature.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationHasFeature.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DOMTestCase.java b/luni/src/test/java/tests/org/w3c/dom/DOMTestCase.java
index 041b67b..041b67b 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DOMTestCase.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DOMTestCase.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DocumentBuilderSetting.java b/luni/src/test/java/tests/org/w3c/dom/DocumentBuilderSetting.java
index bbb7190..bbb7190 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DocumentBuilderSetting.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentBuilderSetting.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DocumentBuilderSettingStrategy.java b/luni/src/test/java/tests/org/w3c/dom/DocumentBuilderSettingStrategy.java
index 77bbce8..77bbce8 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DocumentBuilderSettingStrategy.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentBuilderSettingStrategy.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DocumentCreateAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/DocumentCreateAttributeNS.java
index 87c8661..87c8661 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DocumentCreateAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentCreateAttributeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DocumentCreateElementNS.java b/luni/src/test/java/tests/org/w3c/dom/DocumentCreateElementNS.java
index 85f2fff..85f2fff 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DocumentCreateElementNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentCreateElementNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DocumentGetElementsByTagnameNS.java b/luni/src/test/java/tests/org/w3c/dom/DocumentGetElementsByTagnameNS.java
index 390bf11..390bf11 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DocumentGetElementsByTagnameNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentGetElementsByTagnameNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DocumentGeteEementById.java b/luni/src/test/java/tests/org/w3c/dom/DocumentGeteEementById.java
index 7c82ac7..7c82ac7 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DocumentGeteEementById.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentGeteEementById.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DocumentImportNode.java b/luni/src/test/java/tests/org/w3c/dom/DocumentImportNode.java
index 426a0ad..426a0ad 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DocumentImportNode.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentImportNode.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DocumentTypeInternalSubset.java b/luni/src/test/java/tests/org/w3c/dom/DocumentTypeInternalSubset.java
index 9e79788..9e79788 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DocumentTypeInternalSubset.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentTypeInternalSubset.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DocumentTypePublicId.java b/luni/src/test/java/tests/org/w3c/dom/DocumentTypePublicId.java
index 26e9a5f..26e9a5f 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DocumentTypePublicId.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentTypePublicId.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/DocumentTypeSystemId.java b/luni/src/test/java/tests/org/w3c/dom/DocumentTypeSystemId.java
index fcad024..fcad024 100644
--- a/xml/src/test/java/tests/org/w3c/dom/DocumentTypeSystemId.java
+++ b/luni/src/test/java/tests/org/w3c/dom/DocumentTypeSystemId.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/ElementGetAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNS.java
index 8505459..8505459 100644
--- a/xml/src/test/java/tests/org/w3c/dom/ElementGetAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/ElementGetAttributeNodeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNodeNS.java
index 7760ba8..7760ba8 100644
--- a/xml/src/test/java/tests/org/w3c/dom/ElementGetAttributeNodeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNodeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/ElementGetElementsByTagNameNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementGetElementsByTagNameNS.java
index f03007a..f03007a 100644
--- a/xml/src/test/java/tests/org/w3c/dom/ElementGetElementsByTagNameNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementGetElementsByTagNameNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/ElementHasAttribute.java b/luni/src/test/java/tests/org/w3c/dom/ElementHasAttribute.java
index 711a1ab..711a1ab 100644
--- a/xml/src/test/java/tests/org/w3c/dom/ElementHasAttribute.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementHasAttribute.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/ElementHasAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementHasAttributeNS.java
index e0c9fd9..e0c9fd9 100644
--- a/xml/src/test/java/tests/org/w3c/dom/ElementHasAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementHasAttributeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/ElementRemoveAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementRemoveAttributeNS.java
index 72c56e9..72c56e9 100644
--- a/xml/src/test/java/tests/org/w3c/dom/ElementRemoveAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementRemoveAttributeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/ElementSetAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNS.java
index babd6f1..babd6f1 100644
--- a/xml/src/test/java/tests/org/w3c/dom/ElementSetAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/ElementSetAttributeNodeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNodeNS.java
index 2a115e0..2a115e0 100644
--- a/xml/src/test/java/tests/org/w3c/dom/ElementSetAttributeNodeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNodeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/GetAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/GetAttributeNS.java
index ae5936c..ae5936c 100644
--- a/xml/src/test/java/tests/org/w3c/dom/GetAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/GetAttributeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/GetAttributeNodeNS.java b/luni/src/test/java/tests/org/w3c/dom/GetAttributeNodeNS.java
index 7c72fe5..7c72fe5 100644
--- a/xml/src/test/java/tests/org/w3c/dom/GetAttributeNodeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/GetAttributeNodeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/GetElementById.java b/luni/src/test/java/tests/org/w3c/dom/GetElementById.java
index 073df2f..073df2f 100644
--- a/xml/src/test/java/tests/org/w3c/dom/GetElementById.java
+++ b/luni/src/test/java/tests/org/w3c/dom/GetElementById.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/GetElementsByTagNameNS.java b/luni/src/test/java/tests/org/w3c/dom/GetElementsByTagNameNS.java
index d5fa0bf..d5fa0bf 100644
--- a/xml/src/test/java/tests/org/w3c/dom/GetElementsByTagNameNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/GetElementsByTagNameNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/GetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/GetNamedItemNS.java
index 270fe04..270fe04 100644
--- a/xml/src/test/java/tests/org/w3c/dom/GetNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/GetNamedItemNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/HCEntitiesRemoveNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/HCEntitiesRemoveNamedItemNS.java
index 1cdd20f..1cdd20f 100644
--- a/xml/src/test/java/tests/org/w3c/dom/HCEntitiesRemoveNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HCEntitiesRemoveNamedItemNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/HCEntitiesSetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/HCEntitiesSetNamedItemNS.java
index 7e2917a..7e2917a 100644
--- a/xml/src/test/java/tests/org/w3c/dom/HCEntitiesSetNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HCEntitiesSetNamedItemNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/HCNamedNodeMapInvalidType.java b/luni/src/test/java/tests/org/w3c/dom/HCNamedNodeMapInvalidType.java
index d968bc4..d968bc4 100644
--- a/xml/src/test/java/tests/org/w3c/dom/HCNamedNodeMapInvalidType.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HCNamedNodeMapInvalidType.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/HCNodeDocumentFragmentNormalize.java b/luni/src/test/java/tests/org/w3c/dom/HCNodeDocumentFragmentNormalize.java
index 53317b3..53317b3 100644
--- a/xml/src/test/java/tests/org/w3c/dom/HCNodeDocumentFragmentNormalize.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HCNodeDocumentFragmentNormalize.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/HCNotationsRemoveNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/HCNotationsRemoveNamedItemNS.java
index 3eab5fc..3eab5fc 100644
--- a/xml/src/test/java/tests/org/w3c/dom/HCNotationsRemoveNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HCNotationsRemoveNamedItemNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/HCNotationsSetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/HCNotationsSetNamedItemNS.java
index d5daee4..d5daee4 100644
--- a/xml/src/test/java/tests/org/w3c/dom/HCNotationsSetNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HCNotationsSetNamedItemNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/HasAttribute.java b/luni/src/test/java/tests/org/w3c/dom/HasAttribute.java
index 89eef88..89eef88 100644
--- a/xml/src/test/java/tests/org/w3c/dom/HasAttribute.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HasAttribute.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/HasAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/HasAttributeNS.java
index cf1b90e..cf1b90e 100644
--- a/xml/src/test/java/tests/org/w3c/dom/HasAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HasAttributeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/HasAttributes.java b/luni/src/test/java/tests/org/w3c/dom/HasAttributes.java
index 5d3954d..5d3954d 100644
--- a/xml/src/test/java/tests/org/w3c/dom/HasAttributes.java
+++ b/luni/src/test/java/tests/org/w3c/dom/HasAttributes.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/ImportNode.java b/luni/src/test/java/tests/org/w3c/dom/ImportNode.java
index de39392..de39392 100644
--- a/xml/src/test/java/tests/org/w3c/dom/ImportNode.java
+++ b/luni/src/test/java/tests/org/w3c/dom/ImportNode.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/InternalSubset.java b/luni/src/test/java/tests/org/w3c/dom/InternalSubset.java
index f8f306c..f8f306c 100644
--- a/xml/src/test/java/tests/org/w3c/dom/InternalSubset.java
+++ b/luni/src/test/java/tests/org/w3c/dom/InternalSubset.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/IsSupported.java b/luni/src/test/java/tests/org/w3c/dom/IsSupported.java
index 318a81d..318a81d 100644
--- a/xml/src/test/java/tests/org/w3c/dom/IsSupported.java
+++ b/luni/src/test/java/tests/org/w3c/dom/IsSupported.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/LocalName.java b/luni/src/test/java/tests/org/w3c/dom/LocalName.java
index 3f1d9c3..3f1d9c3 100644
--- a/xml/src/test/java/tests/org/w3c/dom/LocalName.java
+++ b/luni/src/test/java/tests/org/w3c/dom/LocalName.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/NamedNodeMapGetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapGetNamedItemNS.java
index e4ab1df..e4ab1df 100644
--- a/xml/src/test/java/tests/org/w3c/dom/NamedNodeMapGetNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapGetNamedItemNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/NamedNodeMapRemoveNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapRemoveNamedItemNS.java
index 16a6cda..16a6cda 100644
--- a/xml/src/test/java/tests/org/w3c/dom/NamedNodeMapRemoveNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapRemoveNamedItemNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/NamedNodeMapSetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapSetNamedItemNS.java
index e0ec0df..e0ec0df 100644
--- a/xml/src/test/java/tests/org/w3c/dom/NamedNodeMapSetNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapSetNamedItemNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/NamespaceURI.java b/luni/src/test/java/tests/org/w3c/dom/NamespaceURI.java
index dba8b86..dba8b86 100644
--- a/xml/src/test/java/tests/org/w3c/dom/NamespaceURI.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NamespaceURI.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/NodeGetLocalName.java b/luni/src/test/java/tests/org/w3c/dom/NodeGetLocalName.java
index d508465..d508465 100644
--- a/xml/src/test/java/tests/org/w3c/dom/NodeGetLocalName.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeGetLocalName.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/NodeGetNamespaceURI.java b/luni/src/test/java/tests/org/w3c/dom/NodeGetNamespaceURI.java
index 5ed1e29..5ed1e29 100644
--- a/xml/src/test/java/tests/org/w3c/dom/NodeGetNamespaceURI.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeGetNamespaceURI.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/NodeGetOwnerDocument.java b/luni/src/test/java/tests/org/w3c/dom/NodeGetOwnerDocument.java
index 3579c15..3579c15 100644
--- a/xml/src/test/java/tests/org/w3c/dom/NodeGetOwnerDocument.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeGetOwnerDocument.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/NodeGetPrefix.java b/luni/src/test/java/tests/org/w3c/dom/NodeGetPrefix.java
index bcf8bba..bcf8bba 100644
--- a/xml/src/test/java/tests/org/w3c/dom/NodeGetPrefix.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeGetPrefix.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/NodeHasAttributes.java b/luni/src/test/java/tests/org/w3c/dom/NodeHasAttributes.java
index 514b205..514b205 100644
--- a/xml/src/test/java/tests/org/w3c/dom/NodeHasAttributes.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeHasAttributes.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/NodeIsSupported.java b/luni/src/test/java/tests/org/w3c/dom/NodeIsSupported.java
index d88cb86..d88cb86 100644
--- a/xml/src/test/java/tests/org/w3c/dom/NodeIsSupported.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeIsSupported.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/NodeNormalize.java b/luni/src/test/java/tests/org/w3c/dom/NodeNormalize.java
index d66ce58..d66ce58 100644
--- a/xml/src/test/java/tests/org/w3c/dom/NodeNormalize.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeNormalize.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/NodeSetPrefix.java b/luni/src/test/java/tests/org/w3c/dom/NodeSetPrefix.java
index dbecc30..dbecc30 100644
--- a/xml/src/test/java/tests/org/w3c/dom/NodeSetPrefix.java
+++ b/luni/src/test/java/tests/org/w3c/dom/NodeSetPrefix.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/Normalize.java b/luni/src/test/java/tests/org/w3c/dom/Normalize.java
index 36ff43c..36ff43c 100644
--- a/xml/src/test/java/tests/org/w3c/dom/Normalize.java
+++ b/luni/src/test/java/tests/org/w3c/dom/Normalize.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/OwnerDocument.java b/luni/src/test/java/tests/org/w3c/dom/OwnerDocument.java
index b5b0e94..b5b0e94 100644
--- a/xml/src/test/java/tests/org/w3c/dom/OwnerDocument.java
+++ b/luni/src/test/java/tests/org/w3c/dom/OwnerDocument.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/OwnerElement.java b/luni/src/test/java/tests/org/w3c/dom/OwnerElement.java
index a4af36a..a4af36a 100644
--- a/xml/src/test/java/tests/org/w3c/dom/OwnerElement.java
+++ b/luni/src/test/java/tests/org/w3c/dom/OwnerElement.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/Prefix.java b/luni/src/test/java/tests/org/w3c/dom/Prefix.java
index f45144a..f45144a 100644
--- a/xml/src/test/java/tests/org/w3c/dom/Prefix.java
+++ b/luni/src/test/java/tests/org/w3c/dom/Prefix.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/PublicId.java b/luni/src/test/java/tests/org/w3c/dom/PublicId.java
index 8165b2c..8165b2c 100644
--- a/xml/src/test/java/tests/org/w3c/dom/PublicId.java
+++ b/luni/src/test/java/tests/org/w3c/dom/PublicId.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/RemoveAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/RemoveAttributeNS.java
index 6a84d1b..6a84d1b 100644
--- a/xml/src/test/java/tests/org/w3c/dom/RemoveAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/RemoveAttributeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/RemoveNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/RemoveNamedItemNS.java
index e745e74..e745e74 100644
--- a/xml/src/test/java/tests/org/w3c/dom/RemoveNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/RemoveNamedItemNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/SetAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/SetAttributeNS.java
index b1f24e9..b1f24e9 100644
--- a/xml/src/test/java/tests/org/w3c/dom/SetAttributeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/SetAttributeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/SetAttributeNodeNS.java b/luni/src/test/java/tests/org/w3c/dom/SetAttributeNodeNS.java
index 3960a4f..3960a4f 100644
--- a/xml/src/test/java/tests/org/w3c/dom/SetAttributeNodeNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/SetAttributeNodeNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/SetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/SetNamedItemNS.java
index ae364ec..ae364ec 100644
--- a/xml/src/test/java/tests/org/w3c/dom/SetNamedItemNS.java
+++ b/luni/src/test/java/tests/org/w3c/dom/SetNamedItemNS.java
diff --git a/xml/src/test/java/tests/org/w3c/dom/SystemId.java b/luni/src/test/java/tests/org/w3c/dom/SystemId.java
index 3e1b903..3e1b903 100644
--- a/xml/src/test/java/tests/org/w3c/dom/SystemId.java
+++ b/luni/src/test/java/tests/org/w3c/dom/SystemId.java
diff --git a/prefs/src/test/java/tests/prefs/AllTests.java b/luni/src/test/java/tests/prefs/AllTests.java
index 4d99023..4d99023 100644
--- a/prefs/src/test/java/tests/prefs/AllTests.java
+++ b/luni/src/test/java/tests/prefs/AllTests.java
diff --git a/xml/src/test/java/tests/xml/AllTests.java b/luni/src/test/java/tests/xml/AllTests.java
index 2e12a59..2e12a59 100644
--- a/xml/src/test/java/tests/xml/AllTests.java
+++ b/luni/src/test/java/tests/xml/AllTests.java
diff --git a/xml/src/test/java/tests/xml/DeclarationTest.java b/luni/src/test/java/tests/xml/DeclarationTest.java
index 9fc42fe..9fc42fe 100644
--- a/xml/src/test/java/tests/xml/DeclarationTest.java
+++ b/luni/src/test/java/tests/xml/DeclarationTest.java
diff --git a/xml/src/test/java/tests/xml/DomTest.java b/luni/src/test/java/tests/xml/DomTest.java
index 1f723f7..1f723f7 100644
--- a/xml/src/test/java/tests/xml/DomTest.java
+++ b/luni/src/test/java/tests/xml/DomTest.java
diff --git a/xml/src/test/java/tests/xml/NodeTest.java b/luni/src/test/java/tests/xml/NodeTest.java
index d1d99c1..d1d99c1 100644
--- a/xml/src/test/java/tests/xml/NodeTest.java
+++ b/luni/src/test/java/tests/xml/NodeTest.java
diff --git a/xml/src/test/java/tests/xml/NormalizeTest.java b/luni/src/test/java/tests/xml/NormalizeTest.java
index 5d2bb0be..5d2bb0be 100644
--- a/xml/src/test/java/tests/xml/NormalizeTest.java
+++ b/luni/src/test/java/tests/xml/NormalizeTest.java
diff --git a/xml/src/test/java/tests/xml/SaxTest.java b/luni/src/test/java/tests/xml/SaxTest.java
index dc59b2d..dc59b2d 100644
--- a/xml/src/test/java/tests/xml/SaxTest.java
+++ b/luni/src/test/java/tests/xml/SaxTest.java
diff --git a/xml/src/test/java/tests/xml/SimpleBuilderTest.java b/luni/src/test/java/tests/xml/SimpleBuilderTest.java
index 1a555c6..1a555c6 100644
--- a/xml/src/test/java/tests/xml/SimpleBuilderTest.java
+++ b/luni/src/test/java/tests/xml/SimpleBuilderTest.java
diff --git a/xml/src/test/java/tests/xml/SimpleParserTest.java b/luni/src/test/java/tests/xml/SimpleParserTest.java
index 4651039..4651039 100644
--- a/xml/src/test/java/tests/xml/SimpleParserTest.java
+++ b/luni/src/test/java/tests/xml/SimpleParserTest.java
diff --git a/x-net/src/test/java/tests/xnet/AllTests.java b/luni/src/test/java/tests/xnet/AllTests.java
index 04a2ed6..04a2ed6 100644
--- a/x-net/src/test/java/tests/xnet/AllTests.java
+++ b/luni/src/test/java/tests/xnet/AllTests.java
diff --git a/xml/src/test/resources/SimpleBuilderTest.xml b/luni/src/test/resources/SimpleBuilderTest.xml
index 23edce7..23edce7 100644
--- a/xml/src/test/resources/SimpleBuilderTest.xml
+++ b/luni/src/test/resources/SimpleBuilderTest.xml
diff --git a/xml/src/test/resources/SimpleParserTest.xml b/luni/src/test/resources/SimpleParserTest.xml
index e18bf3e..e18bf3e 100644
--- a/xml/src/test/resources/SimpleParserTest.xml
+++ b/luni/src/test/resources/SimpleParserTest.xml
diff --git a/xml/src/test/resources/hc_staff.xml b/luni/src/test/resources/hc_staff.xml
index 2df9a74..2df9a74 100644
--- a/xml/src/test/resources/hc_staff.xml
+++ b/luni/src/test/resources/hc_staff.xml
diff --git a/xml/src/test/resources/nwf/staff.dtd b/luni/src/test/resources/nwf/staff.dtd
index 02a994d..02a994d 100644
--- a/xml/src/test/resources/nwf/staff.dtd
+++ b/luni/src/test/resources/nwf/staff.dtd
diff --git a/xml/src/test/resources/nwf/staff.xml b/luni/src/test/resources/nwf/staff.xml
index b600fcf..b600fcf 100644
--- a/xml/src/test/resources/nwf/staff.xml
+++ b/luni/src/test/resources/nwf/staff.xml
diff --git a/xml/src/test/resources/out_dh/staff.out b/luni/src/test/resources/out_dh/staff.out
index 467fd08..467fd08 100644
--- a/xml/src/test/resources/out_dh/staff.out
+++ b/luni/src/test/resources/out_dh/staff.out
diff --git a/xml/src/test/resources/out_hb/staff.out b/luni/src/test/resources/out_hb/staff.out
index c6d61ad..c6d61ad 100644
--- a/xml/src/test/resources/out_hb/staff.out
+++ b/luni/src/test/resources/out_hb/staff.out
diff --git a/prefs/src/test/resources/prefs/java/util/prefs/userprefs-ascii.xml b/luni/src/test/resources/prefs/java/util/prefs/userprefs-ascii.xml
index 9d066f1..9d066f1 100644
--- a/prefs/src/test/resources/prefs/java/util/prefs/userprefs-ascii.xml
+++ b/luni/src/test/resources/prefs/java/util/prefs/userprefs-ascii.xml
diff --git a/prefs/src/test/resources/prefs/java/util/prefs/userprefs-badencoding.xml b/luni/src/test/resources/prefs/java/util/prefs/userprefs-badencoding.xml
index 4b99e04..4b99e04 100644
--- a/prefs/src/test/resources/prefs/java/util/prefs/userprefs-badencoding.xml
+++ b/luni/src/test/resources/prefs/java/util/prefs/userprefs-badencoding.xml
diff --git a/prefs/src/test/resources/prefs/java/util/prefs/userprefs-badform.xml b/luni/src/test/resources/prefs/java/util/prefs/userprefs-badform.xml
index 2c231b9..2c231b9 100644
--- a/prefs/src/test/resources/prefs/java/util/prefs/userprefs-badform.xml
+++ b/luni/src/test/resources/prefs/java/util/prefs/userprefs-badform.xml
diff --git a/prefs/src/test/resources/prefs/java/util/prefs/userprefs-badtype.xml b/luni/src/test/resources/prefs/java/util/prefs/userprefs-badtype.xml
index f974617..f974617 100644
--- a/prefs/src/test/resources/prefs/java/util/prefs/userprefs-badtype.xml
+++ b/luni/src/test/resources/prefs/java/util/prefs/userprefs-badtype.xml
diff --git a/prefs/src/test/resources/prefs/java/util/prefs/userprefs-higherversion.xml b/luni/src/test/resources/prefs/java/util/prefs/userprefs-higherversion.xml
index a7f6aa8..a7f6aa8 100644
--- a/prefs/src/test/resources/prefs/java/util/prefs/userprefs-higherversion.xml
+++ b/luni/src/test/resources/prefs/java/util/prefs/userprefs-higherversion.xml
diff --git a/prefs/src/test/resources/prefs/java/util/prefs/userprefs.xml b/luni/src/test/resources/prefs/java/util/prefs/userprefs.xml
index f901f5b..f901f5b 100644
--- a/prefs/src/test/resources/prefs/java/util/prefs/userprefs.xml
+++ b/luni/src/test/resources/prefs/java/util/prefs/userprefs.xml
diff --git a/xml/src/test/resources/recipe.xml b/luni/src/test/resources/recipe.xml
index d7cf0fb..d7cf0fb 100644
--- a/xml/src/test/resources/recipe.xml
+++ b/luni/src/test/resources/recipe.xml
diff --git a/xml/src/test/resources/recipe1.xml b/luni/src/test/resources/recipe1.xml
index d7cf0fb..d7cf0fb 100644
--- a/xml/src/test/resources/recipe1.xml
+++ b/luni/src/test/resources/recipe1.xml
diff --git a/xml/src/test/resources/recipt.dtd b/luni/src/test/resources/recipt.dtd
index 370112c..370112c 100644
--- a/xml/src/test/resources/recipt.dtd
+++ b/luni/src/test/resources/recipt.dtd
diff --git a/xml/src/test/resources/recipt.xml b/luni/src/test/resources/recipt.xml
index d7cf0fb..d7cf0fb 100644
--- a/xml/src/test/resources/recipt.xml
+++ b/luni/src/test/resources/recipt.xml
diff --git a/xml/src/test/resources/reciptWrong.xml b/luni/src/test/resources/reciptWrong.xml
index ce32d09..ce32d09 100644
--- a/xml/src/test/resources/reciptWrong.xml
+++ b/luni/src/test/resources/reciptWrong.xml
diff --git a/prefs/src/test/resources/serialization/org/apache/harmony/prefs/tests/java/util/prefs/BackingStoreExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/prefs/tests/java/util/prefs/BackingStoreExceptionTest.golden.ser
index 4d26113..4d26113 100644
--- a/prefs/src/test/resources/serialization/org/apache/harmony/prefs/tests/java/util/prefs/BackingStoreExceptionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/prefs/tests/java/util/prefs/BackingStoreExceptionTest.golden.ser
diff --git a/prefs/src/test/resources/serialization/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.golden.ser
index a15948d..a15948d 100644
--- a/prefs/src/test/resources/serialization/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/prefs/tests/java/util/prefs/InvalidPreferencesFormatExceptionTest.golden.ser
diff --git a/xml/src/test/resources/simple.xml b/luni/src/test/resources/simple.xml
index de39181..de39181 100644
--- a/xml/src/test/resources/simple.xml
+++ b/luni/src/test/resources/simple.xml
diff --git a/xml/src/test/resources/simple_ns.dtd b/luni/src/test/resources/simple_ns.dtd
index 7643773..7643773 100644
--- a/xml/src/test/resources/simple_ns.dtd
+++ b/luni/src/test/resources/simple_ns.dtd
diff --git a/xml/src/test/resources/simple_ns.xml b/luni/src/test/resources/simple_ns.xml
index a5dc4a3..a5dc4a3 100644
--- a/xml/src/test/resources/simple_ns.xml
+++ b/luni/src/test/resources/simple_ns.xml
diff --git a/xml/src/test/resources/staff.dtd b/luni/src/test/resources/staff.dtd
index 02a994d..02a994d 100644
--- a/xml/src/test/resources/staff.dtd
+++ b/luni/src/test/resources/staff.dtd
diff --git a/xml/src/test/resources/staff.xml b/luni/src/test/resources/staff.xml
index f89c510..f89c510 100644
--- a/xml/src/test/resources/staff.xml
+++ b/luni/src/test/resources/staff.xml
diff --git a/xml/src/test/resources/staff2.dtd b/luni/src/test/resources/staff2.dtd
index 0bac8f2..0bac8f2 100644
--- a/xml/src/test/resources/staff2.dtd
+++ b/luni/src/test/resources/staff2.dtd
diff --git a/xml/src/test/resources/staff2.xml b/luni/src/test/resources/staff2.xml
index d3d9a13..d3d9a13 100644
--- a/xml/src/test/resources/staff2.xml
+++ b/luni/src/test/resources/staff2.xml
diff --git a/xml/src/test/resources/staffEntRes.xml b/luni/src/test/resources/staffEntRes.xml
index 0c24c83..0c24c83 100644
--- a/xml/src/test/resources/staffEntRes.xml
+++ b/luni/src/test/resources/staffEntRes.xml
diff --git a/xml/src/test/resources/staffNS.dtd b/luni/src/test/resources/staffNS.dtd
index 7643773..7643773 100644
--- a/xml/src/test/resources/staffNS.dtd
+++ b/luni/src/test/resources/staffNS.dtd
diff --git a/xml/src/test/resources/staffNS.xml b/luni/src/test/resources/staffNS.xml
index 1cb1459..1cb1459 100644
--- a/xml/src/test/resources/staffNS.xml
+++ b/luni/src/test/resources/staffNS.xml
diff --git a/xml/src/test/resources/systemid.xml b/luni/src/test/resources/systemid.xml
index d7cf0fb..d7cf0fb 100644
--- a/xml/src/test/resources/systemid.xml
+++ b/luni/src/test/resources/systemid.xml
diff --git a/xml/src/test/resources/systemid/recipt.dtd b/luni/src/test/resources/systemid/recipt.dtd
index 370112c..370112c 100644
--- a/xml/src/test/resources/systemid/recipt.dtd
+++ b/luni/src/test/resources/systemid/recipt.dtd
diff --git a/xml/src/test/resources/systemid/staff.dtd b/luni/src/test/resources/systemid/staff.dtd
index 02a994d..02a994d 100644
--- a/xml/src/test/resources/systemid/staff.dtd
+++ b/luni/src/test/resources/systemid/staff.dtd
diff --git a/xml/src/test/resources/wf/staff.dtd b/luni/src/test/resources/wf/staff.dtd
index 02a994d..02a994d 100644
--- a/xml/src/test/resources/wf/staff.dtd
+++ b/luni/src/test/resources/wf/staff.dtd
diff --git a/xml/src/test/resources/wf/staff.xml b/luni/src/test/resources/wf/staff.xml
index f89c510..f89c510 100644
--- a/xml/src/test/resources/wf/staff.xml
+++ b/luni/src/test/resources/wf/staff.xml
diff --git a/xml/src/test/resources/wrong.xml b/luni/src/test/resources/wrong.xml
index 9d4b41d..9d4b41d 100644
--- a/xml/src/test/resources/wrong.xml
+++ b/luni/src/test/resources/wrong.xml
diff --git a/xml/src/test/resources/xhtml1-strict.dtd b/luni/src/test/resources/xhtml1-strict.dtd
index 60bbaf7..60bbaf7 100644
--- a/xml/src/test/resources/xhtml1-strict.dtd
+++ b/luni/src/test/resources/xhtml1-strict.dtd
diff --git a/icu/unicode-license.txt b/luni/unicode-license.txt
index 8a3350b..8a3350b 100644
--- a/icu/unicode-license.txt
+++ b/luni/unicode-license.txt
diff --git a/prefs/MODULE_LICENSE_APACHE2 b/prefs/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/prefs/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/security-kernel/MODULE_LICENSE_APACHE2 b/security-kernel/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/security-kernel/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/x-net/MODULE_LICENSE_APACHE2 b/x-net/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/x-net/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/x-net/src/main/native/sub.mk b/x-net/src/main/native/sub.mk
deleted file mode 100644
index f5aa84a..0000000
--- a/x-net/src/main/native/sub.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is included by the top-level libcore Android.mk.
-# It's not a normal makefile, so we don't include CLEAR_VARS
-# or BUILD_*_LIBRARY.
-
-LOCAL_SRC_FILES := \
-	org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
-
-LOCAL_C_INCLUDES += \
-	external/openssl/include
-
-
-# Any shared/static libs that are listed here must also
-# be listed in libs/nativehelper/Android.mk.
-# TODO: fix this requirement
-
-LOCAL_SHARED_LIBRARIES += \
-	libcrypto \
-	libssl \
-	libutils
-
-LOCAL_STATIC_LIBRARIES +=
diff --git a/xml/MODULE_LICENSE_APACHE2 b/xml/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/xml/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/xml/MODULE_LICENSE_BSD_LIKE b/xml/MODULE_LICENSE_BSD_LIKE
deleted file mode 100644
index b56941c..0000000
--- a/xml/MODULE_LICENSE_BSD_LIKE
+++ /dev/null
@@ -1 +0,0 @@
-For KXML2.
diff --git a/xml/src/main/native/sub.mk b/xml/src/main/native/sub.mk
deleted file mode 100644
index e48d12e..0000000
--- a/xml/src/main/native/sub.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file is included by the top-level libcore Android.mk.
-# It's not a normal makefile, so we don't include CLEAR_VARS
-# or BUILD_*_LIBRARY.
-
-LOCAL_SRC_FILES := org_apache_harmony_xml_ExpatParser.cpp 
-
-LOCAL_C_INCLUDES += \
-	external/expat/lib
-
-# Any shared/static libs that are listed here must also
-# be listed in libs/nativehelper/Android.mk.
-# TODO: fix this requirement
-
-LOCAL_SHARED_LIBRARIES += \
-	libcutils \
-	libexpat \
-	libutils
-
-#LOCAL_STATIC_LIBRARIES +=
-
author	Peter Hallam <peterhal@google.com>	2010-05-03 12:57:15 -0700
committer	Peter Hallam <peterhal@google.com>	2010-05-04 16:30:12 -0700
commit	6b811c5daec1b28e6f63b57f98a032236f2c3cf7 (patch)
tree	a733f20e87a9739253d495c14d54e7d253e35771
parent	0a98ab45e3566542f2d669eb0ffd28a560d97d28 (diff)
download	libcore-6b811c5daec1b28e6f63b57f98a032236f2c3cf7.zip libcore-6b811c5daec1b28e6f63b57f98a032236f2c3cf7.tar.gz libcore-6b811c5daec1b28e6f63b57f98a032236f2c3cf7.tar.bz2